Merge R3 into master

[it/dep.git] / ric-aux / helm / infrastructure / subcharts / docker-credential / templates / secrets-docker-reg.yaml

diff --git a/ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml b/ric-aux/helm/infrastructure/subcharts/docker-credential/templates/secrets-docker-reg.yaml
similarity index 60%
rename from ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml
rename to ric-aux/helm/infrastructure/subcharts/docker-credential/templates/secrets-docker-reg.yaml
index 83866e5..024b5e1 100644 (file)
--- a/ric-infra/40-Credential/helm/credential/templates/secrets-docker-reg.yaml
+++ b/ric-aux/helm/infrastructure/subcharts/docker-credential/templates/secrets-docker-reg.yaml
@@ -1,6 +1,5 @@
 ################################################################################
 #   Copyright (c) 2019 AT&T Intellectual Property.                             #
-#   Copyright (c) 2019 Nokia.                                                  #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -14,10 +13,28 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
+{{ $auxNameSpace := include "common.namespace.aux" . }}
+{{ $infraNameSpace := include "common.namespace.infra" . }}
+{{ $nameSpaceList := list $auxNameSpace $infraNameSpace }}
+{{- range $nameSpaceList }}
+{{- $namespace := . }}
+{{- range keys $.Values.credential }}
+{{- with index $.Values.credential . }}
+{{- $repo := .registry }}
+{{- $cred := .credential }}
+{{- $user := default "docker" $cred.user }}
+{{- $password := default "docker" $cred.password }}
+{{- $mail := default "@" $cred.mail }}
+{{- $auth := printf "%s:%s" $user $password | b64enc }}
+---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: docker-reg-cred
+  name: secret-{{ $repo | replace "." "-" | replace ":" "-" | replace "/" "-" }}
+  namespace: {{ $namespace }}
 data:
-  .dockercfg: {{ include "repository.secret" . }}
+  .dockercfg: {{ printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $user $password $mail $auth | b64enc }}
 type: kubernetes.io/dockercfg
+{{- end }}
+{{- end }}
+{{- end }}