Use CAPL v0.10.2 manifests

Author: komer3

Makefile

@@ -34,10 +34,7 @@ CAPI_VERSION            ?= "v1.12.3"
 CAAPH_VERSION           ?= "v0.6.1"
 
 # renovate: datasource=github-tags depName=linode/cluster-api-provider-linode
-CAPL_VERSION            ?= "v0.10.1"
-
-# renovate: datasource=github-tags depName=cilium/cilium
-CILIUM_VERSION          ?= "1.18.7"
+CAPL_VERSION            ?= "v0.10.2"
 
 # renovate: datasource=github-tags depName=golangci/golangci-lint
 GOLANGCI_LINT_VERSION   ?= "v2.11.3"
@@ -173,11 +170,10 @@ capl-cluster: generate-capl-cluster-manifests create-capl-cluster
 .PHONY: generate-capl-cluster-manifests
 generate-capl-cluster-manifests: clusterctl
 	# Create the CAPL cluster manifests without any CSI driver stuff
-	LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED) LINODE_OS=$(LINODE_OS) VPC_NAME=$(VPC_NAME) CILIUM_VERSION=$(CILIUM_VERSION) $(CLUSTERCTL) generate cluster $(CLUSTER_NAME) \
+	LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED) LINODE_OS=$(LINODE_OS) VPC_NAME=$(VPC_NAME) $(CLUSTERCTL) generate cluster $(CLUSTER_NAME) \
 		--kubernetes-version $(K8S_VERSION) --infrastructure linode-linode:$(CAPL_VERSION) \
 		--control-plane-machine-count $(CONTROLPLANE_NODES) --worker-machine-count $(WORKER_NODES) --flavor kubeadm-dual-stack > $(MANIFEST_NAME).yaml
 	yq -i e 'select(.kind == "LinodeVPC").spec.ipv6Range = [{"range": "auto"}] | select(.kind == "LinodeVPC").spec.subnets = [{"ipv4": "10.0.0.0/8", "label": "default", "ipv6Range": [{"range": "auto"}]}, {"ipv4": "172.16.0.0/16", "label": "testing", "ipv6Range": [{"range": "auto"}]}]' $(MANIFEST_NAME).yaml
-	yq -i e '(select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate |= sub("hostFirewall:\n  enabled: [^\n]+\n"; "hostFirewall:\n  enabled: false\n")) | (select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate |= sub("extraArgs:\n(?:- --nodeport-addresses=0\\.0\\.0\\.0/0(?:,::/0)?\n)+"; "extraArgs: []\n")) | (select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate |= sub("hubble:\n  relay:\n    enabled: true\n  ui:\n    enabled: true"; "hubble:\n  relay:\n    enabled: true\n  ui:\n    enabled: true\ndevices:\n  - eth0\n  - eth1\nnodePort:\n  addresses:\n    - 0.0.0.0/0\n    - ::/0\n  directRoutingDevice: eth0"))' $(MANIFEST_NAME).yaml
 	IMG_TAG=$${IMG##*:} yq -i e '(select(.kind == "HelmChartProxy" and .spec.chartName == "ccm-linode").spec.valuesTemplate |= sub("tag: [^\\n]+"; "tag: " + strenv(IMG_TAG))) | (select(.kind == "HelmChartProxy" and .spec.chartName == "ccm-linode").spec.valuesTemplate |= sub("pullPolicy: [^\\n]+"; "pullPolicy: Always"))' $(MANIFEST_NAME).yaml
 
 .PHONY: create-capl-cluster
@@ -256,7 +252,6 @@ e2e-test-subnet:
 	# Create the second cluster
 	MANIFEST_NAME=$(SUBNET_MANIFEST_NAME) CLUSTER_NAME=$(SUBNET_CLUSTER_NAME) KUBECONFIG_PATH=$(SUBNET_KUBECONFIG_PATH) \
 		make create-capl-cluster
-	KUBECONFIG_PATH=$(SUBNET_KUBECONFIG_PATH) make patch-linode-ccm
 	# Run chainsaw test
 	LINODE_TOKEN=$(LINODE_TOKEN) \
 		LINODE_URL=$(LINODE_URL) \