@@ -9,6 +9,8 @@ LOCALBIN ?= $(CACHE_BIN)
99DEVBOX_BIN ?= $(DEVBOX_PACKAGES_DIR ) /bin
1010HELM ?= $(LOCALBIN ) /helm
1111HELM_VERSION ?= v3.16.3
12+ CLUSTERCTL ?= $(LOCALBIN ) /clusterctl
13+ CLUSTERCTL_VERSION ?= v1.12.3
1214
1315GOLANGCI_LINT ?= $(LOCALBIN ) /golangci-lint
1416GOLANGCI_LINT_NILAWAY ?= $(CACHE_BIN ) /golangci-lint-nilaway
@@ -26,13 +28,13 @@ SUBNET_MANIFEST_NAME ?= subnet-testing-manifests
2628K8S_VERSION ?= "v1.31.2"
2729
2830# renovate: datasource=github-tags depName=kubernetes-sigs/cluster-api
29- CAPI_VERSION ?= "v1.8.5 "
31+ CAPI_VERSION ?= "v1.12.3 "
3032
3133# renovate: datasource=github-tags depName=kubernetes-sigs/cluster-api-addon-provider-helm
32- CAAPH_VERSION ?= "v0.2 .1"
34+ CAAPH_VERSION ?= "v0.6 .1"
3335
3436# renovate: datasource=github-tags depName=linode/cluster-api-provider-linode
35- CAPL_VERSION ?= "v0.8.5 "
37+ CAPL_VERSION ?= "v0.10.1 "
3638
3739# renovate: datasource=github-tags depName=golangci/golangci-lint
3840GOLANGCI_LINT_VERSION ?= "v2.7.2"
@@ -168,7 +170,7 @@ capl-cluster: generate-capl-cluster-manifests create-capl-cluster patch-linode-c
168170.PHONY : generate-capl-cluster-manifests
169171generate-capl-cluster-manifests :
170172 # Create the CAPL cluster manifests without any CSI driver stuff
171- LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED ) LINODE_OS=$(LINODE_OS ) VPC_NAME=$(VPC_NAME ) clusterctl generate cluster $(CLUSTER_NAME ) \
173+ LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED ) LINODE_OS=$(LINODE_OS ) VPC_NAME=$(VPC_NAME ) $( CLUSTERCTL ) generate cluster $(CLUSTER_NAME ) \
172174 --kubernetes-version $(K8S_VERSION ) --infrastructure linode-linode:$(CAPL_VERSION ) \
173175 --control-plane-machine-count $(CONTROLPLANE_NODES ) --worker-machine-count $(WORKER_NODES ) --flavor kubeadm-dual-stack > $(MANIFEST_NAME ) .yaml
174176 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
@@ -179,7 +181,7 @@ create-capl-cluster:
179181 kubectl apply -f $(MANIFEST_NAME ) .yaml
180182 kubectl wait --for=condition=ControlPlaneReady cluster/$(CLUSTER_NAME ) --timeout=600s || (kubectl get cluster -o yaml; kubectl get linodecluster -o yaml; kubectl get linodemachines -o yaml; kubectl logs -n capl-system deployments/capl-controller-manager --tail=50)
181183 kubectl wait --for=condition=NodeHealthy=true machines -l cluster.x-k8s.io/cluster-name=$(CLUSTER_NAME ) --timeout=900s
182- clusterctl get kubeconfig $(CLUSTER_NAME ) > $(KUBECONFIG_PATH )
184+ $( CLUSTERCTL ) get kubeconfig $(CLUSTER_NAME ) > $(KUBECONFIG_PATH )
183185 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl wait --for=condition=Ready nodes --all --timeout=600s
184186 # Remove all taints from control plane node so that pods scheduled on it by tests can run (without this, some tests fail)
185187 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl taint nodes -l node-role.kubernetes.io/control-plane node-role.kubernetes.io/control-plane-
@@ -192,10 +194,10 @@ patch-linode-ccm:
192194 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl -n kube-system get daemonset/ccm-linode -o yaml
193195
194196.PHONY : mgmt-cluster
195- mgmt-cluster :
197+ mgmt-cluster : clusterctl
196198 # Create a mgmt cluster
197199 ctlptl apply -f e2e/setup/ctlptl-config.yaml
198- clusterctl init \
200+ $( CLUSTERCTL ) init \
199201 --wait-providers \
200202 --wait-provider-timeout 600 \
201203 --core cluster-api:$(CAPI_VERSION ) \
@@ -295,13 +297,13 @@ helm-template: helm
295297.PHONY : kubectl
296298kubectl : $(KUBECTL ) # # Download kubectl locally if necessary.
297299$(KUBECTL ) : $(LOCALBIN )
298- curl -fsSL https://dl.k8s.io/release/$(KUBECTL_VERSION ) /bin/$(OS ) /$(ARCH_SHORT ) /kubectl -o $(KUBECTL )
300+ curl -fsSL https://dl.k8s.io/release/$(KUBECTL_VERSION ) /bin/$(HOSTOS ) /$(ARCH_SHORT ) /kubectl -o $(KUBECTL )
299301 chmod +x $(KUBECTL )
300302
301303.PHONY : clusterctl
302304clusterctl : $(CLUSTERCTL ) # # Download clusterctl locally if necessary.
303305$(CLUSTERCTL ) : $(LOCALBIN )
304- curl -fsSL https://github.com/kubernetes-sigs/cluster-api/releases/download/$(CLUSTERCTL_VERSION ) /clusterctl-$(OS ) -$(ARCH_SHORT ) -o $(CLUSTERCTL )
306+ curl -fsSL https://github.com/kubernetes-sigs/cluster-api/releases/download/$(CLUSTERCTL_VERSION ) /clusterctl-$(HOSTOS ) -$(ARCH_SHORT ) -o $(CLUSTERCTL )
305307 chmod +x $(CLUSTERCTL )
306308
307309.phony : golangci-lint-nilaway
0 commit comments