removed optional annotation from non-optional fields

same code as https://github.com/nutanix-cloud-native/cluster-api-provider-nutanix/pull/400/files
which was reverted in #414

Author: deepakm-ntnx

api/v1beta1/nutanixcluster_types.go

@@ -46,14 +46,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.
@@ -62,7 +60,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/v1beta1/nutanixmachine_types.go

@@ -83,6 +83,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
@@ -104,6 +105,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"`
 }
 

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclusters.yaml

@@ -512,6 +512,9 @@ spec:
                 - address
                 - port
                 type: object
+            required:
+            - controlPlaneEndpoint
+            - prismCentral
             type: object
           status:
             description: NutanixClusterStatus defines the observed state of NutanixCluster

config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml

@@ -228,6 +228,9 @@ spec:
                         - address
                         - port
                         type: object
+                    required:
+                    - controlPlaneEndpoint
+                    - prismCentral
                     type: object
                 required:
                 - spec

controllers/helpers_test.go

@@ -22,6 +22,7 @@ import (
 
 	credentialTypes "github.com/nutanix-cloud-native/prism-go-client/environment/credentials"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util"
 
 	infrav1 "github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1"
@@ -52,6 +53,7 @@ func TestControllerHelpers(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: infrav1.NutanixClusterSpec{
+					ControlPlaneEndpoint: capiv1.APIEndpoint{},
 					PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 						// Adding port info to override default value (0)
 						Port: 9440,

controllers/nutanixcluster_controller_test.go

@@ -83,6 +83,7 @@ func TestNutanixClusterReconciler(t *testing.T) {
 					UID:       utilruntime.NewUUID(),
 				},
 				Spec: infrav1.NutanixClusterSpec{
+					ControlPlaneEndpoint: capiv1.APIEndpoint{},
 					PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 						// Adding port info to override default value (0)
 						Port: 9440,
@@ -245,6 +246,7 @@ func TestNutanixClusterReconciler(t *testing.T) {
 						Namespace: corev1.NamespaceDefault,
 					},
 					Spec: infrav1.NutanixClusterSpec{
+						ControlPlaneEndpoint: capiv1.APIEndpoint{},
 						PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 							// Adding port info to override default value (0)
 							Port: 9440,
@@ -409,6 +411,7 @@ func TestNutanixClusterReconciler(t *testing.T) {
 						Namespace: "default",
 					},
 					Spec: infrav1.NutanixClusterSpec{
+						ControlPlaneEndpoint: capiv1.APIEndpoint{},
 						PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 							// Adding port info to override default value (0)
 							Port: 9440,
@@ -471,6 +474,7 @@ func TestNutanixClusterReconciler(t *testing.T) {
 						Namespace: "default",
 					},
 					Spec: infrav1.NutanixClusterSpec{
+						ControlPlaneEndpoint: capiv1.APIEndpoint{},
 						PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 							// Adding port info to override default value (0)
 							Port: 9440,
@@ -505,6 +509,7 @@ func TestNutanixClusterReconciler(t *testing.T) {
 						Namespace: "default",
 					},
 					Spec: infrav1.NutanixClusterSpec{
+						ControlPlaneEndpoint: capiv1.APIEndpoint{},
 						PrismCentral: &credentialTypes.NutanixPrismEndpoint{
 							// Adding port info to override default value (0)
 							Port: 9440,
@@ -530,34 +535,23 @@ func TestNutanixClusterReconciler(t *testing.T) {
 			})
 		})
 
-		Context("Delete credentials ref reconcile failed: PrismCentral Info is null", func() {
+		Context("NutanixCluster creation failed: PrismCentral Info is null", func() {
 			It("Should not return error", func() {
 				ctx := context.Background()
-				reconciler := &NutanixClusterReconciler{
-					Client: k8sClient,
-					Scheme: runtime.NewScheme(),
-				}
 
 				ntnxCluster := &infrav1.NutanixCluster{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "test",
 						Namespace: "default",
 					},
 					Spec: infrav1.NutanixClusterSpec{
-						PrismCentral: nil,
+						ControlPlaneEndpoint: capiv1.APIEndpoint{},
+						PrismCentral:         nil,
 					},
 				}
 
 				// Create the NutanixCluster object
-				g.Expect(k8sClient.Create(ctx, ntnxCluster)).To(Succeed())
-				defer func() {
-					err := k8sClient.Delete(ctx, ntnxCluster)
-					Expect(err).NotTo(HaveOccurred())
-				}()
-
-				// Reconile Delete credential ref
-				err := reconciler.reconcileCredentialRefDelete(ctx, ntnxCluster)
-				g.Expect(err).NotTo(HaveOccurred())
+				g.Expect(k8sClient.Create(ctx, ntnxCluster)).NotTo(Succeed())
 			})
 		})
 	})