Skip to content

Commit 8836ef2

Browse files
committed
Update cloud-provider-openstack in e2e tests
1 parent 6565445 commit 8836ef2

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,23 @@ spec:
4040
serviceAccountName: cloud-controller-manager
4141
containers:
4242
- name: openstack-cloud-controller-manager
43-
image: docker.io/k8scloudprovider/openstack-cloud-controller-manager:v1.23.1
43+
image: >-
44+
registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.32.0
4445
args:
4546
- /bin/openstack-cloud-controller-manager
4647
- --v=1
48+
- --cluster-name=$(CLUSTER_NAME)
4749
- --cloud-config=$(CLOUD_CONFIG)
4850
- --cloud-provider=openstack
49-
- --use-service-account-credentials=true
51+
- --use-service-account-credentials=false
5052
- --bind-address=127.0.0.1
5153
volumeMounts:
5254
- mountPath: /etc/kubernetes
5355
name: k8s
5456
readOnly: true
57+
- mountPath: /etc/kubernetes/pki
58+
name: k8s-certs
59+
readOnly: true
5560
- mountPath: /etc/ssl/certs
5661
name: ca-certs
5762
readOnly: true
@@ -61,18 +66,24 @@ spec:
6166
env:
6267
- name: CLOUD_CONFIG
6368
value: /etc/kubernetes/cloud.conf
69+
- name: CLUSTER_NAME
70+
value: kubernetes
6471
hostNetwork: true
6572
volumes:
6673
- hostPath:
6774
path: /etc/kubernetes
6875
type: DirectoryOrCreate
6976
name: k8s
77+
- hostPath:
78+
path: /etc/kubernetes/pki
79+
type: DirectoryOrCreate
80+
name: k8s-certs
7081
- hostPath:
7182
path: /etc/ssl/certs
7283
type: DirectoryOrCreate
7384
name: ca-certs
7485
---
75-
# From: https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/cluster/addons/rbac/cloud-controller-manager-role-bindings.yaml
86+
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/heads/master/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
7687
apiVersion: rbac.authorization.k8s.io/v1
7788
kind: ClusterRoleBinding
7889
metadata:
@@ -99,7 +110,7 @@ subjects:
99110
name: cloud-controller-manager
100111
namespace: kube-system
101112
---
102-
# From: https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/master/cluster/addons/rbac/cloud-controller-manager-roles.yaml
113+
# https://raw.githubusercontent.com/kubernetes/cloud-provider-openstack/refs/heads/master/manifests/controller-manager/cloud-controller-manager-roles.yaml
103114
apiVersion: rbac.authorization.k8s.io/v1
104115
kind: ClusterRole
105116
metadata:

0 commit comments

Comments
 (0)