Merge pull request #11939 from olemarkus/ccm-issues

Fix various CCM issues
This commit is contained in:
Kubernetes Prow Robot 2021-07-06 10:12:19 -07:00 committed by GitHub
commit 7f93801afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 16 deletions

View File

@ -25,24 +25,28 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
effect: NoSchedule effect: NoSchedule
serviceAccountName: 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 }}
args: imagePullPolicy: IfNotPresent
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
--- ---
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
@ -57,7 +61,7 @@ roleRef:
subjects: subjects:
- apiGroup: "" - apiGroup: ""
kind: ServiceAccount kind: ServiceAccount
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
@ -168,6 +172,6 @@ roleRef:
subjects: subjects:
- apiGroup: "" - apiGroup: ""
kind: ServiceAccount kind: ServiceAccount
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system

View File

@ -27,7 +27,11 @@ 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
name: aws-cloud-controller-manager name: aws-cloud-controller-manager
resources: resources:
requests: requests:
@ -36,7 +40,7 @@ spec:
nodeSelector: nodeSelector:
node-role.kubernetes.io/master: "" node-role.kubernetes.io/master: ""
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
serviceAccountName: cloud-controller-manager serviceAccountName: aws-cloud-controller-manager
tolerations: tolerations:
- effect: NoSchedule - effect: NoSchedule
key: node.cloudprovider.kubernetes.io/uninitialized key: node.cloudprovider.kubernetes.io/uninitialized
@ -56,7 +60,7 @@ metadata:
addon.kops.k8s.io/name: aws-cloud-controller.addons.k8s.io addon.kops.k8s.io/name: aws-cloud-controller.addons.k8s.io
app.kubernetes.io/managed-by: kops app.kubernetes.io/managed-by: kops
k8s-addon: aws-cloud-controller.addons.k8s.io k8s-addon: aws-cloud-controller.addons.k8s.io
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
@ -78,7 +82,7 @@ roleRef:
subjects: subjects:
- apiGroup: "" - apiGroup: ""
kind: ServiceAccount kind: ServiceAccount
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system
--- ---
@ -203,5 +207,5 @@ roleRef:
subjects: subjects:
- apiGroup: "" - apiGroup: ""
kind: ServiceAccount kind: ServiceAccount
name: cloud-controller-manager name: aws-cloud-controller-manager
namespace: kube-system namespace: kube-system

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: 44f4c35583b89ca3dce92aad96c06095bc0ead28 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