@@ -36,6 +36,9 @@ CAAPH_VERSION ?= "v0.6.1"
3636# renovate: datasource=github-tags depName=linode/cluster-api-provider-linode
3737CAPL_VERSION ?= "v0.10.1"
3838
39+ # renovate: datasource=github-tags depName=cilium/cilium
40+ CILIUM_VERSION ?= "1.18.7"
41+
3942# renovate: datasource=github-tags depName=golangci/golangci-lint
4043GOLANGCI_LINT_VERSION ?= "v2.11.3"
4144
@@ -165,15 +168,23 @@ run-debug: build
165168mgmt-and-capl-cluster : docker-setup mgmt-cluster capl-cluster
166169
167170.PHONY : capl-cluster
168- capl-cluster : generate-capl-cluster-manifests create-capl-cluster patch-linode-ccm
171+ capl-cluster : generate-capl-cluster-manifests create-capl-cluster
169172
170173.PHONY : generate-capl-cluster-manifests
171174generate-capl-cluster-manifests : clusterctl
172175 # Create the CAPL cluster manifests without any CSI driver stuff
173- LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED ) LINODE_OS=$(LINODE_OS ) VPC_NAME=$(VPC_NAME ) $(CLUSTERCTL ) generate cluster $(CLUSTER_NAME ) \
176+ LINODE_FIREWALL_ENABLED=$(LINODE_FIREWALL_ENABLED ) LINODE_OS=$(LINODE_OS ) VPC_NAME=$(VPC_NAME ) CILIUM_VERSION= $( CILIUM_VERSION ) $(CLUSTERCTL ) generate cluster $(CLUSTER_NAME ) \
174177 --kubernetes-version $(K8S_VERSION ) --infrastructure linode-linode:$(CAPL_VERSION ) \
175178 --control-plane-machine-count $(CONTROLPLANE_NODES ) --worker-machine-count $(WORKER_NODES ) --flavor kubeadm-dual-stack > $(MANIFEST_NAME ) .yaml
176179 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
180+ yq e ' select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate' $(MANIFEST_NAME ) .yaml > tmp-cilium.yaml
181+ yq -i e ' .devices = ["eth0", "eth1"] | .nodePort.addresses = ["0.0.0.0/0", "::/0"] | .nodePort.directRoutingDevice = "eth0" | .hostFirewall.enabled = false | del(.extraArgs[] | select(. == "--nodeport-addresses=0.0.0.0/0")) | del(.extraArgs[] | select(. == "--nodeport-addresses=0.0.0.0/0,::/0"))' tmp-cilium.yaml
182+ yq -i e ' select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate = load_str("tmp-cilium.yaml")' $(MANIFEST_NAME ) .yaml
183+ rm tmp-cilium.yaml
184+ yq e ' select(.kind == "HelmChartProxy" and .spec.chartName == "ccm-linode").spec.valuesTemplate' $(MANIFEST_NAME ) .yaml > tmp.yaml
185+ IMG_TAG=$$ {IMG## *:} yq -i e '.image.tag = strenv(IMG_TAG) | .image.pullPolicy = "Always"' tmp.yaml
186+ yq -i e ' select(.kind == "HelmChartProxy" and .spec.chartName == "ccm-linode").spec.valuesTemplate = load_str("tmp.yaml")' $(MANIFEST_NAME ) .yaml
187+ rm tmp.yaml
177188
178189.PHONY : create-capl-cluster
179190create-capl-cluster : clusterctl
@@ -189,6 +200,7 @@ create-capl-cluster: clusterctl
189200.PHONY : patch-linode-ccm
190201patch-linode-ccm :
191202 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl patch -n kube-system daemonset ccm-linode --type=' json' -p=" [{'op': 'replace', 'path': '/spec/template/spec/containers/0/image', 'value': '${IMG} '}]"
203+ KUBECONFIG=$(KUBECONFIG_PATH ) kubectl patch -n kube-system daemonset ccm-linode --type=' json' -p=' [{"op": "replace", "path": "/spec/template/spec/containers/0/imagePullPolicy", "value": "Always"}]'
192204 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl patch -n kube-system daemonset ccm-linode --type=' json' -p=' [{"op": "add", "path": "/spec/template/spec/containers/0/env/-", "value": {"name": "LINODE_API_VERSION", "value": "v4beta"}}]'
193205 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl rollout status -n kube-system daemonset/ccm-linode --timeout=600s
194206 KUBECONFIG=$(KUBECONFIG_PATH ) kubectl -n kube-system get daemonset/ccm-linode -o yaml
0 commit comments