summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-09-03 14:55:27 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-03 14:55:27 +0000
commit8bdf47ac952a77de2b9b7501028eea4376be2dda (patch)
tree97c1394608f0eeea719189aa4bea1748bec3f5c9
parent23e0d7989ce7a9dad916742f36deddb9160cd394 (diff)
parent1373c9ce6557c6de1c198da72bd76f8c694bb38d (diff)
Merge "[SDNC] Remove hard-coded busybox image"
-rwxr-xr-xkubernetes/sdnc/templates/sdnrdb-init-job.yaml2
-rw-r--r--kubernetes/sdnc/templates/statefulset.yaml2
-rw-r--r--kubernetes/sdnc/values.yaml3
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