Skip to content

🌱 E2E: Fix the CCM patch for the v1beta1 cluster-template #2766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
+18 −8
Merged

🌱 E2E: Fix the CCM patch for the v1beta1 cluster-template #2766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions test/e2e/data/kustomize/capi-v1beta1/ccm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ metadata:
name: ccm-${CLUSTER_NAME}-crs-1
data: ${CCM_RESOURCES}
---
apiVersion: v1
kind: Secret
metadata:
name: ccm-${CLUSTER_NAME}-crs-1
type: addons.cluster.x-k8s.io/resource-set
stringData:
cloud-config-secret.yaml: |
apiVersion: v1
kind: Secret
metadata:
# This name is referenced in the CCM deployment manifest
name: cloud-config
namespace: kube-system
data:
cloud.conf: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
---
apiVersion: addons.cluster.x-k8s.io/v1beta1
kind: ClusterResourceSet
metadata:
Expand All @@ -15,4 +31,6 @@ spec:
resources:
- kind: ConfigMap
name: ccm-${CLUSTER_NAME}-crs-1
- kind: Secret
name: ccm-${CLUSTER_NAME}-crs-1
strategy: ApplyOnce
8 changes: 0 additions & 8 deletions test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
- op: add
path: /spec/kubeadmConfigSpec/files
value: []
- op: add
path: /spec/kubeadmConfigSpec/files/-
value:
content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
encoding: base64
owner: root
path: /etc/kubernetes/cloud.conf
permissions: "0600"
- op: add
path: /spec/kubeadmConfigSpec/files/-
value:
Expand Down