fixup! fix: Remove skip-kube-proxy from CRS cluster examples

CRS generation set the K8S_SERVICE_HOST literally to `auto`. When using
the Helm chart, `auto` looks up the host from the `cluster-info` ConfigMap
but this is not available when generating the CRS manifests. To use this,
we would need to update the CRS templates when applying them to the cluster
but we can defer that for now.

Author: jimmidyson

charts/cluster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml

@@ -16,9 +16,6 @@ spec:
   topology:
     class: aws-quick-start
     controlPlane:
-      metadata:
-        annotations:
-          controlplane.cluster.x-k8s.io/skip-kube-proxy: ""
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     variables:
     - name: clusterConfig

examples/capi-quick-start/aws-cluster-cilium-crs.yaml

@@ -57,9 +57,7 @@ spec:
   topology:
     class: nutanix-quick-start
     controlPlane:
-      metadata:
-        annotations:
-          controlplane.cluster.x-k8s.io/skip-kube-proxy: ""
+      metadata: {}
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}
     variables:
     - name: clusterConfig

examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml

@@ -30,5 +30,6 @@ helmCharts:
       enabled: false
       relay:
         enabled: false
+    k8sServiceHost: ""
 
 namespace: kube-system

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

@@ -20,6 +20,3 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/aws/crs-strategy.yaml
-  - target:
-      kind: Cluster
-    path: ../../../../../patches/skip-kube-proxy.yaml

hack/examples/overlays/clusters/aws/cilium/crs/kustomization.yaml.tmpl

@@ -17,6 +17,3 @@ patches:
   - target:
       kind: Cluster
     path: ../../../../../patches/crs-strategy.yaml
-  - target:
-      kind: Cluster
-    path: ../../../../../patches/skip-kube-proxy.yaml