Ensure that cloud name MinLength is 1

Signed-off-by: Roman Hros <[email protected]>

Author: chess-knight

api/v1alpha1/openstackclusterstackrelease_types.go

@@ -28,6 +28,7 @@ import (
 // OpenStackClusterStackReleaseSpec defines the desired state of OpenStackClusterStackRelease.
 type OpenStackClusterStackReleaseSpec struct {
 	// CloudName is the name of the cloud to use from the cloud's secret.
+	// +kubebuilder:validation:MinLength=1
 	CloudName string `json:"cloudName"`
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	IdentityRef *apiv1alpha7.OpenStackIdentityReference `json:"identityRef"`

api/v1alpha1/openstacknodeimagerelease_types.go

@@ -29,6 +29,7 @@ import (
 // OpenStackNodeImageReleaseSpec defines the desired state of OpenStackNodeImageRelease.
 type OpenStackNodeImageReleaseSpec struct {
 	// CloudName is the name of the cloud to use from the cloud's secret.
+	// +kubebuilder:validation:MinLength=1
 	CloudName string `json:"cloudName"`
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	IdentityRef *apiv1alpha7.OpenStackIdentityReference `json:"identityRef"`

config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleases.yaml

@@ -53,7 +53,9 @@ spec:
               of OpenStackClusterStackRelease.
             properties:
               cloudName:
-                description: The name of the cloud to use from the clouds secret
+                description: CloudName is the name of the cloud to use from the cloud's
+                  secret.
+                minLength: 1
                 type: string
               identityRef:
                 description: IdentityRef is a reference to a identity to be used when

config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstackclusterstackreleasetemplates.yaml

@@ -48,8 +48,9 @@ spec:
                       state of OpenStackClusterStackRelease.
                     properties:
                       cloudName:
-                        description: The name of the cloud to use from the clouds
-                          secret
+                        description: CloudName is the name of the cloud to use from
+                          the cloud's secret.
+                        minLength: 1
                         type: string
                       identityRef:
                         description: IdentityRef is a reference to a identity to be

config/crd/bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml

@@ -53,7 +53,9 @@ spec:
               OpenStackNodeImageRelease.
             properties:
               cloudName:
-                description: The name of the cloud to use from the clouds secret
+                description: CloudName is the name of the cloud to use from the cloud's
+                  secret.
+                minLength: 1
                 type: string
               identityRef:
                 description: IdentityRef is a reference to a identity to be used when

internal/controller/openstacknodeimagerelease_controller.go

@@ -266,10 +266,6 @@ func (r *OpenStackNodeImageReleaseReconciler) getCloudFromSecret(ctx context.Con
 	var clouds clientconfig.Clouds
 	emptyCloud := clientconfig.Cloud{}
 
-	if cloudName == "" {
-		return emptyCloud, fmt.Errorf("secret name set to %s but no cloud was specified. Please set cloud_name in your machine spec", secretName)
-	}
-
 	secret := &corev1.Secret{}
 	err := r.Get(ctx, types.NamespacedName{
 		Namespace: secretNamespace,