fix: cilium templating for list-images

Author: supershal

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

@@ -38,11 +38,11 @@ socketLB:
 envoy:
   image:
     useDigest: false
+k8sServiceHost: "{{ trimPrefix .ControlPlaneEndpoint.Host "https://" }}"
+k8sServicePort: "{{ .ControlPlaneEndpoint.Port }}"
 {{- if .EnableKubeProxyReplacement }}
 kubeProxyReplacement: true
 {{- end }}
-k8sServiceHost: "{{ trimPrefix .ControlPlaneEndpoint.Host "https://" }}"
-k8sServicePort: "{{ .ControlPlaneEndpoint.Port }}"
 {{- if eq .Provider "eks" }}
 enableIPv4Masquerade: false
 eni:

common/pkg/capi/utils/annotations.go

@@ -266,13 +266,24 @@ func getValuesFileForChartIfNeeded(chartName, carenChartDirectory string) (strin
 		}
 
 		type input struct {
+			Provider                   string
+			ControlPlaneEndpoint       clusterv1.APIEndpoint
 			EnableKubeProxyReplacement bool
 		}
 		templateInput := input{
+			Provider: "test",
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Host: "https://test.dummy.com",
+				Port: 443,
+			},
 			EnableKubeProxyReplacement: true,
 		}
 
-		err = template.Must(template.New(defaultHelmAddonFilename).ParseFiles(f)).Execute(tempFile, &templateInput)
+		funcMap := template.FuncMap{
+			"trimPrefix": strings.TrimPrefix,
+		}
+		err = template.Must(
+			template.New(defaultHelmAddonFilename).Funcs(funcMap).ParseFiles(f)).Execute(tempFile, &templateInput)
 		if err != nil {
 			return "", fmt.Errorf("failed to execute helm values template %w", err)
 		}

hack/tools/fetch-images/main.go

@@ -117,7 +117,7 @@ func createTestCluster(t *testing.T, name, namespace, provider, host string, por
 
 	cluster := builder.Cluster(namespace, name).
 		WithLabels(map[string]string{
-			"cluster.x-k8s.io/provider": provider,
+			clusterv1.ProviderNameLabel: provider,
 		}).
 		WithTopology(topology).
 		Build()