Skip to content

Update the cluster templates with the latest changes added in cluster-api version 1.11.0-alpha.2 #2414

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+141 −136
Open

Update the cluster templates with the latest changes added in cluster-api version 1.11.0-alpha.2 #2414

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
4 changes: 2 additions & 2 deletions templates/bases/powervs/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
cidrBlocks:
- ${SERVICE_CIDR:="10.128.0.0/12"}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
kind: IBMPowerVSCluster
name: "${CLUSTER_NAME}"
controlPlaneRef:
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
apiGroup: controlplane.cluster.x-k8s.io
kind: KubeadmControlPlane
name: "${CLUSTER_NAME}-control-plane"
---
Expand Down
3 changes: 1 addition & 2 deletions templates/bases/powervs/kcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
machineTemplate:
infrastructureRef:
kind: IBMPowerVSMachineTemplate
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
name: "${CLUSTER_NAME}-control-plane"
kubeadmConfigSpec:
clusterConfiguration:
Expand All @@ -34,7 +34,6 @@ spec:
discovery:
bootstrapToken:
apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
token: ""
caCertHashes: [ ]
unsafeSkipCAVerification: false
nodeRegistration:
Expand Down
1 change: 0 additions & 1 deletion templates/bases/powervs/kubeadm-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ spec:
discovery:
bootstrapToken:
apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
token: ""
caCertHashes: []
unsafeSkipCAVerification: false
nodeRegistration:
Expand Down
4 changes: 2 additions & 2 deletions templates/bases/powervs/md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ spec:
bootstrap:
configRef:
name: "${CLUSTER_NAME}-md-0"
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
apiGroup: bootstrap.cluster.x-k8s.io
kind: KubeadmConfigTemplate
infrastructureRef:
name: "${CLUSTER_NAME}-md-0"
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
kind: IBMPowerVSMachineTemplate
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand Down
6 changes: 2 additions & 4 deletions templates/bases/vpc/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ spec:
cidrBlocks:
- ${SERVICE_CIDR:="10.128.0.0/12"}
infrastructureRef:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
kind: IBMVPCCluster
name: "${CLUSTER_NAME}"
namespace: "${NAMESPACE}"
controlPlaneRef:
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
apiGroup: controlplane.cluster.x-k8s.io
kind: KubeadmControlPlane
name: "${CLUSTER_NAME}-control-plane"
namespace: "${NAMESPACE}"
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: IBMVPCCluster
Expand Down
5 changes: 1 addition & 4 deletions templates/bases/vpc/kcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ spec:
machineTemplate:
infrastructureRef:
kind: IBMVPCMachineTemplate
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
name: "${CLUSTER_NAME}-control-plane"
namespace: "${NAMESPACE}"
kubeadmConfigSpec:
clusterConfiguration:
kubernetesVersion: ${KUBERNETES_VERSION}
controllerManager:
extraArgs:
- name: enable-hostpath-provisioner
Expand All @@ -23,7 +21,6 @@ spec:
certSANs: [localhost, 127.0.0.1]
dns: {}
etcd: {}
networking: {}
scheduler: {}
initConfiguration:
nodeRegistration:
Expand Down
4 changes: 2 additions & 2 deletions templates/bases/vpc/md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ spec:
bootstrap:
configRef:
name: "${CLUSTER_NAME}-md-0"
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiGroup: bootstrap.cluster.x-k8s.io
kind: KubeadmConfigTemplate
infrastructureRef:
name: "${CLUSTER_NAME}-md-0"
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
apiGroup: infrastructure.cluster.x-k8s.io
kind: IBMVPCMachineTemplate
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand Down
46 changes: 27 additions & 19 deletions templates/cluster-template-powervs-clusterclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1beta1
apiVersion: cluster.x-k8s.io/v1beta2
kind: Cluster
metadata:
labels:
Expand All @@ -15,17 +15,18 @@ spec:
cidrBlocks:
- ${SERVICE_CIDR:="10.128.0.0/12"}
topology:
class: ${IBMPOWERVS_CLUSTER_CLASS_NAME}
classRef:
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}
controlPlane:
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: default-worker
name: md-0
replicas: 2
replicas: ${WORKER_MACHINE_COUNT}
---
apiVersion: cluster.x-k8s.io/v1beta1
apiVersion: cluster.x-k8s.io/v1beta2
kind: ClusterClass
metadata:
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME:="powervs-cc"}
Expand All @@ -37,7 +38,7 @@ spec:
kind: IBMPowerVSMachineTemplate
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane-machinetemplate
ref:
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: KubeadmControlPlaneTemplate
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane
infrastructure:
Expand All @@ -51,7 +52,7 @@ spec:
template:
bootstrap:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: KubeadmConfigTemplate
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0
infrastructure:
Expand All @@ -74,7 +75,7 @@ spec:
name: ${IBMPOWERVS_NETWORK_NAME}
serviceInstanceID: ${IBMPOWERVS_SERVICE_INSTANCE_ID}
---
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: KubeadmControlPlaneTemplate
metadata:
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane
Expand All @@ -88,12 +89,15 @@ spec:
- ${IBMPOWERVS_VIP}
- ${IBMPOWERVS_VIP_EXTERNAL}
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
controllerManager:
extraArgs:
cloud-provider: external
enable-hostpath-provisioner: "true"
- name: cloud-provider
value: external
- name: enable-hostpath-provisioner
value: "true"
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -215,21 +219,24 @@ spec:
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
joinConfiguration:
discovery:
bootstrapToken:
apiServerEndpoint: 192.168.167.85:${API_SERVER_PORT:=6443}
caCertHashes: []
token: ""
unsafeSkipCAVerification: false
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
preKubeadmCommands:
- hostname "{{ v1.local_hostname }}"
Expand All @@ -240,7 +247,7 @@ spec:
- for script in $(find /etc/pre-kubeadm-commands/ -name '*.sh' -type f | sort);
do echo "Running script $script"; "$script"; done
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: KubeadmConfigTemplate
metadata:
labels:
Expand All @@ -255,13 +262,14 @@ spec:
bootstrapToken:
apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
caCertHashes: []
token: ""
unsafeSkipCAVerification: false
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
preKubeadmCommands:
- hostname "{{ v1.local_hostname }}"
Expand Down
37 changes: 22 additions & 15 deletions templates/cluster-template-powervs-clusterclass/cluster-with-kcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: cluster.x-k8s.io/v1beta1
apiVersion: cluster.x-k8s.io/v1beta2
kind: Cluster
metadata:
labels:
Expand All @@ -15,17 +15,18 @@ spec:
cidrBlocks:
- ${SERVICE_CIDR:="10.128.0.0/12"}
topology:
class: "${IBMPOWERVS_CLUSTER_CLASS_NAME}"
classRef:
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}"
controlPlane:
replicas: ${CONTROL_PLANE_MACHINE_COUNT}
version: ${KUBERNETES_VERSION}
workers:
machineDeployments:
- class: default-worker
name: md-0
replicas: 2
replicas: ${WORKER_MACHINE_COUNT}
---
apiVersion: cluster.x-k8s.io/v1beta1
apiVersion: cluster.x-k8s.io/v1beta2
kind: ClusterClass
metadata:
name: ${IBMPOWERVS_CLUSTER_CLASS_NAME:="powervs-cc"}
Expand All @@ -37,7 +38,7 @@ spec:
kind: IBMPowerVSMachineTemplate
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane-machinetemplate"
ref:
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: KubeadmControlPlaneTemplate
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane"
infrastructure:
Expand All @@ -51,7 +52,7 @@ spec:
template:
bootstrap:
ref:
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: KubeadmConfigTemplate
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-md-0"
infrastructure:
Expand All @@ -74,7 +75,7 @@ spec:
name: "${IBMPOWERVS_NETWORK_NAME}"
serviceInstanceID: "${IBMPOWERVS_SERVICE_INSTANCE_ID}"
---
apiVersion: controlplane.cluster.x-k8s.io/v1beta1
apiVersion: controlplane.cluster.x-k8s.io/v1beta2
kind: KubeadmControlPlaneTemplate
metadata:
name: "${IBMPOWERVS_CLUSTER_CLASS_NAME}-control-plane"
Expand All @@ -88,12 +89,15 @@ spec:
- "${IBMPOWERVS_VIP}"
- "${IBMPOWERVS_VIP_EXTERNAL}"
extraArgs:
cloud-provider: external
- name: cloud-provider
value: external
controlPlaneEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
controllerManager:
extraArgs:
cloud-provider: external
enable-hostpath-provisioner: "true"
- name: cloud-provider
value: external
- name: enable-hostpath-provisioner
value: "true"
files:
- content: |
apiVersion: v1
Expand Down Expand Up @@ -215,21 +219,24 @@ spec:
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
joinConfiguration:
discovery:
bootstrapToken:
apiServerEndpoint: 192.168.167.85:${API_SERVER_PORT:=6443}
caCertHashes: []
token: ""
unsafeSkipCAVerification: false
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
preKubeadmCommands:
- hostname "{{ v1.local_hostname }}"
Expand Down
9 changes: 5 additions & 4 deletions templates/cluster-template-powervs-clusterclass/md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
apiVersion: bootstrap.cluster.x-k8s.io/v1beta2
kind: KubeadmConfigTemplate
metadata:
labels:
Expand All @@ -13,13 +13,14 @@ spec:
bootstrapToken:
apiServerEndpoint: ${IBMPOWERVS_VIP}:${API_SERVER_PORT:=6443}
caCertHashes: []
token: ""
unsafeSkipCAVerification: false
nodeRegistration:
criSocket: unix:///var/run/containerd/containerd.sock
kubeletExtraArgs:
cloud-provider: external
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
- name: cloud-provider
value: external
- name: eviction-hard
value: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
name: '{{ v1.local_hostname }}'
preKubeadmCommands:
- hostname "{{ v1.local_hostname }}"
Expand Down
Loading