Skip to content

Commit 8f724e7

Browse files
committed
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 <[email protected]>
1 parent 033f0ec commit 8f724e7

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

test/e2e/data/kustomize/capi-v1beta1/ccm.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ metadata:
44
name: ccm-${CLUSTER_NAME}-crs-1
55
data: ${CCM_RESOURCES}
66
---
7+
apiVersion: v1
8+
kind: Secret
9+
metadata:
10+
name: ccm-${CLUSTER_NAME}-crs-1
11+
type: addons.cluster.x-k8s.io/resource-set
12+
stringData:
13+
cloud-config-secret.yaml: |
14+
apiVersion: v1
15+
kind: Secret
16+
metadata:
17+
# This name is referenced in the CCM deployment manifest
18+
name: cloud-config
19+
namespace: kube-system
20+
data:
21+
cloud.conf: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
22+
---
723
apiVersion: addons.cluster.x-k8s.io/v1beta1
824
kind: ClusterResourceSet
925
metadata:
@@ -15,4 +31,6 @@ spec:
1531
resources:
1632
- kind: ConfigMap
1733
name: ccm-${CLUSTER_NAME}-crs-1
34+
- kind: Secret
35+
name: ccm-${CLUSTER_NAME}-crs-1
1836
strategy: ApplyOnce

test/e2e/data/kustomize/capi-v1beta1/patch-ccm-cloud-config.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
- op: add
22
path: /spec/kubeadmConfigSpec/files
33
value: []
4-
- op: add
5-
path: /spec/kubeadmConfigSpec/files/-
6-
value:
7-
content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
8-
encoding: base64
9-
owner: root
10-
path: /etc/kubernetes/cloud.conf
11-
permissions: "0600"
124
- op: add
135
path: /spec/kubeadmConfigSpec/files/-
146
value:

0 commit comments

Comments
 (0)