Skip to content

Commit fbfa8ac

Browse files
committed
E2E: Update CCM manifests to 1.35
1 parent cd9c150 commit fbfa8ac

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

test/e2e/data/ccm/cloud-controller-manager.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# From: https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
2-
# NOTE! We modify the node-selector to have empty value (""). This matches what kubeadm does.
1+
# From: https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/tags/v1.35.0/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
32
apiVersion: v1
43
kind: ServiceAccount
54
metadata:
@@ -24,8 +23,13 @@ spec:
2423
labels:
2524
k8s-app: openstack-cloud-controller-manager
2625
spec:
27-
nodeSelector:
28-
node-role.kubernetes.io/control-plane: ""
26+
affinity:
27+
nodeAffinity:
28+
requiredDuringSchedulingIgnoredDuringExecution:
29+
nodeSelectorTerms:
30+
- matchExpressions:
31+
- key: node-role.kubernetes.io/control-plane
32+
operator: Exists
2933
securityContext:
3034
runAsUser: 1001
3135
tolerations:
@@ -43,7 +47,7 @@ spec:
4347
serviceAccountName: cloud-controller-manager
4448
containers:
4549
- name: openstack-cloud-controller-manager
46-
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.33.0
50+
image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.35.0
4751
args:
4852
- /bin/openstack-cloud-controller-manager
4953
- --v=1
@@ -85,7 +89,7 @@ spec:
8589
secret:
8690
secretName: cloud-config
8791
---
88-
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/heads/master/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
92+
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/tags/v1.35.0/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
8993
# NOTE! We need to "extract" the List or the CRS will fail to apply.
9094
apiVersion: rbac.authorization.k8s.io/v1
9195
kind: ClusterRoleBinding
@@ -113,7 +117,7 @@ subjects:
113117
name: cloud-controller-manager
114118
namespace: kube-system
115119
---
116-
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/heads/master/manifests/controller-manager/cloud-controller-manager-roles.yaml
120+
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/tags/v1.35.0/manifests/controller-manager/cloud-controller-manager-roles.yaml
117121
# NOTE! We need to "extract" the List or the CRS will fail to apply.
118122
apiVersion: rbac.authorization.k8s.io/v1
119123
kind: ClusterRole

0 commit comments

Comments
 (0)