- Passthrough aws region to registry-creds plugin

- Add optional aws_session_token to configuration options for registry-creds for aws sts credentials
pull/1911/head
Ben Corlett 2017-09-05 11:59:40 +01:00
parent 2bb91bbbef
commit a2d8b1b434
2 changed files with 13 additions and 0 deletions

View File

@ -46,6 +46,7 @@ var addonsConfigureCmd = &cobra.Command{
// Default values
awsAccessID := "changeme"
awsAccessKey := "changeme"
awsSessionToken := ""
awsRegion := "changeme"
awsAccount := "changeme"
awsRole := "changeme"
@ -59,6 +60,7 @@ var addonsConfigureCmd = &cobra.Command{
if enableAWSECR {
awsAccessID = AskForStaticValue("-- Enter AWS Access Key ID: ")
awsAccessKey = AskForStaticValue("-- Enter AWS Secret Access Key: ")
awsSessionToken = AskForStaticValueOptional("-- (Optional) Enter AWS Session Token: ")
awsRegion = AskForStaticValue("-- Enter AWS Region: ")
awsAccount = AskForStaticValue("-- Enter 12 digit AWS Account ID: ")
awsRole = AskForStaticValueOptional("-- (Optional) Enter ARN of AWS role to assume: ")
@ -97,6 +99,7 @@ var addonsConfigureCmd = &cobra.Command{
map[string]string{
"AWS_ACCESS_KEY_ID": awsAccessID,
"AWS_SECRET_ACCESS_KEY": awsAccessKey,
"AWS_SESSION_TOKEN": awsSessionToken,
"aws-account": awsAccount,
"aws-region": awsRegion,
"aws-assume-role": awsRole,

View File

@ -35,6 +35,16 @@ spec:
secretKeyRef:
name: registry-creds-ecr
key: AWS_SECRET_ACCESS_KEY
- name: AWS_SESSION_TOKEN
valueFrom:
secretKeyRef:
name: registry-creds-ecr
key: AWS_SESSION_TOKEN
- name: awsregion
valueFrom:
secretKeyRef:
name: registry-creds-ecr
key: aws-region
- name: awsaccount
valueFrom:
secretKeyRef: