Restrict name format of ScalewayMachine and ScalewayCluster

Author: Tomy2e

api/v1alpha1/scalewaycluster_types.go

@@ -230,6 +230,8 @@ type NetworkStatus struct {
 // +kubebuilder:storageversion
 
 // ScalewayCluster is the Schema for the scalewayclusters API.
+// +kubebuilder:validation:XValidation:rule="self.metadata.name.size() <= 63",message="name must be between 1 and 63 characters"
+// +kubebuilder:validation:XValidation:rule="self.metadata.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')",message="name must be a valid DNS label"
 type ScalewayCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/scalewaymachine_types.go

@@ -100,6 +100,8 @@ type ScalewayMachineStatus struct {
 // +kubebuilder:storageversion
 
 // ScalewayMachine is the Schema for the scalewaymachines API.
+// +kubebuilder:validation:XValidation:rule="self.metadata.name.size() <= 63",message="name must be between 1 and 63 characters"
+// +kubebuilder:validation:XValidation:rule="self.metadata.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')",message="name must be a valid DNS label"
 type ScalewayMachine struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

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

@@ -364,6 +364,11 @@ spec:
                 type: boolean
             type: object
         type: object
+        x-kubernetes-validations:
+        - message: name must be between 1 and 63 characters
+          rule: self.metadata.name.size() <= 63
+        - message: name must be a valid DNS label
+          rule: self.metadata.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')
     served: true
     storage: true
     subresources:

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

@@ -181,6 +181,11 @@ spec:
         required:
         - spec
         type: object
+        x-kubernetes-validations:
+        - message: name must be between 1 and 63 characters
+          rule: self.metadata.name.size() <= 63
+        - message: name must be a valid DNS label
+          rule: self.metadata.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')
     served: true
     storage: true
     subresources:

internal/scope/cluster.go

@@ -83,13 +83,17 @@ func (c *Cluster) Close(ctx context.Context) error {
 // ResourceNameName returns the name/prefix that resources created for the cluster should have.
 // It is possible to provide additional suffixes that will be appended to the name with a leading "-".
 func (c *Cluster) ResourceName(suffixes ...string) string {
-	return truncateString(strings.Join(append([]string{c.ScalewayCluster.Name}, suffixes...), "-"), 128)
+	return strings.Join(append([]string{c.ScalewayCluster.Name}, suffixes...), "-")
 }
 
 // ResourceTags returns the tags that resources created for the cluster should have.
 // It is possible to provide additional tags that will be added to the default tags.
 func (c *Cluster) ResourceTags(additional ...string) []string {
-	return append([]string{fmt.Sprintf("caps-scalewaycluster=%s", c.ScalewayCluster.Name)}, additional...)
+	return append(
+		[]string{
+			fmt.Sprintf("caps-namespace=%s", c.ScalewayCluster.Namespace),
+			fmt.Sprintf("caps-scalewaycluster=%s", c.ScalewayCluster.Name),
+		}, additional...)
 }
 
 // HasPrivateNetwork returns true if the cluster has a Private Network.

internal/scope/machine.go

@@ -73,7 +73,7 @@ func (m *Machine) Close(ctx context.Context) error {
 
 // ResourceNameName returns the name that resources created for the machine should have.
 func (m *Machine) ResourceName() string {
-	return truncateString(m.ScalewayMachine.Name, 63)
+	return m.ScalewayMachine.Name
 }
 
 // ResourceTags returns the tags that resources created for the machine should have.