Skip to content

Commit 8e44fdd

Browse files
committed
fix clusterresourceset & pod cidr
1 parent bd463d2 commit 8e44fdd

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

templates/cluster-template.yaml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kind: Cluster
33
metadata:
44
name: "${CLUSTER_NAME}"
55
namespace: "${NAMESPACE}"
6+
labels:
7+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
68
spec:
79
infrastructureRef:
810
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -23,6 +25,8 @@ kind: ProxmoxCluster
2325
metadata:
2426
name: "${CLUSTER_NAME}"
2527
namespace: "${NAMESPACE}"
28+
labels:
29+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
2630
spec:
2731
controlPlaneEndpoint:
2832
host: "${CONTROLPLANE_HOST}"
@@ -46,6 +50,8 @@ kind: KubeadmControlPlane
4650
metadata:
4751
name: "${CLUSTER_NAME}"
4852
namespace: "${NAMESPACE}"
53+
labels:
54+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
4955
spec:
5056
kubeadmConfigSpec:
5157
clusterConfiguration:
@@ -61,7 +67,7 @@ spec:
6167
networking:
6268
dnsDomain: cluster.local
6369
serviceSubnet: 10.96.0.0/12
64-
podSubnet: 10.98.0.0/16
70+
podSubnet: 10.244.0.0/16
6571
initConfiguration:
6672
localAPIEndpoint:
6773
advertiseAddress: "${CONTROLPLANE_HOST}"
@@ -90,6 +96,8 @@ kind: ProxmoxMachineTemplate
9096
metadata:
9197
name: ${CLUSTER_NAME}-controlplane
9298
namespace: "${NAMESPACE}"
99+
labels:
100+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
93101
spec:
94102
template:
95103
spec:
@@ -156,6 +164,8 @@ kind: MachineDeployment
156164
metadata:
157165
name: ${CLUSTER_NAME}-md-0
158166
namespace: ${NAMESPACE}
167+
labels:
168+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
159169
spec:
160170
clusterName: "${CLUSTER_NAME}"
161171
replicas: ${WORKER_MACHINE_COUNT}
@@ -182,9 +192,15 @@ kind: KubeadmConfigTemplate
182192
metadata:
183193
name: ${CLUSTER_NAME}-md-0
184194
namespace: ${NAMESPACE}
195+
labels:
196+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
185197
spec:
186198
template:
187199
spec:
200+
initConfiguration:
201+
nodeRegistration:
202+
kubeletExtraArgs:
203+
cloud-provider: external
188204
postKubeadmCommands:
189205
- "curl -L https://dl.k8s.io/release/v1.27.3/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl"
190206
- "chmod +x /usr/local/bin/kubectl"
@@ -197,6 +213,8 @@ kind: ProxmoxMachineTemplate
197213
metadata:
198214
name: ${CLUSTER_NAME}-md-0
199215
namespace: ${NAMESPACE}
216+
labels:
217+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
200218
spec:
201219
template:
202220
spec:
@@ -261,17 +279,19 @@ kind: Secret
261279
metadata:
262280
name: "${CLUSTER_NAME}"
263281
namespace: "${NAMESPACE}"
282+
labels:
283+
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
264284
type: Opaque
265285

266286
---
267287

268288
apiVersion: addons.cluster.x-k8s.io/v1beta1
269289
kind: ClusterResourceSet
270290
metadata:
291+
name: ${CLUSTER_NAME}-crs-0
292+
namespace: "${NAMESPACE}"
271293
labels:
272294
cluster.x-k8s.io/cluster-name: '${CLUSTER_NAME}'
273-
name: ${CLUSTER_NAME}-crs-1
274-
namespace: "${NAMESPACE}"
275295
spec:
276296
clusterSelector:
277297
matchLabels:

0 commit comments

Comments
 (0)