Various review fixes

kubernetes-sigs · Aug 10, 2023 · f5d13f8 · f5d13f8
1 parent dd5ccf6
commit f5d13f8
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 69 deletions.
diff --git a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml
diff --git a/exp/api/v1alpha3/conversion.go b/exp/api/v1alpha3/conversion.go
@@ -76,7 +76,6 @@ func (src *MachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	}
 	dst.Spec.Template.Spec.NodeDeletionTimeout = restored.Spec.Template.Spec.NodeDeletionTimeout
 	dst.Spec.Template.Spec.NodeVolumeDetachTimeout = restored.Spec.Template.Spec.NodeVolumeDetachTimeout
-	dst.Spec.Selector = restored.Spec.Selector
 	return nil
 }
 

diff --git a/exp/api/v1alpha3/zz_generated.conversion.go b/exp/api/v1alpha3/zz_generated.conversion.go
diff --git a/exp/api/v1alpha4/conversion.go b/exp/api/v1alpha4/conversion.go
@@ -42,7 +42,6 @@ func (src *MachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	}
 	dst.Spec.Template.Spec.NodeDeletionTimeout = restored.Spec.Template.Spec.NodeDeletionTimeout
 	dst.Spec.Template.Spec.NodeVolumeDetachTimeout = restored.Spec.Template.Spec.NodeVolumeDetachTimeout
-	dst.Spec.Selector = restored.Spec.Selector
 	return nil
 }
 

diff --git a/exp/api/v1alpha4/zz_generated.conversion.go b/exp/api/v1alpha4/zz_generated.conversion.go
diff --git a/exp/api/v1beta1/machinepool_types.go b/exp/api/v1beta1/machinepool_types.go
@@ -42,11 +42,6 @@ type MachinePoolSpec struct {
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
 
-	// Label selector for machines. Existing MachineSets whose machines are
-	// selected by this will be the ones affected by this deployment.
-	// It must match the machine template's labels.
-	Selector metav1.LabelSelector `json:"selector"`
-
 	// Template describes the machines that will be created.
 	Template clusterv1.MachineTemplateSpec `json:"template"`
 

diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go
diff --git a/internal/controllers/topology/cluster/desired_state.go b/internal/controllers/topology/cluster/desired_state.go
@@ -1059,14 +1059,6 @@ func computeMachinePool(_ context.Context, s *scope.Scope, desiredControlPlaneSt
 	// Note: the labels in MachineSet are used to properly cleanup templates when the MachineSet is deleted.
 	desiredMachinePoolObj.Spec.Template.Labels = machinePoolLabels
 
-	// Set the selector with the subset of labels identifying controlled machines.
-	// NOTE: this prevents the web hook to add cluster.x-k8s.io/pool-name label, that is
-	// redundant for managed MachinePool given that we already have topology.cluster.x-k8s.io/pool-name.
-	desiredMachinePoolObj.Spec.Selector.MatchLabels = map[string]string{}
-	desiredMachinePoolObj.Spec.Selector.MatchLabels[clusterv1.ClusterNameLabel] = s.Current.Cluster.Name
-	desiredMachinePoolObj.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyOwnedLabel] = ""
-	desiredMachinePoolObj.Spec.Selector.MatchLabels[clusterv1.ClusterTopologyMachinePoolNameLabel] = machinePoolTopology.Name
-
 	// Set the desired replicas.
 	desiredMachinePoolObj.Spec.Replicas = machinePoolTopology.Replicas
 

diff --git a/internal/controllers/topology/cluster/patches/inline/json_patch_generator.go b/internal/controllers/topology/cluster/patches/inline/json_patch_generator.go
@@ -155,8 +155,8 @@ func matchesSelector(req *runtimehooksv1.GeneratePatchesRequestItem, templateVar
 	}
 
 	// Check if the request is for a BootstrapConfigTemplate or an InfrastructureMachineTemplate
-	// of one of the configured MachineDeploymentClasses or MachinePoolClasses.
-	if selector.MatchResources.MachineDeploymentClass != nil || selector.MatchResources.MachinePoolClass != nil {
+	// of one of the configured MachineDeploymentClasses.
+	if selector.MatchResources.MachineDeploymentClass != nil {
 		// MachineDeployment.spec.template.spec.bootstrap.configRef or
 		// MachineDeployment.spec.template.spec.infrastructureRef holds the BootstrapConfigTemplate or
 		// InfrastructureMachineTemplate.
@@ -184,7 +184,11 @@ func matchesSelector(req *runtimehooksv1.GeneratePatchesRequestItem, templateVar
 				}
 			}
 		}
+	}
 
+	// Check if the request is for a BootstrapConfigTemplate or an InfrastructureMachineTemplate
+	// of one of the configured MachinePoolClasses.
+	if selector.MatchResources.MachinePoolClass != nil {
 		if req.HolderReference.Kind == "MachinePool" &&
 			(req.HolderReference.FieldPath == "spec.template.spec.bootstrap.configRef" ||
 				req.HolderReference.FieldPath == "spec.template.spec.infrastructureRef") {

diff --git a/internal/controllers/topology/cluster/patches/variables/variables.go b/internal/controllers/topology/cluster/patches/variables/variables.go
@@ -148,7 +148,7 @@ type MachineDeploymentBuiltins struct {
 	// Bootstrap is the value of the .spec.template.spec.bootstrap field of the MachineDeployment.
 	Bootstrap *MachineBootstrapBuiltins `json:"bootstrap,omitempty"`
 
-	// InfrastructureRef is the value of the .spec.template.spec.bootstrap field of the MachineDeployment.
+	// InfrastructureRef is the value of the .spec.template.spec.infrastructureRef field of the MachineDeployment.
 	InfrastructureRef *MachineInfrastructureRefBuiltins `json:"infrastructureRef,omitempty"`
 }
 
@@ -181,7 +181,7 @@ type MachinePoolBuiltins struct {
 	// Bootstrap is the value of the .spec.template.spec.bootstrap field of the MachinePool.
 	Bootstrap *MachineBootstrapBuiltins `json:"bootstrap,omitempty"`
 
-	// InfrastructureRef is the value of the .spec.template.spec.bootstrap field of the MachinePool.
+	// InfrastructureRef is the value of the .spec.template.spec.infrastructureRef field of the MachinePool.
 	InfrastructureRef *MachineInfrastructureRefBuiltins `json:"infrastructureRef,omitempty"`
 }