fix: use ControlPlaneEndpont object directly in template

supershal · supershal · commit eed6ec3ddc90 · 2025-09-26T15:00:08.000-07:00
diff --git a/charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml b/charts/cluster-api-runtime-extensions-nutanix/addons/cni/cilium/values-template.yaml
@@ -18,8 +18,7 @@ hubble:
     image:
       useDigest: false
     priorityClassName: system-cluster-critical
-{{- $capiProvider := index .Cluster.Labels "cluster.x-k8s.io/provider" }}
-{{- if eq $capiProvider "eks" }}
+{{- if eq .Provider "eks" }}
 ipam:
   mode: eni
 {{- else }}
@@ -42,9 +41,9 @@ envoy:
 {{- if .EnableKubeProxyReplacement }}
 kubeProxyReplacement: true
 {{- end }}
-k8sServiceHost: "{{ trimPrefix .Cluster.Spec.ControlPlaneEndpoint.Host "https://" }}"
-k8sServicePort: "{{ .Cluster.Spec.ControlPlaneEndpoint.Port }}"
-{{- if eq $capiProvider "eks" }}
+k8sServiceHost: "{{ trimPrefix .ControlPlaneEndpoint.Host "https://" }}"
+k8sServicePort: "{{ .ControlPlaneEndpoint.Port }}"
+{{- if eq .Provider "eks" }}
 enableIPv4Masquerade: false
 eni:
   enabled: true
diff --git a/hack/addons/update-cilium-manifests.sh b/hack/addons/update-cilium-manifests.sh
@@ -25,9 +25,10 @@ envsubst -no-unset <"${KUSTOMIZE_BASE_DIR}/kustomization.yaml.tmpl" >"${ASSETS_D
 
 cat <<EOF >"${ASSETS_DIR}/gomplate-context.yaml"
 EnableKubeProxyReplacement: false
-Cluster:
-  Labels:
-    cluster.x-k8s.io/provider: tmpl-capiprovider-tmpl
+Provider: tmpl-capiprovider-tmpl
+ControlPlaneEndpoint:
+  Host: tmpl-controlplaneendpointhost-tmpl
+  Port: 6443
 EOF
 # Replace trimPrefix with strings.TrimPrefix to use the in built go function in gomplate.
 sed -e 's/trimPrefix/strings.TrimPrefix/g' \
diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/template.go b/pkg/handlers/generic/lifecycle/cni/cilium/template.go
@@ -6,11 +6,13 @@ package cilium
 import (
 	"bytes"
 	"fmt"
+	"strings"
 	"text/template"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
+	capiutils "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/utils"
 )
 
 // templateValues enables kube-proxy replacement when kube-proxy is disabled.
@@ -20,19 +22,25 @@ func templateValues(cluster *clusterv1.Cluster, text string) (string, error) {
 		return "", fmt.Errorf("failed to check if kube-proxy is disabled: %w", err)
 	}
 
-	ciliumTemplate, err := template.New("").Parse(text)
+	funcMap := template.FuncMap{
+		"trimPrefix": strings.TrimPrefix,
+	}
+	ciliumTemplate, err := template.New("").Funcs(funcMap).Parse(text)
 	if err != nil {
 		return "", fmt.Errorf("failed to parse template: %w", err)
 	}
 
 	type input struct {
-		Cluster                    *clusterv1.Cluster
+		Provider                   string
+		ControlPlaneEndpoint       clusterv1.APIEndpoint
 		EnableKubeProxyReplacement bool
 	}
 
 	// Assume when kube-proxy is disabled, we should enable Cilium's kube-proxy replacement feature.
 	templateInput := input{
 		EnableKubeProxyReplacement: kubeProxyIsDisabled,
+		Provider:                   capiutils.GetProvider(cluster),
+		ControlPlaneEndpoint:       cluster.Spec.ControlPlaneEndpoint,
 	}
 
 	var b bytes.Buffer
