From 8ba6f478761fdf30806aba2b20bc48b0bba86efe Mon Sep 17 00:00:00 2001 From: Steve Sloka Date: Tue, 18 Jul 2017 11:10:24 -0400 Subject: [PATCH] Add additional config options for registry-creds addon / Bump version --- cmd/minikube/cmd/config/configure.go | 3 +++ .../registry-creds/registry-creds-rc.yaml | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/config/configure.go b/cmd/minikube/cmd/config/configure.go index fb65f43fe7d9..77ac5ccb556e 100644 --- a/cmd/minikube/cmd/config/configure.go +++ b/cmd/minikube/cmd/config/configure.go @@ -48,6 +48,7 @@ var addonsConfigureCmd = &cobra.Command{ awsAccessKey := "changeme" awsRegion := "changeme" awsAccount := "changeme" + awsRole := "changeme" gcrApplicationDefaultCredentials := "changeme" dockerServer := "changeme" dockerUser := "changeme" @@ -59,6 +60,7 @@ var addonsConfigureCmd = &cobra.Command{ awsAccessKey = AskForStaticValue("-- Enter AWS Secret Access Key: ") awsRegion = AskForStaticValue("-- Enter AWS Region: ") awsAccount = AskForStaticValue("-- Enter 12 digit AWS Account ID: ") + awsRole = AskForStaticValue("-- (Optional) Enter ARN of AWS role to assume: ") } enableGCR := AskForYesNoConfirmation("\nDo you want to enable Google Container Registry?", posResponses, negResponses) @@ -91,6 +93,7 @@ var addonsConfigureCmd = &cobra.Command{ "AWS_SECRET_ACCESS_KEY": awsAccessKey, "aws-account": awsAccount, "aws-region": awsRegion, + "aws-assume-role": awsRole, }, map[string]string{ "app": "registry-creds", diff --git a/deploy/addons/registry-creds/registry-creds-rc.yaml b/deploy/addons/registry-creds/registry-creds-rc.yaml index f6f07008fd08..413dea3f1cdc 100644 --- a/deploy/addons/registry-creds/registry-creds-rc.yaml +++ b/deploy/addons/registry-creds/registry-creds-rc.yaml @@ -4,24 +4,24 @@ metadata: name: registry-creds namespace: kube-system labels: - version: v1.7 + version: v1.8 addonmanager.kubernetes.io/mode: Reconcile kubernetes.io/minikube-addons: registry-creds spec: replicas: 1 selector: name: registry-creds - version: v1.7 + version: v1.8 addonmanager.kubernetes.io/mode: Reconcile template: metadata: labels: name: registry-creds - version: v1.7 + version: v1.8 addonmanager.kubernetes.io/mode: Reconcile spec: containers: - - image: upmcenterprises/registry-creds:1.7 + - image: upmcenterprises/registry-creds:1.8 name: registry-creds imagePullPolicy: Always env: @@ -40,11 +40,16 @@ spec: secretKeyRef: name: registry-creds-ecr key: aws-account - - name: awsregion + - name: aws_assume_role valueFrom: secretKeyRef: name: registry-creds-ecr - key: aws-region + key: aws-assume-role + - name: awsaccount + valueFrom: + secretKeyRef: + name: registry-creds-ecr + key: aws-account - name: DOCKER_PRIVATE_REGISTRY_PASSWORD valueFrom: secretKeyRef: