fix: apply suggestions from reviews

Author: faiq

api/v1alpha1/addon_types.go

@@ -5,22 +5,22 @@ package v1alpha1
 
 import (
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/variables"
 )
 
 const (
-	AddonStrategyClusterResourceSet AddonStrategy = "ClusterResourceSet"
-	AddonStrategyHelmAddon          AddonStrategy = "HelmAddon"
-
-	VolumeBindingImmediate            = "Immmediate"
-	VolumeBindingWaitForFirstConsumer = "WaitForFirstConsumer"
-
-	VolumeReclaimRecycle = "Recycle"
-	VolumeReclaimDelete  = "Delete"
-	VolumeReclaimRetain  = "Retain"
+	AddonStrategyClusterResourceSet   AddonStrategy = "ClusterResourceSet"
+	AddonStrategyHelmAddon            AddonStrategy = "HelmAddon"
+	VolumeBindingImmediate                          = storagev1.VolumeBindingImmediate
+	VolumeBindingWaitForFirstConsumer               = storagev1.VolumeBindingWaitForFirstConsumer
+
+	VolumeReclaimRecycle = corev1.PersistentVolumeReclaimRecycle
+	VolumeReclaimDelete  = corev1.PersistentVolumeReclaimDelete
+	VolumeReclaimRetain  = corev1.PersistentVolumeReclaimRetain
 )
 
 type Addons struct {
@@ -174,24 +174,24 @@ type StorageClassConfig struct {
 	Parameters map[string]string `json:"parameters,omitempty"`
 
 	// +optional
-	ReclaimPolicy string `json:"reclaimPolicy,omitempty"`
+	ReclaimPolicy corev1.PersistentVolumeReclaimPolicy `json:"reclaimPolicy,omitempty"`
 
 	// +optional
-	VolumeBindingMode string `json:"volumeBindingMode,omitempty"`
+	VolumeBindingMode storagev1.VolumeBindingMode `json:"volumeBindingMode,omitempty"`
 
 	// +optional
 	AllowExpansion bool `json:"allowExpansion,omitempty"`
 }
 
 func (StorageClassConfig) VariableSchema() clusterv1.VariableSchema {
 	supportedReclaimPolicies := []string{
-		VolumeReclaimRecycle,
-		VolumeReclaimDelete,
-		VolumeReclaimRetain,
+		string(VolumeReclaimRecycle),
+		string(VolumeReclaimDelete),
+		string(VolumeReclaimRetain),
 	}
 	supportedBindingModes := []string{
-		VolumeBindingImmediate,
-		VolumeBindingWaitForFirstConsumer,
+		string(VolumeBindingImmediate),
+		string(VolumeBindingWaitForFirstConsumer),
 	}
 	return clusterv1.VariableSchema{
 		OpenAPIV3Schema: clusterv1.JSONSchemaProps{

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

@@ -154,9 +154,9 @@ spec:
                     - name: vip_arp
                       value: "true"
                     - name: address
-                      value: "${CONTROL_PLANE_ENDPOINT_IP}"
+                      value: "control_plane_endpoint_ip"
                     - name: port
-                      value: "${CONTROL_PLANE_ENDPOINT_PORT=6443}"
+                      value: "control_plane_endpoint_port"
                     - name: vip_cidr
                       value: "32"
                     - name: cp_enable

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

@@ -183,7 +183,7 @@ func (n *NutanixCSI) handleHelmAddonApply(
 				MatchLabels: map[string]string{clusterv1.ClusterNameLabel: req.Cluster.Name},
 			},
 			ReleaseNamespace: req.Cluster.Namespace,
-			ReleaseName:      fmt.Sprintf(defaultStorageHelmReleaseNameTemplate, req.Cluster.Name),
+			ReleaseName:      fmt.Sprintf(defaultSnapshotHelmReleaseNameTemplate, req.Cluster.Name),
 			Version:          defaultSnapshotHelmChartVersion,
 		},
 	}

pkg/handlers/generic/lifecycle/utils/utils.go

@@ -159,22 +159,6 @@ func CreateStorageClass(
 	provisionerName v1alpha1.StorageProvisioner,
 	isDefault bool,
 ) *storagev1.StorageClass {
-	var volumeBindingMode *storagev1.VolumeBindingMode
-	switch storageConfig.VolumeBindingMode {
-	case v1alpha1.VolumeBindingImmediate:
-		volumeBindingMode = ptr.To(storagev1.VolumeBindingImmediate)
-	case v1alpha1.VolumeBindingWaitForFirstConsumer:
-		volumeBindingMode = ptr.To(storagev1.VolumeBindingWaitForFirstConsumer)
-	}
-	var reclaimPolicy *corev1.PersistentVolumeReclaimPolicy
-	switch storageConfig.ReclaimPolicy {
-	case v1alpha1.VolumeReclaimRecycle:
-		reclaimPolicy = ptr.To(corev1.PersistentVolumeReclaimRecycle)
-	case v1alpha1.VolumeReclaimDelete:
-		reclaimPolicy = ptr.To(corev1.PersistentVolumeReclaimDelete)
-	case v1alpha1.VolumeReclaimRetain:
-		reclaimPolicy = ptr.To(corev1.PersistentVolumeReclaimRetain)
-	}
 	var params map[string]string
 	if provisionerName == v1alpha1.AWSEBSProvisioner {
 		params = defaultAWSStorageClassParams
@@ -193,8 +177,8 @@ func CreateStorageClass(
 		},
 		Provisioner:          string(provisionerName),
 		Parameters:           params,
-		VolumeBindingMode:    volumeBindingMode,
-		ReclaimPolicy:        reclaimPolicy,
+		VolumeBindingMode:    ptr.To(storageConfig.VolumeBindingMode),
+		ReclaimPolicy:        ptr.To(storageConfig.ReclaimPolicy),
 		AllowVolumeExpansion: ptr.To(storageConfig.AllowExpansion),
 	}
 	if isDefault {