kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't always pull the CCM image

This commit is contained in:
Ole Markus With 2021-07-06 13:46:21 +02:00
parent bb367f22ea
commit bedfb409ca
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/models/cloudup/resources/addons/aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml.template
View File

@ -29,6 +29,7 @@ spec:
containers: containers:
- name: aws-cloud-controller-manager - name: aws-cloud-controller-manager
image: {{ if .ExternalCloudControllerManager.Image }}{{ .ExternalCloudControllerManager.Image }}{{ else }}gcr.io/k8s-staging-provider-aws/cloud-controller-manager:{{AWSCCMTag}}{{ end }} image: {{ if .ExternalCloudControllerManager.Image }}{{ .ExternalCloudControllerManager.Image }}{{ else }}gcr.io/k8s-staging-provider-aws/cloud-controller-manager:{{AWSCCMTag}}{{ end }}
imagePullPolicy: IfNotPresent
args: args:
{{- range $arg := CloudControllerConfigArgv }} {{- range $arg := CloudControllerConfigArgv }}
- {{ $arg }} - {{ $arg }}

1
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/aws-cloud-controller.addons.k8s.io-k8s-1.18.yaml
View File

@ -28,6 +28,7 @@ spec:
- --configure-cloud-routes=false - --configure-cloud-routes=false
- --use-service-account-credentials=true - --use-service-account-credentials=true
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:
requests: requests:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
View File

@ -47,7 +47,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18 - id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 262dc72788b283088815442c33e4609e75769f7f manifestHash: 9ca4820e2d12cabdb9b2d32c2f8f9b00e3e75a7f
name: aws-cloud-controller.addons.k8s.io name: aws-cloud-controller.addons.k8s.io
selector: selector:
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io