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

Add aws- prefix to CCM SA

This commit is contained in:
Ole Markus With 2021-07-06 09:34:43 +02:00
parent 0e458331b0
commit bb367f22ea
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ 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 }}
@ -42,7 +42,7 @@ spec:
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 +57,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 +168,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

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

@ -36,7 +36,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 +56,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 +78,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 +203,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

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: 44f4c35583b89ca3dce92aad96c06095bc0ead28 manifestHash: 262dc72788b283088815442c33e4609e75769f7f
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