feat(charts): reuses the value from an existing secret and config

Author: duanhongyi

charts/registry/templates/registry-cronjob-daily.yaml

@@ -27,7 +27,7 @@ spec:
             - -v
             - -u
             - $(DRYCC_STORAGE_ENDPOINT)
-            {{- include "builder.envs" . | indent 12 }}
+            {{- include "registry.envs" . | indent 12 }}
           containers:
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/registry:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.imagePullPolicy}}
@@ -43,5 +43,5 @@ spec:
             - --dry-run
             - --delete-untagged
             {{- end }}
-            {{- include "builder.envs" . | indent 12 }}
+            {{- include "registry.envs" . | indent 12 }}
 {{- end }}

charts/registry/templates/registry-secret.yaml

@@ -10,11 +10,11 @@ type: Opaque
 data:
   {{- if eq .Values.global.registryLocation "on-cluster" }}
   host: {{ printf "drycc-registry.%s.svc.%s:5000" .Release.Namespace .Values.global.clusterDomain | b64enc }}
-  secret: {{ randAlphaNum 32 | b64enc }}
+  secret: {{ include "common.secrets.lookup" (dict "secret" "registry-secret" "key" "secret" "defaultValue" (randAlphaNum 32) "context" $) }}
   {{- else }}
   host: {{ .Values.host | b64enc }}
   organization: {{ .Values.organization | b64enc }}
   {{- end }}
-  username: {{ if .Values.username | default "" | ne "" }}{{ .Values.username | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
-  password: {{ if .Values.password | default "" | ne "" }}{{ .Values.password | b64enc }}{{ else }}{{ randAlphaNum 32 | b64enc }}{{ end }}
+  username: {{ include "common.secrets.lookup" (dict "secret" "registry-secret" "key" "username" "defaultValue" (.Values.username | default (randAlphaNum 32)) "context" $) }}
+  password: {{ include "common.secrets.lookup" (dict "secret" "registry-secret" "key" "password" "defaultValue" (.Values.password | default (randAlphaNum 32)) "context" $) }}
   redirect: {{ .Values.redirect | b64enc }}

charts/registry/values.yaml

@@ -39,11 +39,14 @@ podAntiAffinityPreset:
 # registry replicas
 replicas: 1
 # registry storage redirect
-redirect: false
+redirect: "false"
 
 concurrencyPolicy: "Replace"
 
 # Service
 service:
   # Provide any additional service annotations
-  annotations: {}
+  annotations: {}
+
+global:
+  registryLocation: "on-cluster"