diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-05-08 02:04:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-08 02:04:33 +0000 |
| commit | 1d0467ce4ce990ed2ae9cd333f969bb6c2d742c6 (patch) | |
| tree | 558eab221942b5293a6dc3bafe923d8510ca6a6e /kubernetes/common | |
| parent | f8bd9cab51e64d2be08c08b6ea1f0996de7d61e0 (diff) | |
| parent | df11cd53bffd239887ec4a406dc5281aa217b2ca (diff) | |
Merge "Fix inconsistent repository references"
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/dgbuilder/templates/deployment.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/common/mariadb-galera/templates/statefulset.yaml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml index a1e95682ee..b9c90f2681 100644 --- a/kubernetes/common/dgbuilder/templates/deployment.yaml +++ b/kubernetes/common/dgbuilder/templates/deployment.yaml @@ -33,7 +33,7 @@ spec: name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"] diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml index b8ba75e52c..ed7e1fc578 100644 --- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml +++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml @@ -35,7 +35,7 @@ spec: - name: {{ include "common.namespace" . }}-docker-registry-key containers: - name: {{ include "common.fullname" . }} - image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy | quote}} env: - name: POD_NAMESPACE @@ -96,7 +96,7 @@ spec: subPath: data initContainers: - name: mariadb-galera-prepare - image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.imageInit }} + image: "{{ include "common.repository" . }}/{{ .Values.imageInit }}" command: ["sh", "-c", "chown -R 27:27 /var/lib/mysql"] volumeMounts: - name: {{ include "common.fullname" . }}-data @@ -116,4 +116,4 @@ spec: resources: requests: storage: {{ .Values.persistence.size | quote }} -{{- end }}
\ No newline at end of file +{{- end }} |