From 254272e292bdc81dd788efecfcd16ae7051eb3c7 Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Wed, 9 May 2018 14:34:14 +0000
Subject: Improve docker registry secret management

Change-Id: I2d1ff878c215becc9856af184eb0b11defd75e1d
Issue-ID: OOM-1064
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
---
 kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml                | 1 -
 .../dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml      | 5 ++---
 kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml         | 4 +++-
 kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml              | 1 -
 kubernetes/dcaegen2/charts/dcae-redis/values.yaml                    | 1 -
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'kubernetes/dcaegen2/charts')

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index e8927eb0bd..7f1dcdb745 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -21,7 +21,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19
   readinessRepository: oomk8s
   readinessImage: readiness-check:1.1.0
   loggingRepository: docker.elastic.co
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
diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
index a4d2f292a5..d9a554cfe6 100644
--- a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml
@@ -21,7 +21,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19
   readinessRepository: oomk8s
   readinessImage: readiness-check:1.1.0
   loggingRepository: docker.elastic.co
diff --git a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml
index bcf1750b22..8550da074b 100644
--- a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml
@@ -17,7 +17,6 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.0
   loggingRepository: docker.elastic.co
-- 
cgit 1.2.3-korg