Revert "removed optional annotation from non-optional fields (#400)" (#414)

This reverts commit f6e079c.

Author: thunderboltsid

api/v1beta1/nutanixcluster_types.go

@@ -46,12 +46,14 @@ 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 +62,7 @@ type NutanixClusterSpec struct {
 	// +listType=map
 	// +listMapKey=name
 	// +optional
-	FailureDomains []NutanixFailureDomain `json:"failureDomains,omitempty"`
+	FailureDomains []NutanixFailureDomain `json:"failureDomains"`
 }
 
 // NutanixClusterStatus defines the observed state of NutanixCluster

api/v1beta1/nutanixmachine_types.go

@@ -83,7 +83,6 @@ 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
@@ -105,7 +104,6 @@ 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,9 +512,6 @@ 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,9 +228,6 @@ spec:
                         - address
                         - port
                         type: object
-                    required:
-                    - controlPlaneEndpoint
-                    - prismCentral
                     type: object
                 required:
                 - spec

controllers/helpers_test.go

@@ -22,7 +22,6 @@ 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"
@@ -53,7 +52,6 @@ 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,7 +83,6 @@ 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,
@@ -246,7 +245,6 @@ 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,
@@ -411,7 +409,6 @@ 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,
@@ -474,7 +471,6 @@ 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,
@@ -509,7 +505,6 @@ 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,
@@ -535,23 +530,34 @@ func TestNutanixClusterReconciler(t *testing.T) {
 			})
 		})
 
-		Context("NutanixCluster creation failed: PrismCentral Info is null", func() {
+		Context("Delete credentials ref reconcile 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{
-						ControlPlaneEndpoint: capiv1.APIEndpoint{},
-						PrismCentral:         nil,
+						PrismCentral: nil,
 					},
 				}
 
 				// Create the NutanixCluster object
-				g.Expect(k8sClient.Create(ctx, ntnxCluster)).NotTo(Succeed())
+				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())
 			})
 		})
 	})