support username/password for docker registry

viglesiasce · Jul 19, 2018 · d681f66 · d681f66
1 parent 3a03a5a
commit d681f66
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml
@@ -6,6 +6,8 @@ metadata:
 {{ include "spinnaker.standard-labels" . | indent 4 }}
 data:
   install.sh: |
+    #!/bin/bash
+
     # Wait for the Hal daemon to be ready
     export DAEMON_ENDPOINT=http://{{ template "spinnaker.fullname" . }}-halyard:8064
     export HAL_COMMAND="hal --daemon-endpoint $DAEMON_ENDPOINT"
@@ -54,6 +56,7 @@ data:
     {{ end }}
 
     # Docker Registry
+
     $HAL_COMMAND config provider docker-registry enable
     {{- range $index, $registry := .Values.dockerRegistries }}
 
@@ -63,8 +66,18 @@ data:
       PROVIDER_COMMAND='add'
     fi
 
+    CREDS=""
+    {{ if $registry.username -}}
+    CREDS+="--username {{ $registry.username }} --password-file /opt/registry/passwords/{{ $registry.name }}"
+    {{ if $registry.email -}}
+    CREDS+=" --email {{ $registry.email }}"
+    {{- end -}}
+    {{- end }}
+
     $HAL_COMMAND config provider docker-registry account $PROVIDER_COMMAND {{ $registry.name }} --address {{ $registry.address }} \
-        --repositories {{ range $index, $repository := $registry.repositories }}{{- $repository }},{{- end }}
+        ${CREDS} --repositories {{ range $index, $repository := $registry.repositories }}{{if $index}},{{end}}{{- $repository }}{{- end }}
+
+    sleep 600
     {{- end }}
 
     $HAL_COMMAND config provider kubernetes enable

diff --git a/stable/spinnaker/templates/secrets/registry.yaml b/stable/spinnaker/templates/secrets/registry.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dockerRegistryAccountSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,6 +8,7 @@ metadata:
     component: clouddriver
 type: Opaque
 data:
-  {{- range $index, $account := .Values.accounts }}
-  password-{{ $account.name }}: {{ default "" $account.password | b64enc | quote }}
+  {{- range $index, $account := .Values.dockerRegistries }}
+  {{ $account.name }}: {{ default "" $account.password | b64enc | quote }}
   {{- end }}
+{{- end }}
diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml
@@ -68,6 +68,13 @@ spec:
         secret:
           secretName: {{ template "spinnaker.fullname" . }}-gcs
       {{- end }}
+      - name: reg-secrets
+        secret:
+          {{- if .Values.accountSecret }}
+          secretName: {{ .Values.dockerRegistryAccountSecret }}
+          {{- else }}
+          secretName: {{ template "spinnaker.fullname" .}}-registry
+          {{- end }}
       {{- if and .Values.s3.enabled .Values.s3.accessKey .Values.s3.secretKey }}
       - name: s3-secrets
         secret:
@@ -98,6 +105,8 @@ spec:
           mountPath: /home/spinnaker
         - name: halyard-config
           mountPath: /opt/halyard/config
+        - name: reg-secrets
+          mountPath: /opt/registry/passwords
   volumeClaimTemplates:
   - metadata:
       name: halyard-home

diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
@@ -31,6 +31,15 @@ dockerRegistries:
 #   password: '<INSERT YOUR SERVICE ACCOUNT JSON HERE>'
 #   email: 1234@5678.com
 
+# If you don't want to put your passwords into a values file
+# you can use a pre-created secret instead of putting passwords
+# (specify secret name in below `dockerRegistryAccountSecret`)
+# per account above with data in the format:
+# <name>: <password>
+
+# dockerRegistryAccountSecret: myregistry-secrets
+
+
 kubeConfig:
   # Use this when you want to register arbitrary clusters with Spinnaker
   # Upload your ~/kube/.config to a secret
@@ -70,6 +79,10 @@ redis:
   nodeSelector: {}
   cluster:
     enabled: false
+# Uncomment if you don't want to create a PVC for redis
+#  master:
+#    persistence:
+#      enabled: false
 
 # Minio access/secret keys for the in-cluster S3 usage
 # Minio is not exposed publically
@@ -81,6 +94,9 @@ minio:
   secretKey: spinnakeradmin
   bucket: "spinnaker"
   nodeSelector: {}
+# Uncomment if you don't want to create a PVC for minio
+#  persistence:
+#    enabled: false
 
 gcs:
   enabled: false