Skip to content

Commit 51e6db6

Browse files
committed
Fix CAPL manifest CCM overrides
1 parent 16c835c commit 51e6db6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ generate-capl-cluster-manifests: clusterctl
182182
yq -i e 'select(.kind == "HelmChartProxy" and .spec.chartName == "cilium").spec.valuesTemplate = load_str("tmp-cilium.yaml")' $(MANIFEST_NAME).yaml
183183
rm tmp-cilium.yaml
184184
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
185+
IMG_TAG=$${IMG##*:} IMG_REPO=$${IMG%:*} yq -i e '.image.repository = strenv(IMG_REPO) | .image.tag = strenv(IMG_TAG) | .image.pullPolicy = "Always" | .env = ((.env // []) | map(select(.name != "LINODE_API_VERSION")) + [{"name": "LINODE_API_VERSION", "value": "v4beta"}])' tmp.yaml
186186
yq -i e 'select(.kind == "HelmChartProxy" and .spec.chartName == "ccm-linode").spec.valuesTemplate = load_str("tmp.yaml")' $(MANIFEST_NAME).yaml
187187
rm tmp.yaml
188188

0 commit comments

Comments
 (0)