remove redundant spec.label from linodevpc and linodemachine resources (

#192)
linode · Mar 14, 2024 · 9fbfbc2 · 9fbfbc2
1 parent 3982494
commit 9fbfbc2
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 44 deletions.
diff --git a/Makefile b/Makefile
@@ -140,7 +140,7 @@ docs:
 
 .PHONY: test
 test: generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -race -timeout 60s ./... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(CACHE_BIN) -p path)" go test -race -timeout 60s ./... -coverprofile cover.out
 
 .PHONY: e2etest
 e2etest: generate local-deploy chainsaw

diff --git a/api/v1alpha1/linodemachine_types.go b/api/v1alpha1/linodemachine_types.go
@@ -42,11 +42,6 @@ type LinodeMachineSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Type string `json:"type"`
-	// +kubebuilder:validation:MinLength=3
-	// +kubebuilder:validation:MaxLength=63
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
-	// +optional
-	Label string `json:"label,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	Group string `json:"group,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
@@ -198,7 +193,7 @@ func (lm *LinodeMachine) SetConditions(conditions clusterv1.Conditions) {
 	lm.Status.Conditions = conditions
 }
 
-//+kubebuilder:object:root=true
+// +kubebuilder:object:root=true
 
 // LinodeMachineList contains a list of LinodeMachine
 type LinodeMachineList struct {

diff --git a/api/v1alpha1/linodevpc_types.go b/api/v1alpha1/linodevpc_types.go
@@ -29,12 +29,6 @@ import (
 type LinodeVPCSpec struct {
 	// +optional
 	VPCID *int `json:"vpcID,omitempty"`
-
-	// +kubebuilder:validation:MinLength=3
-	// +kubebuilder:validation:MaxLength=63
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
-	// +optional
-	Label string `json:"label,omitempty"`
 	// +optional
 	Description string `json:"description,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
@@ -109,8 +103,8 @@ type LinodeVPCStatus struct {
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 
 // LinodeVPC is the Schema for the linodemachines API
 type LinodeVPC struct {
@@ -129,7 +123,7 @@ func (lm *LinodeVPC) SetConditions(conditions clusterv1.Conditions) {
 	lm.Status.Conditions = conditions
 }
 
-//+kubebuilder:object:root=true
+// +kubebuilder:object:root=true
 
 // LinodeVPCList contains a list of LinodeVPC
 type LinodeVPCList struct {

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml
@@ -161,13 +161,6 @@ spec:
                 x-kubernetes-validations:
                 - message: Value is immutable
                   rule: self == oldSelf
-              label:
-                maxLength: 63
-                minLength: 3
-                type: string
-                x-kubernetes-validations:
-                - message: Value is immutable
-                  rule: self == oldSelf
               metadata:
                 description: InstanceMetadataOptions defines metadata of instance
                 properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachinetemplates.yaml
@@ -150,13 +150,6 @@ spec:
                         x-kubernetes-validations:
                         - message: Value is immutable
                           rule: self == oldSelf
-                      label:
-                        maxLength: 63
-                        minLength: 3
-                        type: string
-                        x-kubernetes-validations:
-                        - message: Value is immutable
-                          rule: self == oldSelf
                       metadata:
                         description: InstanceMetadataOptions defines metadata of instance
                         properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml
@@ -56,13 +56,6 @@ spec:
                 x-kubernetes-map-type: atomic
               description:
                 type: string
-              label:
-                maxLength: 63
-                minLength: 3
-                type: string
-                x-kubernetes-validations:
-                - message: Value is immutable
-                  rule: self == oldSelf
               region:
                 type: string
                 x-kubernetes-validations:

diff --git a/controller/linodemachine_controller_helpers_test.go b/controller/linodemachine_controller_helpers_test.go
@@ -20,7 +20,6 @@ func TestLinodeMachineSpecToCreateInstanceConfig(t *testing.T) {
 	machineSpec := infrav1alpha1.LinodeMachineSpec{
 		Region:          "region",
 		Type:            "type",
-		Label:           "label",
 		Group:           "group",
 		RootPass:        "rootPass",
 		AuthorizedKeys:  []string{"key"},

diff --git a/controller/linodevpc_controller_helpers.go b/controller/linodevpc_controller_helpers.go
@@ -39,10 +39,8 @@ func (r *LinodeVPCReconciler) reconcileVPC(ctx context.Context, vpcScope *scope.
 
 		return err
 	}
-	if createConfig.Label == "" {
-		createConfig.Label = vpcScope.LinodeVPC.Name
-	}
 
+	createConfig.Label = vpcScope.LinodeVPC.Name
 	listFilter := util.Filter{
 		ID:    vpcScope.LinodeVPC.Spec.VPCID,
 		Label: createConfig.Label,
@@ -55,7 +53,6 @@ func (r *LinodeVPCReconciler) reconcileVPC(ctx context.Context, vpcScope *scope.
 	} else if len(vpcs) != 0 {
 		// Labels are unique
 		vpcScope.LinodeVPC.Spec.VPCID = &vpcs[0].ID
-		vpcScope.LinodeVPC.Spec.Label = vpcs[0].Label
 
 		return nil
 	}
@@ -73,7 +70,6 @@ func (r *LinodeVPCReconciler) reconcileVPC(ctx context.Context, vpcScope *scope.
 		return err
 	}
 
-	vpcScope.LinodeVPC.Spec.Label = vpc.Label
 	vpcScope.LinodeVPC.Spec.VPCID = &vpc.ID
 
 	return nil

diff --git a/controller/linodevpc_controller_helpers_test.go b/controller/linodevpc_controller_helpers_test.go
@@ -15,7 +15,6 @@ func TestLinodeVPCSpecToCreateVPCConfig(t *testing.T) {
 	t.Parallel()
 
 	vpcSpec := infrav1alpha1.LinodeVPCSpec{
-		Label:       "label",
 		Description: "description",
 		Region:      "region",
 		Subnets: []infrav1alpha1.VPCSubnetCreateOptions{