Merge pull request #2330 from newrelic-forks/ms-default-labels

✨set default for machineset labels

Author: k8s-ci-robot

api/v1alpha3/machineset_types.go

@@ -17,8 +17,6 @@ limitations under the License.
 package v1alpha3
 
 import (
-	"log"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
 	"k8s.io/apimachinery/pkg/labels"
@@ -184,26 +182,6 @@ func (m *MachineSet) Validate() field.ErrorList {
 	return errors
 }
 
-// DefaultingFunction sets default MachineSet field values.
-func (m *MachineSet) Default() {
-	log.Printf("Defaulting fields for MachineSet %s\n", m.Name)
-
-	if m.Spec.Replicas == nil {
-		m.Spec.Replicas = new(int32)
-		*m.Spec.Replicas = 1
-	}
-
-	if len(m.Namespace) == 0 {
-		m.Namespace = metav1.NamespaceDefault
-	}
-
-	if m.Spec.DeletePolicy == "" {
-		randomPolicy := string(RandomMachineSetDeletePolicy)
-		log.Printf("Defaulting to %s\n", randomPolicy)
-		m.Spec.DeletePolicy = randomPolicy
-	}
-}
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion

api/v1alpha3/machineset_webhook.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
@@ -35,9 +36,36 @@ func (m *MachineSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 }
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-cluster-x-k8s-io-v1alpha3-machineset,mutating=false,failurePolicy=fail,groups=cluster.x-k8s.io,resources=machinesets,versions=v1alpha3,name=validation.machineset.cluster.x-k8s.io
+// +kubebuilder:webhook:verbs=create;update,path=/mutate-cluster-x-k8s-io-v1alpha3-machineset,mutating=true,failurePolicy=fail,groups=cluster.x-k8s.io,resources=machinesets,versions=v1alpha3,name=default.machineset.cluster.x-k8s.io
 
+var _ webhook.Defaulter = &MachineSet{}
 var _ webhook.Validator = &MachineSet{}
 
+// DefaultingFunction sets default MachineSet field values.
+func (m *MachineSet) Default() {
+	if m.Spec.Replicas == nil {
+		m.Spec.Replicas = pointer.Int32Ptr(1)
+	}
+
+	if m.Spec.DeletePolicy == "" {
+		randomPolicy := string(RandomMachineSetDeletePolicy)
+		m.Spec.DeletePolicy = randomPolicy
+	}
+
+	if m.Spec.Selector.MatchLabels == nil {
+		m.Spec.Selector.MatchLabels = make(map[string]string)
+	}
+
+	if m.Spec.Template.Labels == nil {
+		m.Spec.Template.Labels = make(map[string]string)
+	}
+
+	if len(m.Spec.Selector.MatchLabels) == 0 && len(m.Spec.Selector.MatchExpressions) == 0 {
+		m.Spec.Selector.MatchLabels[MachineSetLabelName] = m.Name
+		m.Spec.Template.Labels[MachineSetLabelName] = m.Name
+	}
+}
+
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (m *MachineSet) ValidateCreate() error {
 	return m.validate()

api/v1alpha3/machineset_webhook_test.go

@@ -21,8 +21,25 @@ import (
 
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 )
 
+func TestMachineSetDefault(t *testing.T) {
+	g := NewWithT(t)
+	md := &MachineSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-ms",
+		},
+	}
+
+	md.Default()
+
+	g.Expect(md.Spec.Replicas).To(Equal(pointer.Int32Ptr(1)))
+	g.Expect(md.Spec.DeletePolicy).To(Equal(string(RandomMachineSetDeletePolicy)))
+	g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineSetLabelName, "test-ms"))
+	g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(MachineSetLabelName, "test-ms"))
+}
+
 func TestMachineSetLabelSelectorMatchValidation(t *testing.T) {
 	tests := []struct {
 		name      string

config/webhook/manifests.yaml

@@ -96,6 +96,24 @@ webhooks:
     - UPDATE
     resources:
     - machinepools
+- clientConfig:
+    caBundle: Cg==
+    service:
+      name: webhook-service
+      namespace: system
+      path: /mutate-cluster-x-k8s-io-v1alpha3-machineset
+  failurePolicy: Fail
+  name: default.machineset.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - cluster.x-k8s.io
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - machinesets
 
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1

controllers/machinedeployment_controller_test.go

@@ -193,7 +193,6 @@ var _ = Describe("MachineDeployment Reconciler", func() {
 		By("Verify machines have expected MachineSetLabelName and MachineDeploymentLabelName")
 		for _, m := range machines.Items {
 			Expect(m.Labels[clusterv1.ClusterLabelName]).To(Equal(testCluster.Name))
-			Expect(m.Labels[clusterv1.MachineSetLabelName]).To(Equal(machineSets.Items[0].Name))
 		}
 
 		firstMachineSet := machineSets.Items[0]

controllers/machineset_controller_test.go

@@ -195,11 +195,6 @@ var _ = Describe("MachineSet Reconciler", func() {
 			return len(machines.Items)
 		}, timeout).Should(BeEquivalentTo(replicas))
 
-		// Verify that machines has MachineSetLabelName label
-		for _, m := range machines.Items {
-			Expect(m.Labels[clusterv1.MachineSetLabelName]).To(Equal(instance.Name))
-		}
-
 		// Set the infrastructure reference as ready.
 		for _, m := range machines.Items {
 			fakeInfrastructureRefReady(m.Spec.InfrastructureRef, infraResource)