diff options
| author |   BorislavG <Borislav.Glozman@amdocs.com> | 2018-05-09 14:34:14 +0000 |
|---|---|---|
| committer | BorislavG <Borislav.Glozman@amdocs.com> | 2018-05-10 15:02:10 +0000 |
| commit | 254272e292bdc81dd788efecfcd16ae7051eb3c7 (patch) | |
| tree | 4ca571d3b8d889c2053250828329b5e8690f326d /kubernetes/dcaegen2/charts/dcae-cloudify-manager | |
| parent | 4cd76a6ee6d441389d486851d01432ea5bd5318b (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/dcaegen2/charts/dcae-cloudify-manager')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml index 732110be6d..ff0b8312b3 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml @@ -17,7 +17,6 @@ # ============LICENSE_END========================================================= {{ if .Values.dcae_ns}} -# Create the registry key secret in dcae namespace apiVersion: v1 kind: Secret metadata: @@ -29,10 +28,10 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }} + .dockercfg: {{ include "common.repository.secret" . }} type: kubernetes.io/dockercfg -{{ end }} --- +{{ end }} # Copy of the API token secret, needed to work around /var/run/secrets mount problem apiVersion: v1 kind: Secret diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 28b96e75b7..41c5191609 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -21,11 +21,13 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19 readinessRepository: oomk8s readinessImage: readiness-check:1.1.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 + repositoryCred: + user: docker + password: docker config: logstashServiceName: log-ls |