fixup! refactor: Use CAAPH templating rather than custom temlating

Use the ControlPlane reference in the CAAPH template and check the annotation
for skip kube proxy on the referenced control plane object. As per
https://cluster-api.sigs.k8s.io/reference/api/metadata-propagation\#cluster-topology
the skip proxy annotation will be propagated to the annotations on the
referenced control plane so is safe to check. CAAPH adds the referenced
control plane to the variables referencable in the Helm values template.

Author: jimmidyson

charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml

@@ -33,7 +33,11 @@ socketLB:
 envoy:
   image:
     useDigest: false
-{{- if .EnableKubeProxyReplacement }}
-kubeProxyReplacement: true
 k8sServiceHost: auto
+{{- with .ControlPlane }}
+{{- range $key, $val := .metadata.annotations }}
+{{- if eq $key "controlplane.cluster.x-k8s.io/skip-kube-proxy" }}
+kubeProxyReplacement: true{{ break }}
+{{- end }}
+{{- end }}
 {{- end }}

common/pkg/capi/utils/anootations.go

@@ -19,6 +19,7 @@ helmCharts:
   skipTests: true
   namespace: kube-system
   kubeVersion: ${E2E_KUBERNETES_VERSION}
+  # This values file will be created by the update-cilium-manifests.sh script when generating the CRS manifests.
   valuesFile: helm-values.yaml
   # The CRS manifests are generated from the Cilium Helm chart using Kustomize. The Cilium
   # Helm chart uses a Helm hook to generate TLS certificates for Hubble. As the

hack/addons/kustomize/cilium/kustomization.yaml.tmpl

@@ -24,7 +24,10 @@ mkdir -p "${ASSETS_DIR}/cilium"
 envsubst -no-unset <"${KUSTOMIZE_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_DIR}/kustomization.yaml"
 
 cat <<EOF >"${ASSETS_DIR}/gomplate-context.yaml"
-EnableKubeProxyReplacement: true
+ControlPlane:
+  metadata:
+    annotations:
+      controlplane.cluster.x-k8s.io/skip-kube-proxy: ""
 EOF
 gomplate -f "${GIT_REPO_ROOT}/charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml" \
   --context .="${ASSETS_DIR}/gomplate-context.yaml" \

hack/addons/update-cilium-manifests.sh

@@ -266,10 +266,16 @@ func getValuesFileForChartIfNeeded(chartName, carenChartDirectory string) (strin
 		}
 
 		type input struct {
-			EnableKubeProxyReplacement bool
+			ControlPlane map[string]interface{}
 		}
 		templateInput := input{
-			EnableKubeProxyReplacement: true,
+			ControlPlane: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"annotations": map[string]interface{}{
+						"controlplane.cluster.x-k8s.io/skip-kube-proxy": "",
+					},
+				},
+			},
 		}
 
 		err = template.Must(template.New(defaultHelmAddonFilename).ParseFiles(f)).Execute(tempFile, &templateInput)

hack/tools/fetch-images/main.go

@@ -221,8 +221,7 @@ func (c *CiliumCNI) apply(
 			),
 			c.client,
 			helmChart,
-		).
-			WithValueTemplater(templateValues)
+		)
 	case "":
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage("strategy not specified for Cilium CNI addon")

pkg/handlers/generic/lifecycle/cni/cilium/handler.go

@@ -24,7 +24,6 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
-	capiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils"
 )
 
 const (
@@ -88,6 +87,11 @@ func (h *kubeProxyMode) Mutate(
 		return fmt.Errorf("failed to get cluster for kube proxy mode mutation: %w", err)
 	}
 
+	isSkipProxy := false
+	if cluster.Spec.Topology != nil {
+		_, isSkipProxy = cluster.Spec.Topology.ControlPlane.Metadata.Annotations[controlplanev1.SkipKubeProxyAnnotation]
+	}
+
 	kubeProxyMode, err := variables.Get[v1alpha1.KubeProxyMode](
 		vars,
 		h.variableName,
@@ -106,8 +110,6 @@ func (h *kubeProxyMode) Mutate(
 		kubeProxyMode,
 	)
 
-	isSkipProxy := capiutils.SkipKubeProxy(cluster)
-
 	if kubeProxyMode == "" && !isSkipProxy {
 		log.V(5).Info("kube proxy mode is not set or skipped, skipping mutation")
 		return nil