diff --git a/stable/spinnaker/README.md b/stable/spinnaker/README.md index 9bd26fc33774..6c4135c378fc 100644 --- a/stable/spinnaker/README.md +++ b/stable/spinnaker/README.md @@ -60,6 +60,32 @@ for Spinnaker. If you want to add arbitrary clusters need to do the following: deploymentContext: my-context ``` +## Specifying Docker Registries and Valid Images (Repositories) + +Spinnaker will only give you access to Docker images that have been whitelisted, if you're using a private registry or a private repository you also need to provide credentials. Update the following values of the chart to do so: + + ```yaml + dockerRegistries: + - name: dockerhub + address: index.docker.io + repositories: + - library/alpine + - library/ubuntu + - library/centos + - library/nginx + # - name: gcr + # address: https://gcr.io + # username: _json_key + # password: '' + # email: 1234@5678.com + ``` + +You can provide passwords as a Helm value, or you can use a pre-created secret containing your registry passwords. The secret should have an item per Registry in the format: `: `. In which case you'll specify the secret to use in `dockerRegistryAccountSecret` like so: + + ```yaml + dockerRegistryAccountSecret: myregistry-secrets + ``` + ## Customizing your installation ### Manual diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml index 1d6744bdfcd3..fe2f4dcaba0a 100644 --- a/stable/spinnaker/templates/configmap/halyard-config.yaml +++ b/stable/spinnaker/templates/configmap/halyard-config.yaml @@ -56,7 +56,6 @@ data: {{ end }} # Docker Registry - $HAL_COMMAND config provider docker-registry enable {{- range $index, $registry := .Values.dockerRegistries }}