fix: set kuberentes_host and port explicitly in cilium config

Author: supershal

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

@@ -39,18 +39,11 @@ socketLB:
 envoy:
   image:
     useDigest: false
-
 {{- if .EnableKubeProxyReplacement }}
 kubeProxyReplacement: true
 {{- end }}
-
-{{- if eq $capiProvider "eks" }}
 k8sServiceHost: "{{ trimPrefix .Cluster.Spec.ControlPlaneEndpoint.Host "https://" }}"
 k8sServicePort: "{{ .Cluster.Spec.ControlPlaneEndpoint.Port }}"
-{{- else }}
-k8sServiceHost: auto
-{{- end }}
-
 {{- if eq $capiProvider "eks" }}
 enableIPv4Masquerade: false
 eni:

hack/addons/update-cilium-manifests.sh

@@ -30,7 +30,9 @@ Cluster:
     cluster.x-k8s.io/provider: tmpl-capiprovider-tmpl
 EOF
 # Replace trimPrefix with strings.TrimPrefix to use the in built go function in gomplate.
-sed 's/trimPrefix/strings.TrimPrefix/g' \
+sed -e 's/trimPrefix/strings.TrimPrefix/g' \
+  -e '/k8sServiceHost:.*/,/k8sServicePort:/c\
+k8sServiceHost: auto' \
   "${GIT_REPO_ROOT}/charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml" |
   gomplate --context .="${ASSETS_DIR}/gomplate-context.yaml" \
     >"${ASSETS_DIR}/helm-values.yaml"