Add projectID field in ScalewayCluster

Author: Tomy2e

api/v1alpha1/scalewaycluster_types.go

@@ -10,10 +10,14 @@ const ClusterFinalizer = "scalewaycluster.infrastructure.cluster.x-k8s.io/sc-pro
 // ScalewayClusterSpec defines the desired state of ScalewayCluster.
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.controlPlaneEndpoint) || has(self.controlPlaneEndpoint)", message="controlPlaneEndpoint is required once set"
 type ScalewayClusterSpec struct {
+	// ProjectID is the Scaleway project ID where the cluster will be created.
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
+	// +kubebuilder:validation:Pattern:="^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+	ProjectID string `json:"projectID"`
+
 	// Region represents the region where the cluster will be hosted.
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
-	// +kubebuilder:validation:MinLength=1
-	// +kubebuilder:validation:MaxLength=10
+	// +kubebuilder:validation:Pattern:="^[a-z]{2}-[a-z]{3}$"
 	Region string `json:"region"`
 
 	// Network contains network related options for the cluster.

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

@@ -280,11 +280,18 @@ spec:
                 - message: privateNetwork is required when publicGateways is set
                   rule: '!has(self.publicGateways) || has(self.privateNetwork) &&
                     self.privateNetwork.enabled'
+              projectID:
+                description: ProjectID is the Scaleway project ID where the cluster
+                  will be created.
+                pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$
+                type: string
+                x-kubernetes-validations:
+                - message: Value is immutable
+                  rule: self == oldSelf
               region:
                 description: Region represents the region where the cluster will be
                   hosted.
-                maxLength: 10
-                minLength: 1
+                pattern: ^[a-z]{2}-[a-z]{3}$
                 type: string
                 x-kubernetes-validations:
                 - message: Value is immutable
@@ -296,6 +303,7 @@ spec:
                   The following key is optional: SCW_API_URL.
                 type: string
             required:
+            - projectID
             - region
             - scalewaySecretName
             type: object

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

@@ -281,11 +281,18 @@ spec:
                             is set
                           rule: '!has(self.publicGateways) || has(self.privateNetwork)
                             && self.privateNetwork.enabled'
+                      projectID:
+                        description: ProjectID is the Scaleway project ID where the
+                          cluster will be created.
+                        pattern: ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$
+                        type: string
+                        x-kubernetes-validations:
+                        - message: Value is immutable
+                          rule: self == oldSelf
                       region:
                         description: Region represents the region where the cluster
                           will be hosted.
-                        maxLength: 10
-                        minLength: 1
+                        pattern: ^[a-z]{2}-[a-z]{3}$
                         type: string
                         x-kubernetes-validations:
                         - message: Value is immutable
@@ -297,6 +304,7 @@ spec:
                           The following key is optional: SCW_API_URL.
                         type: string
                     required:
+                    - projectID
                     - region
                     - scalewaySecretName
                     type: object

internal/controller/scalewaycluster_controller_test.go

@@ -37,7 +37,8 @@ var _ = Describe("ScalewayCluster Controller", func() {
 						Namespace: "default",
 					},
 					Spec: infrav1.ScalewayClusterSpec{
-						Region: string(scw.RegionFrPar),
+						ProjectID: "11111111-1111-1111-1111-111111111111",
+						Region:    string(scw.RegionFrPar),
 					},
 				}
 				Expect(k8sClient.Create(ctx, resource)).To(Succeed())

internal/scope/cluster.go

@@ -52,7 +52,7 @@ func NewCluster(ctx context.Context, params *ClusterParams) (*Cluster, error) {
 		return nil, fmt.Errorf("failed to get ScalewaySecret: %w", err)
 	}
 
-	c, err := scwClient.New(region, secret.Data)
+	c, err := scwClient.New(region, params.ScalewayCluster.Spec.ProjectID, secret.Data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create Scaleway client from ScalewaySecret: %w", err)
 	}

internal/service/scaleway/client/client.go

@@ -35,7 +35,7 @@ type Client struct {
 
 // New returns a new Scaleway client based on the provided region and secretData.
 // The secret data must contain a default projectID and credentials.
-func New(region scw.Region, secretData map[string][]byte) (*Client, error) {
+func New(region scw.Region, projectID string, secretData map[string][]byte) (*Client, error) {
 	accessKey := string(secretData[scw.ScwAccessKeyEnv])
 	if accessKey == "" {
 		return nil, fmt.Errorf("field %s is missing in secret", scw.ScwAccessKeyEnv)
@@ -46,11 +46,6 @@ func New(region scw.Region, secretData map[string][]byte) (*Client, error) {
 		return nil, fmt.Errorf("field %s is missing in secret", scw.ScwSecretKeyEnv)
 	}
 
-	projectID := string(secretData[scw.ScwDefaultProjectIDEnv])
-	if projectID == "" {
-		return nil, fmt.Errorf("field %s is missing in secret", scw.ScwDefaultProjectIDEnv)
-	}
-
 	opts := []scw.ClientOption{
 		scw.WithAuth(accessKey, secretKey),
 		scw.WithDefaultProjectID(projectID),