added working unit test for controlEndpoint

Author: deepakm-ntnx

api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1/nutanixcluster_types.go

@@ -44,14 +44,12 @@ type NutanixClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// host can be either DNS name or ip address
-	// +optional
 	ControlPlaneEndpoint capiv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
 	// prismCentral holds the endpoint address and port to access the Nutanix Prism Central.
 	// When a cluster-wide proxy is installed, by default, this endpoint will be accessed via the proxy.
 	// Should you wish for communication with this endpoint not to be proxied, please add the endpoint to the
 	// proxy spec.noProxy list.
-	// +optional
 	PrismCentral *credentialTypes.NutanixPrismEndpoint `json:"prismCentral"`
 
 	// failureDomains configures failure domains information for the Nutanix platform.
@@ -60,7 +58,7 @@ type NutanixClusterSpec struct {
 	// +listType=map
 	// +listMapKey=name
 	// +optional
-	FailureDomains []NutanixFailureDomain `json:"failureDomains"`
+	FailureDomains []NutanixFailureDomain `json:"failureDomains,omitempty"`
 }
 
 // NutanixClusterStatus defines the observed state of NutanixCluster

api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1/nutanixmachine_types.go

@@ -73,6 +73,7 @@ type NutanixMachineSpec struct {
 	Subnets []NutanixResourceIdentifier `json:"subnet"`
 	// List of categories that need to be added to the machines. Categories must already exist in Prism Central
 	// +kubebuilder:validation:Optional
+	// +optional
 	AdditionalCategories []NutanixCategoryIdentifier `json:"additionalCategories,omitempty"`
 	// Add the machine resources to a Prism Central project
 	// +optional
@@ -94,6 +95,7 @@ type NutanixMachineSpec struct {
 
 	// List of GPU devices that need to be added to the machines.
 	// +kubebuilder:validation:Optional
+	// +optional
 	GPUs []NutanixGPU `json:"gpus,omitempty"`
 }
 

hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl

@@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/main/templates/cluster-template-topology.yaml
+- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/jira/KRBN-8094/templates/cluster-template-topology.yaml
 
 sortOptions:
   order: fifo

hack/examples/bases/nutanix/clusterclass/kustomization.yaml.tmpl

@@ -5,7 +5,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/main/templates/cluster-template-clusterclass.yaml
+- https://raw.githubusercontent.com/nutanix-cloud-native/cluster-api-provider-nutanix/jira/KRBN-8094/templates/cluster-template-clusterclass.yaml
 
 configurations:
   - kustomizeconfig.yaml

pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go

@@ -8,6 +8,7 @@ import (
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -93,8 +94,10 @@ func (h *nutanixControlPlaneEndpoint) Mutate(
 				"patchedObjectName", client.ObjectKeyFromObject(obj),
 			).Info("setting controlPlaneEndpoint in NutanixCluster spec")
 
-			obj.Spec.Template.Spec.ControlPlaneEndpoint.Host = controlPlaneEndpointVar.Host
-			obj.Spec.Template.Spec.ControlPlaneEndpoint.Port = controlPlaneEndpointVar.Port
+			obj.Spec.Template.Spec.ControlPlaneEndpoint = capiv1.APIEndpoint{
+				Host: controlPlaneEndpointVar.Host,
+				Port: controlPlaneEndpointVar.Port,
+			}
 
 			return nil
 		},

pkg/handlers/nutanix/mutation/controlplaneendpoint/tests/generate_patches.go

@@ -6,8 +6,12 @@ package tests
 import (
 	"testing"
 
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest"
+	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest/request"
+	"github.com/onsi/gomega"
+	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 )
 
 func TestGeneratePatches(
@@ -24,26 +28,47 @@ func TestGeneratePatches(
 		capitest.PatchTestDef{
 			Name: "unset variable",
 		},
-		// capitest.PatchTestDef{
-		// 	Name: "ControlPlaneEndpoint set to valid host",
-		// 	Vars: []runtimehooksv1.Variable{
-		// 		capitest.VariableWithValue(
-		// 			variableName,
-		// 			v1alpha1.NutanixControlPlaneEndpointSpec{
-		// 				Host: "10.20.100.10",
-		// 				Port: 6443,
-		// 			},
-		// 			variablePath...,
-		// 		),
-		// 	},
-		// 	RequestItem: request.NewNutanixClusterTemplateRequestItem("1234"),
-		// 	ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
-		// 		Operation: "add",
-		// 		Path:      "/spec/template/spec/controlPlaneEndpoint",
-		// 		ValueMatcher: gomega.HaveKeyWithValue(
-		// 			"host", "10.20.100.10",
-		// 		),
-		// 	}},
-		// },
+		capitest.PatchTestDef{
+			Name: "ControlPlaneEndpoint set to valid host",
+			Vars: []runtimehooksv1.Variable{
+				capitest.VariableWithValue(
+					variableName,
+					v1alpha1.NutanixControlPlaneEndpointSpec{
+						Host: "10.20.100.10",
+						Port: 6443,
+					},
+					variablePath...,
+				),
+			},
+			RequestItem: request.NewNutanixClusterTemplateRequestItem("1"),
+			ExpectedPatchMatchers: []capitest.JSONPatchMatcher{
+				{
+					Operation:    "replace",
+					Path:         "/spec/template/spec/controlPlaneEndpoint/host",
+					ValueMatcher: gomega.Equal("10.20.100.10"),
+				},
+			},
+		},
+		capitest.PatchTestDef{
+			Name: "ControlPlaneEndpoint set to valid host",
+			Vars: []runtimehooksv1.Variable{
+				capitest.VariableWithValue(
+					variableName,
+					v1alpha1.NutanixControlPlaneEndpointSpec{
+						Host: "10.20.100.10",
+						Port: 6443,
+					},
+					variablePath...,
+				),
+			},
+			RequestItem: request.NewNutanixClusterTemplateRequestItem("2"),
+			ExpectedPatchMatchers: []capitest.JSONPatchMatcher{
+				{
+					Operation:    "replace",
+					Path:         "/spec/template/spec/controlPlaneEndpoint/port",
+					ValueMatcher: gomega.BeEquivalentTo(6443),
+				},
+			},
+		},
 	)
 }

pkg/handlers/nutanix/mutation/metapatch_handler_test.go

@@ -6,7 +6,6 @@ package mutation
 import (
 	"testing"
 
-	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation"