[stable/spinnaker] Add ecr as docker registry with --password-command parameter (#15564)

* [add] ecr as docker registry with --password-command parameter

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>

* [ref] bump chart version

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>

* [fix] version, appVersion

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>

* bump version

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>

* [fix] double quote passwordCommand

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>

* bump spinnaker version

Signed-off-by: Cédric Menassa <cedric.menassa@gmail.com>
This commit is contained in:
Cédric Menassa
2020-01-17 07:22:58 -08:00
committed by Kubernetes Prow Robot
parent 8331daf668
commit 7cb80611b9
4 changed files with 15 additions and 2 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
name: spinnaker
version: 1.23.0
version: 1.23.1
appVersion: 1.16.2
home: http://spinnaker.io/
sources:
+4
View File
@@ -103,6 +103,10 @@ dockerRegistries:
# username: _json_key
# password: '<INSERT YOUR SERVICE ACCOUNT JSON HERE>'
# email: 1234@5678.com
# - name: ecr
# address: https://<AWS-ACCOUNT-ID>.dkr.ecr.<REGION>.amazonaws.com
# username: AWS
# passwordCommand: "aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'"
```
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: `<registry name>: <password>`. In which case you'll specify the secret to use in `dockerRegistryAccountSecret` like so:
@@ -101,7 +101,12 @@ data:
CREDS=""
{{ if $registry.username -}}
CREDS+="--username {{ $registry.username }} --password-file /opt/registry/passwords/{{ $registry.name }}"
CREDS+="--username {{ $registry.username }}"
{{ if $registry.passwordCommand -}}
CREDS+=" --password-command {{ $registry.passwordCommand | quote }}"
{{- else -}}
CREDS+=" --password-file /opt/registry/passwords/{{ $registry.name }}"
{{- end -}}
{{ if $registry.email -}}
CREDS+=" --email {{ $registry.email }}"
{{- end -}}
+4
View File
@@ -147,6 +147,10 @@ dockerRegistries:
# username: _json_key
# password: '<INSERT YOUR SERVICE ACCOUNT JSON HERE>'
# email: 1234@5678.com
# - name: ecr
# address: <AWS-ACCOUNT-ID>.dkr.ecr.<REGION>.amazonaws.com
# username: AWS
# passwordCommand: "aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'"
# If you don't want to put your passwords into a values file
# you can use a pre-created secret instead of putting passwords