@@ -16,10 +16,6 @@ SUBNET_CLUSTER_NAME ?= subnet-testing-$(shell git rev-parse --short HEAD)
1616VPC_NAME ?= $(CLUSTER_NAME )
1717MANIFEST_NAME ?= capl-cluster-manifests
1818SUBNET_MANIFEST_NAME ?= subnet-testing-manifests
19- K8S_VERSION ?= "v1.31.2"
20- CAPI_VERSION ?= "v1.8.5"
21- CAAPH_VERSION ?= "v0.2.1"
22- CAPL_VERSION ?= "v0.8.5"
2319CONTROLPLANE_NODES ?= 1
2420WORKER_NODES ?= 1
2521LINODE_FIREWALL_ENABLED ?= true
@@ -181,7 +177,7 @@ capl-cluster: tools generate-capl-cluster-manifests create-capl-cluster patch-li
181177generate-capl-cluster-manifests : tools
182178 # Create the CAPL cluster manifests without any CSI driver stuff
183179 LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED ) LINODE_OS=$(LINODE_OS ) VPC_NAME=$(VPC_NAME ) clusterctl generate cluster $(CLUSTER_NAME ) \
184- --kubernetes-version $( K8S_VERSION ) -- infrastructure linode-linode: $( CAPL_VERSION ) \
180+ --infrastructure linode-linode \
185181 --control-plane-machine-count $(CONTROLPLANE_NODES ) --worker-machine-count $(WORKER_NODES ) > $(MANIFEST_NAME ) .yaml
186182 yq -i e ' select(.kind == "LinodeVPC").spec.subnets = [{"ipv4": "10.0.0.0/8", "label": "default"}, {"ipv4": "172.16.0.0/16", "label": "testing"}]' $(MANIFEST_NAME ) .yaml
187183
@@ -210,11 +206,8 @@ mgmt-cluster: tools
210206 clusterctl init \
211207 --wait-providers \
212208 --wait-provider-timeout 600 \
213- --core cluster-api:$(CAPI_VERSION ) \
214- --bootstrap kubeadm:$(CAPI_VERSION ) \
215- --control-plane kubeadm:$(CAPI_VERSION ) \
216- --addon helm:$(CAAPH_VERSION ) \
217- --infrastructure linode-linode:$(CAPL_VERSION )
209+ --addon helm \
210+ --infrastructure linode-linode
218211 kind get kubeconfig --name=caplccm > $(MGMT_KUBECONFIG_PATH )
219212
220213.PHONY : cleanup-cluster
0 commit comments