diff --git a/pkg/handlers/generic/lifecycle/cni/cilium/template_test.go b/pkg/handlers/generic/lifecycle/cni/cilium/template_test.go
@@ -8,77 +8,43 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
+
+	carenv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
+	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/internal/test/builder"
 )
 
 func Test_templateValues(t *testing.T) {
 	tests := []struct {
 		name                           string
-		cluster                        *clusterv1.Cluster
+		cluster                        func(t *testing.T) *clusterv1.Cluster
 		expectedRenderedValuesTemplate string
 	}{
 		{
 			name: "EKS cluster with https prefix in controlPlaneEndpoint.Host",
-			cluster: &clusterv1.Cluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-eks-cluster",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						"cluster.x-k8s.io/provider": "eks",
-					},
-				},
-				Spec: clusterv1.ClusterSpec{
-					ControlPlaneEndpoint: clusterv1.APIEndpoint{
-						Host: "https://test.eks.amazonaws.com",
-						Port: 443,
-					},
-					Topology: &clusterv1.Topology{
-						ControlPlane: clusterv1.ControlPlaneTopology{
-							Metadata: clusterv1.ObjectMeta{
-								Annotations: map[string]string{
-									controlplanev1.SkipKubeProxyAnnotation: "",
-								},
-							},
-						},
-					},
-				},
+			cluster: func(t *testing.T) *clusterv1.Cluster {
+				return createTestEKSCluster(
+					t,
+					"test-eks-cluster",
+					"test-namespace",
+					"https://test.eks.amazonaws.com",
+					443,
+				)
 			},
 			expectedRenderedValuesTemplate: expectedCiliumTemplateForEKS,
 		},
 		{
-			name: "Non-EKS (Nutanix) cluster (should use auto for controlPlaneEndpointHost)",
-			cluster: &clusterv1.Cluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-cluster",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						"cluster.x-k8s.io/provider": "nutanix",
-					},
-				},
-				Spec: clusterv1.ClusterSpec{
-					ControlPlaneEndpoint: clusterv1.APIEndpoint{
-						Host: "192.168.1.100",
-						Port: 6443,
-					},
-					Topology: &clusterv1.Topology{
-						ControlPlane: clusterv1.ControlPlaneTopology{
-							Metadata: clusterv1.ObjectMeta{
-								Annotations: map[string]string{
-									controlplanev1.SkipKubeProxyAnnotation: "",
-								},
-							},
-						},
-					},
-				},
+			name: "Non-EKS (Nutanix) cluster (should set ipam mode to kubernetes)",
+			cluster: func(t *testing.T) *clusterv1.Cluster {
+				return createTestNutanixCluster(t, "test-cluster", "test-namespace", "192.168.1.100", 6443)
 			},
 			expectedRenderedValuesTemplate: expectedCiliumTemplateForNutanix,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := templateValues(tt.cluster, ciliumTemplate)
+			got, err := templateValues(tt.cluster(t), ciliumTemplate)
 			require.NoError(t, err)
 			assert.Equal(t, tt.expectedRenderedValuesTemplate, got)
 		})
@@ -110,23 +76,9 @@ func Test_templateValues_TrimPrefixFunction(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cluster := &clusterv1.Cluster{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-cluster",
-					Namespace: "test-namespace",
-					Labels: map[string]string{
-						"cluster.x-k8s.io/provider": "eks",
-					},
-				},
-				Spec: clusterv1.ClusterSpec{
-					ControlPlaneEndpoint: clusterv1.APIEndpoint{
-						Host: tt.inputHost,
-						Port: 443,
-					},
-				},
-			}
-
-			template := `k8sServiceHost: "{{ trimPrefix .Cluster.Spec.ControlPlaneEndpoint.Host "https://" }}"`
+			cluster := createTestEKSCluster(t, "test-cluster", "test-namespace", tt.inputHost, 443)
+
+			template := `k8sServiceHost: "{{ trimPrefix .ControlPlaneEndpoint.Host "https://" }}"`
 			expected := `k8sServiceHost: "` + tt.expectedOutput + `"`
 
 			got, err := templateValues(cluster, template)
