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

Use localhost as API address for CCM

This commit is contained in:
Ole Markus With 2021-07-06 15:26:30 +02:00
parent bedfb409ca
commit af0aefd2e7
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,16 +27,19 @@ spec:
effect: NoSchedule effect: NoSchedule
serviceAccountName: aws-cloud-controller-manager serviceAccountName: aws-cloud-controller-manager
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 imagePullPolicy: IfNotPresent
args: args:
{{- range $arg := CloudControllerConfigArgv }} {{- range $arg := CloudControllerConfigArgv }}
- {{ $arg }} - {{ $arg }}
{{- end }} {{- end }}
resources: env:
requests: - name: KUBERNETES_SERVICE_HOST
cpu: 200m value: "127.0.0.1"
resources:
requests:
cpu: 200m
hostNetwork: true hostNetwork: true
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
--- ---

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

@ -27,6 +27,9 @@ spec:
- --allocate-node-cidrs=true - --allocate-node-cidrs=true
- --configure-cloud-routes=false - --configure-cloud-routes=false
- --use-service-account-credentials=true - --use-service-account-credentials=true
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager name: aws-cloud-controller-manager

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: 9ca4820e2d12cabdb9b2d32c2f8f9b00e3e75a7f manifestHash: ef74ee3b557b92e6e6944329c81e4f1925e2f3df
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