summaryrefslogtreecommitdiffstats
path: root/kubernetes/onap
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-05-09 14:34:14 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-05-10 15:02:10 +0000
commit254272e292bdc81dd788efecfcd16ae7051eb3c7 (patch)
tree4ca571d3b8d889c2053250828329b5e8690f326d /kubernetes/onap
parent4cd76a6ee6d441389d486851d01432ea5bd5318b (diff)
Improve docker registry secret management
Change-Id: I2d1ff878c215becc9856af184eb0b11defd75e1d Issue-ID: OOM-1064 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/onap')
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml1
-rw-r--r--kubernetes/onap/templates/secrets.yaml4
-rw-r--r--kubernetes/onap/values.yaml7
3 files changed, 8 insertions, 4 deletions
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 4379f64d55..44245edffd 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -29,7 +29,6 @@ global:
# docker images. This includes all images from dockerhub and
# any other repository that hosts images for ONAP components.
#repository: nexus3.onap.org:10001
- #repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
# readiness check - temporary repo until images migrated to nexus3
readinessRepository: oomk8s
diff --git a/kubernetes/onap/templates/secrets.yaml b/kubernetes/onap/templates/secrets.yaml
index 2345be1972..145b55f36d 100644
--- a/kubernetes/onap/templates/secrets.yaml
+++ b/kubernetes/onap/templates/secrets.yaml
@@ -23,5 +23,5 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
- .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }}
-type: kubernetes.io/dockercfg \ No newline at end of file
+ .dockercfg: {{ include "common.repository.secret" . }}
+type: kubernetes.io/dockercfg
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 28b33fcc6d..cffff73392 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -29,7 +29,9 @@ global:
# docker images. This includes all images from dockerhub and
# any other repository that hosts images for ONAP components.
#repository: nexus3.onap.org:10001
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
+ repositoryCred:
+ user: docker
+ password: docker
# readiness check - temporary repo until images migrated to nexus3
readinessRepository: oomk8s
@@ -47,6 +49,9 @@ global:
# flag to enable debugging - application support required
debugEnabled: false
+# Repository for creation of nexus3.onap.org secret
+repository: nexus3.onap.org:10001
+
#################################################################
# Enable/disable and configure helm charts (ie. applications)