Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add additional config options for registry-creds addon / Bump version #1711

Merged
merged 1 commit into from
Jul 20, 2017
Merged

Add additional config options for registry-creds addon / Bump version #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/minikube/cmd/config/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ var addonsConfigureCmd = &cobra.Command{
awsAccessKey := "changeme"
awsRegion := "changeme"
awsAccount := "changeme"
awsRole := "changeme"
gcrApplicationDefaultCredentials := "changeme"
dockerServer := "changeme"
dockerUser := "changeme"
Expand All @@ -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)
Expand Down Expand Up @@ -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",
Expand Down
17 changes: 11 additions & 6 deletions deploy/addons/registry-creds/registry-creds-rc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down