diff options
| author |   Alexander Dehn <alexander.dehn@highstreet-technologies.com> | 2020-09-02 09:01:15 +0000 |
|---|---|---|
| committer | Alexander Dehn <alexander.dehn@highstreet-technologies.com> | 2020-09-02 09:02:15 +0000 |
| commit | 1373c9ce6557c6de1c198da72bd76f8c694bb38d (patch) | |
| tree | 3a659e62f67c641d73563047bfdf11cb49d0c0b7 | |
| parent | d56af0efca443e5aa285c4d493db4160c96fd0fb (diff) | |
[SDNC] Remove hard-coded busybox image
get image values from global busyboxRepository/busyboxImage
Issue-ID: OOM-2543
Signed-off-by: Alexander Dehn <alexander.dehn@highstreet-technologies.com>
Change-Id: I5f0ef76fb8072b45bd9ad10d8580484656049b76
Signed-off-by: Alexander Dehn <alexander.dehn@highstreet-technologies.com>
| -rwxr-xr-x | kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 190d26b9b6..d5d6383c25 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -24,7 +24,7 @@ spec: {{ include "common.certInitializer.initContainer" . | indent 6 }} {{ if .Values.global.aafEnabled }} - name: {{ include "common.name" . }}-chown - image: "busybox" + image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}"] volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} {{ end }} diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 3aab082330..e5956c644e 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -95,7 +95,7 @@ spec: {{ include "common.certInitializer.initContainer" . | indent 6 }} - name: {{ include "common.name" . }}-chown - image: "busybox" + image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} command: - sh args: diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 8d6ef68184..a84bfc2855 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -112,7 +112,8 @@ secrets: repository: nexus3.onap.org:10001 pullPolicy: Always image: onap/sdnc-image:1.8.4 - +busyboxRepository: docker.io +busyboxImage: busybox:1.30 # flag to enable debugging - application support required debugEnabled: false |