diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-04-15 10:24:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-15 10:24:42 +0000 |
| commit | b8a723fc048d2b9cbe5fba1f9ef3c7362581877b (patch) | |
| tree | a5dbf1fb09e827abc0a0f2907b36366c4c41c9f9 | |
| parent | c9d1a900b5ccccaf356544ed40d3d3ecbb155e2a (diff) | |
| parent | 6ff2b3a7914200070daff3117d848f09452ff57b (diff) | |
Merge "Remove oxm fetching logic from data-router"
| -rw-r--r-- | kubernetes/aai/charts/aai-data-router/templates/deployment.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-data-router/values.yaml | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml index cf81948160..ceb9884a8c 100644 --- a/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-data-router/templates/deployment.yaml @@ -56,18 +56,6 @@ spec: volumeMounts: - name: {{ include "common.fullname" . }}-logs mountPath: /logroot/ - - name: {{ include "common.name" . }}-inject-models - command: - - /bin/bash - - "-c" - - | - git clone -b {{ .Values.config.gerritBranch }} --single-branch {{ .Values.config.gerritProject }} /tmp/gerrit - cp -rp /tmp/gerrit/data-router/appconfig/model/* /model-dir - image: "{{ .Values.global.repository | default .Values.dockerHubRepository }}/{{ .Values.ubuntuInitImage }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - volumeMounts: - - name: modeldir - mountPath: "/model-dir" containers: - name: {{ include "common.name" . }} image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" @@ -104,8 +92,6 @@ spec: name: {{ include "common.fullname" . }}-dynamic-policy - mountPath: /logs/ name: {{ include "common.fullname" . }}-logs - - name: modeldir - mountPath: /opt/app/data-router/config/model ports: - containerPort: {{ .Values.service.internalPort }} {{- if eq .Values.liveness.enabled true }} @@ -139,8 +125,6 @@ spec: - name: {{ include "common.fullname" . }}-logs hostPath: path: {{ .Values.persistence.mountPath }}/{{ include "common.namespace" . }}/{{ .Values.persistence.mountSubPath }} - - name: modeldir - emptyDir: {} restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/aai/charts/aai-data-router/values.yaml b/kubernetes/aai/charts/aai-data-router/values.yaml index c4bfc62a40..131bcd7e5c 100644 --- a/kubernetes/aai/charts/aai-data-router/values.yaml +++ b/kubernetes/aai/charts/aai-data-router/values.yaml @@ -19,8 +19,6 @@ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 config: keyStorePassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 keyManagerPassword: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 - gerritBranch: master - gerritProject: http://gerrit.onap.org/r/aai/test-config # default number of instances |