@@ -136,11 +88,84 @@ func Test_templateValues_TrimPrefixFunction(t *testing.T) {
 	}
 }
 
+// createTestEKSCluster creates a test EKS cluster using ClusterBuilder
+func createTestEKSCluster(t *testing.T, name, namespace, host string, port int32) *clusterv1.Cluster {
+	// Create cluster config with kube-proxy disabled
+	clusterConfigSpec := &apivariables.ClusterConfigSpec{
+		KubeProxy: &carenv1.KubeProxy{
+			Mode: carenv1.KubeProxyModeDisabled,
+		},
+	}
+
+	// Marshal cluster config to cluster variable
+	variable, err := apivariables.MarshalToClusterVariable(carenv1.ClusterConfigVariableName, clusterConfigSpec)
+	if err != nil {
+		t.Fatalf("failed to marshal cluster config to cluster variable: %v", err)
+	}
+
+	topology := &clusterv1.Topology{
+		Class:     "eks-cluster-class",
+		Version:   "v1.29.0",
+		Variables: []clusterv1.ClusterVariable{*variable},
+	}
+
+	cluster := builder.Cluster(namespace, name).
+		WithLabels(map[string]string{
+			"cluster.x-k8s.io/provider": "eks",
+		}).
+		WithTopology(topology).
+		Build()
+
+	// Set ControlPlaneEndpoint after building since ClusterBuilder doesn't support it
+	cluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
+		Host: host,
+		Port: port,
+	}
+
+	return cluster
+}
+
+// createTestNutanixCluster creates a test Nutanix cluster using ClusterBuilder
+func createTestNutanixCluster(t *testing.T, name, namespace, host string, port int32) *clusterv1.Cluster {
+	// Create cluster config with kube-proxy disabled
+	clusterConfigSpec := &apivariables.ClusterConfigSpec{
+		KubeProxy: &carenv1.KubeProxy{
+			Mode: carenv1.KubeProxyModeDisabled,
+		},
+	}
+
+	// Marshal cluster config to cluster variable
+	variable, err := apivariables.MarshalToClusterVariable(carenv1.ClusterConfigVariableName, clusterConfigSpec)
+	if err != nil {
+		t.Fatalf("failed to marshal cluster config to cluster variable: %v", err)
+	}
+
+	topology := &clusterv1.Topology{
+		Class:     "nutanix-cluster-class",
+		Version:   "v1.29.0",
+		Variables: []clusterv1.ClusterVariable{*variable},
+	}
+
+	cluster := builder.Cluster(namespace, name).
+		WithLabels(map[string]string{
+			"cluster.x-k8s.io/provider": "nutanix",
+		}).
+		WithTopology(topology).
+		Build()
+
+	// Set ControlPlaneEndpoint after building since ClusterBuilder doesn't support it
+	cluster.Spec.ControlPlaneEndpoint = clusterv1.APIEndpoint{
+		Host: host,
+		Port: port,
+	}
+
+	return cluster
+}
+
 const (
 	// the template value is sourced from the Cilium values template in the project's helm chart
 	ciliumTemplate = `
-{{- $capiProvider := index .Cluster.Labels "cluster.x-k8s.io/provider" }}
-{{- if eq $capiProvider "eks" }}
+{{- if eq .Provider "eks" }}
 ipam:
   mode: eni
 {{- else }}
@@ -151,15 +176,9 @@ ipam:
 {{- 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" }}
+k8sServiceHost: "{{ trimPrefix .ControlPlaneEndpoint.Host "https://" }}"
+k8sServicePort: "{{ .ControlPlaneEndpoint.Port }}"
+{{- if eq .Provider "eks" }}
 enableIPv4Masquerade: false
 eni:
   enabled: true
@@ -188,6 +207,7 @@ endpointRoutes:
 ipam:
   mode: kubernetes
 kubeProxyReplacement: true
-k8sServiceHost: auto
+k8sServiceHost: "192.168.1.100"
+k8sServicePort: "6443"
 `
 )
