From 8f724e782bf23abbc0a76a03fcfb7cb6e12016be Mon Sep 17 00:00:00 2001
From: Lennart Jern <lennart.jern@est.tech>
Date: Thu, 9 Oct 2025 06:09:13 +0000
Subject: [PATCH] E2E: Fix the CCM patch for the v1beta1 cluster-template

I forgot this when changing the CCM to use a Secret instead of
a host path mount.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>
---
 test/e2e/data/kustomize/capi-v1beta1/ccm.yaml  | 18 ++++++++++++++++++
 .../capi-v1beta1/patch-ccm-cloud-config.yaml   |  8 --------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/e2e/data/kustomize/capi-v1beta1/ccm.yaml b/test/e2e/data/kustomize/capi-v1beta1/ccm.yaml
index 9a0d627646..4f50319c56 100644
--- a/test/e2e/data/kustomize/capi-v1beta1/ccm.yaml
+++ b/test/e2e/data/kustomize/capi-v1beta1/ccm.yaml
@@ -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:
@@ -15,4 +31,6 @@ spec:
   resources:
   - kind: ConfigMap
     name: ccm-${CLUSTER_NAME}-crs-1
+  - kind: Secret
+    name: ccm-${CLUSTER_NAME}-crs-1
   strategy: ApplyOnce
diff --git a/test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml b/test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml
index b88d9eda92..f12a04eb7d 100644
--- a/test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml
+++ b/test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml
@@ -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: