diff --git a/docs/book/src/01_user/01_getting-started.md b/docs/book/src/01_user/01_getting-started.md index 45d6ac97..77548ece 100644 --- a/docs/book/src/01_user/01_getting-started.md +++ b/docs/book/src/01_user/01_getting-started.md @@ -71,20 +71,13 @@ providers: url: "https://github.com/rancher/cluster-api-provider-rke2/releases/${VERSION}/control-plane-components.yaml" type: "ControlPlaneProvider" ``` -> NOTE: Due to some issue related to how `CAPD` creates Load Balancer healthchecks, it is necessary to use a fork of `CAPD` by providing in the above configuration file the following : - -```yaml - - name: "docker" - url: "https://github.com/belgaied2/cluster-api/releases/v1.3.3-cabpr-fix/infrastructure-components.yaml" - type: "InfrastructureProvider" -``` This configuration tells clusterctl where to look for provider manifests in order to deploy provider components in the management cluster. The next step is to run the `clusterctl init` command: ```bash -clusterctl init --bootstrap rke2 --control-plane rke2 --infrastructure docker:v1.3.3-cabpr-fix +clusterctl init --bootstrap rke2 --control-plane rke2 ``` This should output something similar to the following: @@ -110,20 +103,20 @@ There are some sample cluster templates available under the `examples` folder. T For this `Getting Started` section, we will be using the `docker` samples available under `examples/docker/online-default` folder. This folder contains a YAML template file called `cluster-template.yaml` which contains environment variable placeholders which can be substituted using the [envsubst](https://github.com/a8m/envsubst/releases) tool. We will use `clusterctl` to generate the manifests from these template files. Set the following environment variables: -- CABPR_NAMESPACE +- NAMESPACE - CLUSTER_NAME -- CABPR_CP_REPLICAS -- CABPR_WK_REPLICAS +- CONTROL_PLANE_MACHINE_COUNT +- WORKER_MACHINE_COUNT - KUBERNETES_VERSION - KIND_IMAGE_VERSION for example: ```bash -export CABPR_NAMESPACE=example +export NAMESPACE=example export CLUSTER_NAME=capd-rke2-test -export CABPR_CP_REPLICAS=3 -export CABPR_WK_REPLICAS=2 +export CONTROL_PLANE_MACHINE_COUNT=3 +export WORKER_MACHINE_COUNT=2 export KUBERNETES_VERSION=v1.30.3 export KIND_IMAGE_VERSION=v1.30.3 ``` @@ -220,8 +213,8 @@ If you are interested in leveraging this functionality, you can refer to the exa As with other sample templates, you will need to set a number environment variables: - CLUSTER_NAME -- CABPR_CP_REPLICAS -- CABPR_WK_REPLICAS +- CONTROL_PLANE_MACHINE_COUNT +- WORKER_MACHINE_COUNT - KUBERNETES_VERSION - KIND_IP @@ -229,8 +222,8 @@ for example: ```bash export CLUSTER_NAME=capd-rke2-clusterclass -export CABPR_CP_REPLICAS=3 -export CABPR_WK_REPLICAS=2 +export CONTROL_PLANE_MACHINE_COUNT=3 +export WORKER_MACHINE_COUNT=2 export KUBERNETES_VERSION=v1.30.3 export KIND_IP=192.168.20.20 ``` diff --git a/docs/book/src/02_topics/01_air-gapped-installation.md b/docs/book/src/02_topics/01_air-gapped-installation.md index cd41bc62..f26bad94 100644 --- a/docs/book/src/02_topics/01_air-gapped-installation.md +++ b/docs/book/src/02_topics/01_air-gapped-installation.md @@ -13,13 +13,13 @@ RKE2 supports Air-Gapped installation using : - 2 methods for actual RKE2 installation after the node is prepared: Manual deployment, and Using `install.sh` from `https://get.rke2.io`. -## Methods supported by CABPR (Cluster API Provider RKE2) +## Methods supported by CAPRKE2 (Cluster API Provider RKE2) -In choosing between the RKE2 Air-Gapped cluster creation modes above, CABPR has chosen the best tradeoff in terms of simplicity, usability and limitation of dependencies. +In choosing between the RKE2 Air-Gapped cluster creation modes above, CAPRKE2 has chosen the best tradeoff in terms of simplicity, usability and limitation of dependencies. ### Node preparation -The method that is supported by CABPR is the Tarball on the node using custom images. The reasons behind this choice include: +The method that is supported by CAPRKE2 is the Tarball on the node using custom images. The reasons behind this choice include: - No dependency on the environments' network infrastructure and Image Registry, and the registry approach does not exempt from needing to use a custom image anyway. @@ -28,13 +28,13 @@ The method that is supported by CABPR is the Tarball on the node using custom im ### RKE2 deployment -The method that is supported by CABPR for RKE2 deployment is by using the `install.sh` approach, described [here](https://docs.rke2.io/install/airgap#rke2-installsh-script-install). This approach is used because it automates a number of tasks needed for RKE2 to be deployed, like creating file hierarchy, unpacking Tarball, and creating `systemd` service units. +The method that is supported by CAPRKE2 for RKE2 deployment is by using the `install.sh` approach, described [here](https://docs.rke2.io/install/airgap#rke2-installsh-script-install). This approach is used because it automates a number of tasks needed for RKE2 to be deployed, like creating file hierarchy, unpacking Tarball, and creating `systemd` service units. Since these tasks might change in the future, we prefer to rely on the upstream script from RKE2, available in the latest valid version at: https://get.rke2.io . ## Pre-requisites on base image -Considering the above tradeoffs, base images used for Air-Gapped need to comply to some pre-requisites in order to work with CABPR. This sections list these pre-requisites: +Considering the above tradeoffs, base images used for Air-Gapped need to comply to some pre-requisites in order to work with CAPRKE2. This sections list these pre-requisites: - Support and presence of `cloud-init` (ignition bootstrapping is also on the roadmap) @@ -49,8 +49,8 @@ Considering the above tradeoffs, base images used for Air-Gapped need to comply - Previous pre-requisites should be built into an machine image, for instance, for instance a container image for CAPD or an AMI for AWS EC2. Each Infrastructure provider has its own way of defining machine images. -### Configuration of CABPR for Air-Gapped use +### Configuration of CAPRKE2 for Air-Gapped use -In order to deploy RKE2 Clusters in Air-Gapped mode using CABPR, you need to set the fields `spec.agentConfig.airGapped` for the RKE2ControlPlane object and `spec.template.spec.agentConfig.airGapped` for RKE2ConfigTemplate object to `true`. +In order to deploy RKE2 Clusters in Air-Gapped mode using CAPRKE2, you need to set the fields `spec.agentConfig.airGapped` for the RKE2ControlPlane object and `spec.template.spec.agentConfig.airGapped` for RKE2ConfigTemplate object to `true`. You can check a reference implementation for CAPD [here](https://github.com/rancher/cluster-api-provider-rke2/tree/main/examples/docker/air-gapped) including configuration for CAPD custom image. \ No newline at end of file diff --git a/examples/docker/air-gapped/image-building/README.md b/examples/docker/air-gapped/image-building/README.md index 2b6d795b..78243894 100644 --- a/examples/docker/air-gapped/image-building/README.md +++ b/examples/docker/air-gapped/image-building/README.md @@ -1,4 +1,4 @@ -# Air-Gapped CAPD image building for CABPR +# Air-Gapped CAPD image building for CAPRKE2 ## Needed Artifacts for RKE2 Air Gapped Installation diff --git a/examples/docker/air-gapped/rke2-sample.yaml b/examples/docker/air-gapped/rke2-sample.yaml index c3f7ceb9..227e480a 100644 --- a/examples/docker/air-gapped/rke2-sample.yaml +++ b/examples/docker/air-gapped/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -30,7 +30,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -40,9 +40,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION}+rke2r1 agentConfig: airGapped: true @@ -64,7 +64,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: @@ -74,10 +74,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -90,18 +90,18 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: @@ -110,7 +110,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -125,7 +125,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/examples/docker/cis-profile/rke2-sample.yaml b/examples/docker/cis-profile/rke2-sample.yaml index 8e945cc4..7889a598 100644 --- a/examples/docker/cis-profile/rke2-sample.yaml +++ b/examples/docker/cis-profile/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -30,7 +30,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -40,9 +40,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION}+rke2r1 serverConfig: kubeAPIServer: @@ -60,7 +60,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -69,10 +69,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -85,18 +85,18 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -104,7 +104,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -116,7 +116,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/examples/docker/clusterclass/rke2-sample.yaml b/examples/docker/clusterclass/rke2-sample.yaml index 25525fa6..cde94aca 100644 --- a/examples/docker/clusterclass/rke2-sample.yaml +++ b/examples/docker/clusterclass/rke2-sample.yaml @@ -18,12 +18,12 @@ spec: version: ${KUBERNETES_VERSION}+rke2r1 controlPlane: metadata: {} - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} workers: machineDeployments: - class: default-worker name: md-0 - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} variables: - name: dockerKindImage value: kindest/node:${KUBERNETES_VERSION} diff --git a/examples/docker/disable-components/rke2-sample.yaml b/examples/docker/disable-components/rke2-sample.yaml index 90d18263..a5639a61 100644 --- a/examples/docker/disable-components/rke2-sample.yaml +++ b/examples/docker/disable-components/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -30,7 +30,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -40,9 +40,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} agentConfig: version: ${KUBERNETES_VERSION}+rke2r1 infrastructureRef: @@ -62,7 +62,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -71,10 +71,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -87,18 +87,18 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -106,7 +106,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -117,7 +117,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/examples/docker/enable-multus/rke2-sample.yaml b/examples/docker/enable-multus/rke2-sample.yaml index b4298cbe..a9d12e0d 100644 --- a/examples/docker/enable-multus/rke2-sample.yaml +++ b/examples/docker/enable-multus/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -30,7 +30,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -40,9 +40,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} agentConfig: version: ${KUBERNETES_VERSION}+rke2r1 serverConfig: @@ -61,7 +61,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -70,10 +70,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -86,18 +86,18 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -105,7 +105,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -116,7 +116,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/examples/docker/kube-vip/rke2-sample.yaml b/examples/docker/kube-vip/rke2-sample.yaml index 3ddd5ef8..3ef6c47c 100644 --- a/examples/docker/kube-vip/rke2-sample.yaml +++ b/examples/docker/kube-vip/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -33,7 +33,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -43,9 +43,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION}+rke2r1 serverConfig: cni: calico @@ -99,7 +99,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -108,10 +108,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -124,18 +124,18 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -143,7 +143,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -158,7 +158,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/examples/docker/priv-registries/rke2-sample.yaml b/examples/docker/priv-registries/rke2-sample.yaml index a9611b81..2d4ce6f2 100644 --- a/examples/docker/priv-registries/rke2-sample.yaml +++ b/examples/docker/priv-registries/rke2-sample.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Namespace metadata: - name: ${CABPR_NAMESPACE} + name: ${NAMESPACE} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: Cluster metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME} spec: clusterNetwork: @@ -30,7 +30,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerCluster metadata: name: ${CLUSTER_NAME} - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: loadBalancer: customHAProxyConfigTemplateRef: @@ -40,9 +40,9 @@ apiVersion: controlplane.cluster.x-k8s.io/v1beta1 kind: RKE2ControlPlane metadata: name: ${CLUSTER_NAME}-control-plane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} version: ${KUBERNETES_VERSION}+rke2r1 privateRegistriesConfig: mirrors: @@ -54,13 +54,13 @@ spec: authSecret: apiVersion: v1 kind: Secret - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: auth-secret tls: tlsConfigSecret: apiVersion: v1 kind: Secret - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: registry-cert infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 @@ -72,7 +72,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: controlplane - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -81,10 +81,10 @@ apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: name: worker-md-0 - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: clusterName: ${CLUSTER_NAME} - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} selector: matchLabels: cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME} @@ -97,19 +97,19 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate name: ${CLUSTER_NAME}-agent - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} status: {} --- apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: DockerMachineTemplate metadata: name: worker - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} spec: template: spec: {} @@ -117,7 +117,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: RKE2ConfigTemplate metadata: - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: ${CLUSTER_NAME}-agent spec: template: @@ -132,13 +132,13 @@ spec: authSecret: apiVersion: v1 kind: Secret - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: auth-secret tls: tlsConfigSecret: apiVersion: v1 kind: Secret - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} name: registry-cert agentConfig: {} --- @@ -146,7 +146,7 @@ apiVersion: v1 kind: Secret metadata: name: registry-cert - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdBakNDQStxZ0F3SUJBZ0lVWE8xNHg5TTRxMnBoQnZsQ3FYYnB6UjNvZlhJd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZWXhDekFKQmdOVkJBWVRBa1JGTVJBd0RnWURWUVFJREFkQ1lYWmhjbWxoTVE4d0RRWURWUVFIREFaTgpkVzVwWTJneER6QU5CZ05WQkFvTUJrSmxiR2RoYVRFaE1COEdBMVVFQXd3WVRXOW9ZVzFsWkNCQ1pXeG5ZV2xsClpDQklZWE56YVc1bE1TQXdIZ1lKS29aSWh2Y05BUWtCRmhGdGIyaGhiV1ZrUUdKbGJHZGhhUzVrWlRBZUZ3MHkKTWpFeU1qSXlNVEEzTUROYUZ3MHlNekV5TWpJeU1UQTNNRE5hTUlHQU1Rc3dDUVlEVlFRR0V3SkVSVEVRTUE0RwpBMVVFQ0F3SFFtRjJZWEpwWVRFUE1BMEdBMVVFQnd3R1RYVnVhV05vTVE4d0RRWURWUVFLREFaQ1pXeG5ZV2t4Ckd6QVpCZ05WQkFNTUVuSmxaMmx6ZEhKNUxtSmxiR2RoYVM1a1pURWdNQjRHQ1NxR1NJYjNEUUVKQVJZUmJXOW8KWVcxbFpFQmlaV3huWVdrdVpHVXdnZ0lpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElDRHdBd2dnSUtBb0lDQVFDcgpFOWZGS3gzTFk4L1NPMjdIbit4b3FTd2c5Q1MvdEpPaG83ZnlsWHRTNFJLaGpFZ0hVVnhVWFJnTEpIZ2h3bGlQCnI1ZmFicE9XcHhvb1RwcFpsS2xTRDQ3NXZyNEVScXp2WjBhK21paTlvNU1uUm1WOU1BTFZQbS9XSGpWb0V5WnoKT2N3ZWFnT0l0TXg5bjBtamJyK3hWQno0UGxIQVF3RDNSZUIyNk9nQlFDQThodmRjUmdWdjl4L0tGUUdsazdJKwpmY2pBOXV2dFM4czY0WndtcldUYnV6S1BJMVl6NlYvY0JPZWFPT0x5YVY2QktaQnd2SVk3dldOc3BjbXEvUmhDCmsxS3lMbG5rd29BOTBQOWtuYmUvMVRyeGdYUXBlcW5wdEM0SzQ2SXhJTzRrZzJld21rMkhIc3UzTXE5Z2twWU0KY2UzWmZjKzRGZUVqL25FRDJyYTVKcklpMHY2bHNuRGJtZ1B5b1R3bndISnNjSzlieVJWeGh3YVZIRWZIWjlUUwppYnNjUWNQaCs0MTZwWmYvM01FRGRiaGNBUUZxVnVpVzM0UW5NZy9vUGpaYW1Xc0poc1ZHNGFVMktrSGRYSE8wCkpxZ0EwN1VjWXdWcHZLd2JUckxoQVFTcjAxT0VQQWFGNml6SktaZG9FRldQWVV6elQ4cVk1RTR5ODJleXpqdlcKL3R5L2Q3Y1RCY3ZNRjMzSmRjOWw2Tm9CdU1DaVM3Q0xwSkxUdFFJOHNGSW1LK2JBekJHZFV6SlBzUHYyT0Rvegozd2EvdWdJTU5yOW1UWHN0YWlINFhqc25IbmZhTlNRZS9PRzgxODlwRWxIK1RrMUZuRTBNRnRZcFJPbmRaMTFaCkcyR3JyVHIvTDBVcW5GcXNtVURNY1UvbFVyRmpUelpJMjJ5S1N3UStXd0lEQVFBQm8yd3dhakFmQmdOVkhTTUUKR0RBV2dCUWsrWjRmN21iNHgxWkpsbS9EY0VibS9veGpWakFKQmdOVkhSTUVBakFBTUIwR0ExVWRFUVFXTUJTQwpFbkpsWjJsemRISjVMbUpsYkdkaGFTNWtaVEFkQmdOVkhRNEVGZ1FVaUxqL0NzWkRsT1ZNNURidTUwTW5UZ3hPCmplQXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnSUJBSmlhUVFLYzJsVmpRczFhRjExcVBWOWZZZmR5R1VrWHNST1EKSGorNWU0d0tQRmNRMzZTcC9sMTR3MFJGRHlOb0lESXBDK0FBeWFHZy9wMHZZSGN0ZUtDKy9aUHJFRG5zUms4YwpieDZxbWRXbmtnK2s3ZG01N2hjQmxpd2JxSks0elJ5Q2pCVXJyTmZoOTYwckFnaFJVOHluOE40eHpXNFRWaEt6CklYSy9JcHZVSWRhV0o0UzNFVGc3cEU4S0NLRTRpWVFLeEM5UWpGRFRKTlNKUXIxR2NrMmFXMmRzK2ppV1RCekwKbEx3OHYvalBUcDBmYXBjNVhDK3Z3WUJBNWhrMDdzVk8xM0lINkFJVWNUR1BpQVFkd2VGd0VYNzRMZG5hdG1JeAo1NUx2RjRXR0o4M2xua1hrc0twWU5UR3hPNkxnelU3SUpCQjdsV1JMM3RSajFhMmxvdzZPVi9KZ1pTRm1hSFd1CnJqVFlZbGlEN2N6VlFzVWNUeEJoY09BUDhEWkMwczlyQ3lXSWp3NWNoMmRLbTM3WjNqbklWVVJ0eGQ1WTlOaloKUld2Nm5MR0JubXM0NTh1WFpZTndNV2hJV1RBdVBYVncvMTcyRGxTWUJ5KzFBSWxLQ3kxNHlHWW5nZ3dRUXFFMgpTZFV3c0FZTDErUG5IZ1laZTQ0VkJzMkhtczhGUnVSVmo5b21Sb1FEQnRvWkcyUTluSFVZd2crd21qY2V5STRMCnRPdjIwazFjc3hDb0F0dllDamxUR0pKK0ZFWHVkTExHWjkvcWVzaHBTMEV1Z0xva0Y4UFg1MXpxdVMvVnZQV1MKc1NRTUxYWnJLOWJKQmRJZFVsdkxQSTRIOXlHV2I4dlZsUEY5VWVYNSt5WTZMY0gwNjdCVHREdXBWZUNnRytwSApEb3ZPSVM0MQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUpRZ0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQ1N3d2dna29BZ0VBQW9JQ0FRQ3JFOWZGS3gzTFk4L1MKTzI3SG4reG9xU3dnOUNTL3RKT2hvN2Z5bFh0UzRSS2hqRWdIVVZ4VVhSZ0xKSGdod2xpUHI1ZmFicE9XcHhvbwpUcHBabEtsU0Q0NzV2cjRFUnF6dlowYSttaWk5bzVNblJtVjlNQUxWUG0vV0hqVm9FeVp6T2N3ZWFnT0l0TXg5Cm4wbWpicit4VkJ6NFBsSEFRd0QzUmVCMjZPZ0JRQ0E4aHZkY1JnVnY5eC9LRlFHbGs3SStmY2pBOXV2dFM4czYKNFp3bXJXVGJ1ektQSTFZejZWL2NCT2VhT09MeWFWNkJLWkJ3dklZN3ZXTnNwY21xL1JoQ2sxS3lMbG5rd29BOQowUDlrbmJlLzFUcnhnWFFwZXFucHRDNEs0Nkl4SU80a2cyZXdtazJISHN1M01xOWdrcFlNY2UzWmZjKzRGZUVqCi9uRUQycmE1SnJJaTB2NmxzbkRibWdQeW9Ud253SEpzY0s5YnlSVnhod2FWSEVmSFo5VFNpYnNjUWNQaCs0MTYKcFpmLzNNRURkYmhjQVFGcVZ1aVczNFFuTWcvb1BqWmFtV3NKaHNWRzRhVTJLa0hkWEhPMEpxZ0EwN1VjWXdWcAp2S3diVHJMaEFRU3IwMU9FUEFhRjZpekpLWmRvRUZXUFlVenpUOHFZNUU0eTgyZXl6anZXL3R5L2Q3Y1RCY3ZNCkYzM0pkYzlsNk5vQnVNQ2lTN0NMcEpMVHRRSThzRkltSytiQXpCR2RVekpQc1B2Mk9Eb3ozd2EvdWdJTU5yOW0KVFhzdGFpSDRYanNuSG5mYU5TUWUvT0c4MTg5cEVsSCtUazFGbkUwTUZ0WXBST25kWjExWkcyR3JyVHIvTDBVcQpuRnFzbVVETWNVL2xVckZqVHpaSTIyeUtTd1ErV3dJREFRQUJBb0lDQUJaWXByQVdCRFBMaTF0aU1RTzVVNGVPClJYbmVlaWhpWFlCWklzOTRrQjNRMFg2eGxMMEQ5eVA3N3dhUmtuR1NjYi8vQno1Y2dFSEcvUWN6MFR5UFN4aXgKZUpNTnc4TktPZytoZFYrelFrd1hJRU1ha21vcVNjeHg5ZWpKbEY5T1ZSRHJCVXNadlBGdjhHQWVYTitRdVZCZgo5TkxHVFNab2VpbFNndEgxZFV5b2hDMXowYjdIVkxGOTNiU25Uc3BDZ3g5ZmpjZ0syT0ZycTVXNjM0czd6ZmRYCnVmQnhoTEtPTXR2SjlqaXlZbzZZamVRZ09rSkhsZDhheTNCbkxYTDgwVnpzNG5uc3pRZ3hFZEJCU3dMcENSWHgKTTl4VTlRZndBbDdKRHRTVVRGelBlTnZqSURtMHhoaTJ3SlJpOWY2TzF6T3o5QVliUlhVOXdtVlJ1SkJ3MHJvZwp2akxVVU52cktOcDZQMmdJVXFQU3VvdnRlRlM1SCtlSmU3QkV2b2FrM1dhQUYxTVlhTjQrUjVoaWM2SzAwMjRhCnNlUGlmcm95VVIwQTRpcndZbUFlNndzS1JqYmk1RDBPQm5jZHhvSEVzMEdxNm5xcHE4ejJYSkdwRlpYTE40cU0KYVRNNXV3bTQ0enNoaFNaMHk3YXZoQ2U3RitDaFVZTVl4UjZtT3hEWURHQ0g1Q3NrR1RaNjJHKzgrbmZhNE5Zbwovc0pyNUdMbUs0aitoR3NqeFhCbUltVzVZcUEvMHhMN3lDcVdPa2wyU3lPeEFCOUVjOGxKbVhPTjlnbTJZbitlCnhQZ3FSUDI0ZnJwaGdvWGxmMXlDR1JaTUFJbjVhWStXOExxT3phallPYW1wQnRITmMwcHgyZ0Q2VklVbkdxVzcKUDB0Skc3UFVnZ1FHTTI5SEdnZkpBb0lCQVFDL3F0R01KRWlReFludWFJZThJc0JmUlZ2SUlOOUF0eVdpYmFOUApoZEd5TG45UnRiaEl2MHRzOElvcS9iUGdhL1hHYWNYU20ycGNJMGgrNm1sMGkvTVpuSm84czY1RkVuTm1PV3ByCjhsd3Y1RzNUWGhWTnROc1QrblJmakxvVzIzdHBrTmdpSTdrZTBzU2hJTERNZ1U1U0xnOEg0WGNvYjc5YlF3dlIKekxDV0Y4RTZFc0kyaGVWeWlQVEI0KzNsL1pTZUF2c2tnNzFVYUYrYXdPcUxLZlNzM2tiUkJtUlRRY3Z4eExhbwpqOCtwc0tnaUh0TmZ1WldxcHorb1NPU0d3YThkbHQ2WXhpWk43YjdSSGt1cm04Mk5zcS9DMFI1Z2ovNmI4ZlNaCnFWN0tsbXc4YVhqV2huZnl2WnVWeXkwYXRDVGg5eFNJU1hscnQySmxTVnhiN1RRREFvSUJBUURrZjlUbS9NNmUKb2hxdjlqTThPTUV3Q0FuTGRuUEJ5Qi9yMjRqMHBGQUNwem5yYk5jd1c1dERQaXFKcE94WjdoK01sbklMYzRxRApJSmlPYU5vbDlxaERqK1ltLythVWROSHk5d052RXZuWlFsVm9PNUE0T0Q5ekp1T05CZENXNmVaa20xdGpJSmFXCnFYSGRteG5CZkpIa3ROTDBNRnRFZml0N0lhRHo4d3ZRdVR1YTdtbVAxTVVXRFY1dWpPWWZib0NvdW52cndvOWsKUlp3NWdYb21zOVpVQmJGSE4rN3lkRzlBbHBJL1ovejR4V0xEb0FvQVJKejJuMzdXVC9IeE93MzFUeEpRQ2srYQpWL28zNkZ6REZCcEZUNTBhSXNEcVlhWUtFT25Zb0Q3TWpMdmxiZmdDQlAyQmNsaXA1bzBvT0dOQ3N6OG9QMTFVCmI0N2crVGxBZDNqSkFvSUJBQ2gwbk1CUTFFUkNmY2VscHFqT1NQNlMvRGwwdnNyQkhaOTROdFZOTUtMRWI3bEcKZXZ4WDdFcTFSdVNtSWphSGN4d0xMV2N6eUxKai9DUlZ4Q2FHZDZ4N1FvNzNlaHc0TmNWbzd3NlQzR043ZXJiMwpqOVdVQy8zZWludTBqMzdObXZJQVVhNTdEZEwwdCs0dW9VSzVORmZpUXVmdDdpSEozSUVkMkx2UzBaOE1xb3RnCmREL2Y2VHRRcnlEUnhHQWNNeWRiQjdtQVdSRWM2cmtXYVNzd2t1VitFVUtEYjkrbTdxNDhVRFdxRFRJTENLSVQKRVppTjZvcFh2UGIvVThVaDBwMlRQNjdOZkQ1TXBVOHNidHB0QzJrU1Ewa0NyTC9EQlFIVGcwWi8ybk0yWnVnbApkdzBJMnY2UWlPdUlOQ0FEMEJrbDl0NkJhN0NSeDZJTFp3UThRQk1DZ2dFQWFheW81TTdFSzk4aVlvQ0ZQM09yCi9LK3EvL3JmSEI2V2pMaXlCUm84bW8yR0h0ZnVTVUlFY3p1NzVuNXNoRWE1Tm9hWlpheGd3YllBZDlRTUY0U1UKV3ZLZzZTWnVGL2hTNUgvU2lic0g2NjllMmw2NW14YUFXWndCbnNXeXF5aXZVWlg3MU1OTWdZOEp4d2dsQ0RPNQpNVUZqVW1WT3dFVnRqSHVIK1dwTTY1SE8vQjhJbU9rNDRMTDhHanAxYnRIbkZLRnlFQjJodlNqb1VEd09Kdm9DCnhFY0Jyc015Y2RUaFlzaUFDR3pxTkk3czF6WWJpZll4ZFdsYituZHNtRGpNZ3NlMzIyWjVYQk1WK0djeEIxTXoKdHh4VHRyT2Q3b2VNaDVrODNOOTNTNWhHaVp1ckdCd0F0YTRSVFRuL3pEc1B4TmdxL0UwWnQ2UUVPdzFucWVYVwo2UUtDQVFFQWhXWlNTSWJSMCt2ZkhXY1pNZVZZNnFnaEl1M1pLRE94eER0aW53NUE4ZzVweS9jZkNsR3FQTmwvCmNUWng0Sk95QW9xR0RUK2lXbi90V0F5TGF2UXJ5VXRaT1E0MXRYK1Z5WEF1V3NoWUh4WjVHYWduWlV6WHREbXcKUTFtTDBPemozSUlqaTlQVEMxQnVRK2lZQ0ZEMDZvRU01cWFROFF1dVFPUjc1cUU0ZTUyalBmQnJSRkJwamU4WgpWaU9HYWtFY0JnOHljMHc2TDBwWjFSdGsxMFNPVHlnYkhvc1NIamZVVnZ5T2pvSTNaUmQ5ai9ocXN4R0s2Z0VjCnc1bm9pdVk1Yy9wZGFnM3Z1YzNPZHcwZHZ6cEIzWFlLWWxQNzJNY0pqOXdZMkRVWjhCbCtMa3hpOVE0WkRBQzkKTkdqYlNFUUNoNnRIMjk4SmFBZVp3aVA2S2Evb0ZRPT0KLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= @@ -157,7 +157,7 @@ apiVersion: v1 kind: Secret metadata: name: auth-secret - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: username: YWRtaW4K password: YWRtaW4K @@ -166,7 +166,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: ${CLUSTER_NAME}-lb-config - namespace: ${CABPR_NAMESPACE} + namespace: ${NAMESPACE} data: value: |- # generated by kind diff --git a/test/e2e/data/infrastructure/cluster-from-clusterclass-template-docker.yaml b/test/e2e/data/infrastructure/cluster-from-clusterclass-template-docker.yaml index 005e6906..efc230e8 100644 --- a/test/e2e/data/infrastructure/cluster-from-clusterclass-template-docker.yaml +++ b/test/e2e/data/infrastructure/cluster-from-clusterclass-template-docker.yaml @@ -18,12 +18,12 @@ spec: version: ${KUBERNETES_VERSION}+rke2r1 controlPlane: metadata: {} - replicas: ${CABPR_CP_REPLICAS} + replicas: ${CONTROL_PLANE_MACHINE_COUNT} workers: machineDeployments: - class: default-worker name: md-0 - replicas: ${CABPR_WK_REPLICAS} + replicas: ${WORKER_MACHINE_COUNT} variables: - name: dockerKindImage value: kindest/node:${KIND_IMAGE_VERSION} diff --git a/test/e2e/e2e_clusterclass_test.go b/test/e2e/e2e_clusterclass_test.go index 935a4ef7..5f41058e 100644 --- a/test/e2e/e2e_clusterclass_test.go +++ b/test/e2e/e2e_clusterclass_test.go @@ -120,9 +120,9 @@ var _ = Describe("Workload cluster creation", func() { return e2eConfig.GetVariable(KubernetesVersion) case "KIND_IMAGE_VERSION": return e2eConfig.GetVariable(KindImageVersion) - case "CABPR_CP_REPLICAS": + case "CONTROL_PLANE_MACHINE_COUNT": return e2eConfig.GetVariable(ControlPlaneMachineCount) - case "CABPR_WK_REPLICAS": + case "WORKER_MACHINE_COUNT": return e2eConfig.GetVariable(WorkerMachineCount) default: return os.Getenv(s)