Skip to content

Set default clusterID labels only on machine #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Aug 3, 2020
Merged

Set default clusterID labels only on machine #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba3f450
Set default clusterID labels only on machine
enxebre Jul 27, 2020
137c0e3
Update comment for defaultMachineSet
enxebre Aug 3, 2020
6c2f1dc
Return early if webhookOperations fail in defaultMachineSet
enxebre Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/apis/machine/v1beta1/machine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ func (h *machineDefaulterHandler) Handle(ctx context.Context, req admission.Requ

klog.V(3).Infof("Mutate webhook called for Machine: %s", m.GetName())

// Enforce that the same clusterID is set for machineSet Selector and machine labels.
// Only enforce the clusterID if it's not set.
// Otherwise a discrepancy on the value would leave the machine orphan
// and would trigger a new machine creation by the machineSet.
// https://bugzilla.redhat.com/show_bug.cgi?id=1857175
Expand Down
30 changes: 3 additions & 27 deletions pkg/apis/machine/v1beta1/machineset_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,37 +117,13 @@ func (h *machineSetValidatorHandler) validateMachineSet(ms *MachineSet) (bool, u
}

func (h *machineSetDefaulterHandler) defaultMachineSet(ms *MachineSet) (bool, utilerrors.Aggregate) {
var errs []error

// Create a Machine from the MachineSet and default the Machine template
m := &Machine{Spec: ms.Spec.Template.Spec}
if ok, err := h.webhookOperations(m, h.clusterID); !ok {
errs = append(errs, err.Errors()...)
} else {
// Enforce that the same clusterID is set for machineSet Selector and machine labels.
// Otherwise a discrepancy on the value would leave the machine orphan
// and would trigger a new machine creation by the machineSet.
// https://bugzilla.redhat.com/show_bug.cgi?id=1857175
if ms.Spec.Selector.MatchLabels == nil {
ms.Spec.Selector.MatchLabels = make(map[string]string)
}
if _, ok := ms.Spec.Selector.MatchLabels[MachineClusterIDLabel]; !ok {
ms.Spec.Selector.MatchLabels[MachineClusterIDLabel] = h.clusterID
}

if ms.Spec.Template.Labels == nil {
ms.Spec.Template.Labels = make(map[string]string)
}
if _, ok := ms.Spec.Template.Labels[MachineClusterIDLabel]; !ok {
ms.Spec.Template.Labels[MachineClusterIDLabel] = h.clusterID
}

// Restore the defaulted template
ms.Spec.Template.Spec = m.Spec
return false, utilerrors.NewAggregate(err.Errors())
}

if len(errs) > 0 {
return false, utilerrors.NewAggregate(errs)
}
// Restore the defaulted template
ms.Spec.Template.Spec = m.Spec
return true, nil
}
25 changes: 3 additions & 22 deletions pkg/apis/machine/v1beta1/machineset_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ func TestMachineSetCreation(t *testing.T) {
name string
platformType osconfigv1.PlatformType
clusterID string
presetClusterID bool
expectedError string
providerSpecValue *runtime.RawExtension
}{
Expand Down Expand Up @@ -174,10 +173,9 @@ func TestMachineSetCreation(t *testing.T) {
expectedError: "[providerSpec.template: Required value: template must be provided, providerSpec.workspace: Required value: workspace must be provided, providerSpec.network.devices: Required value: at least 1 network device must be provided]",
},
{
name: "with vSphere and the template, workspace and network devices set",
platformType: osconfigv1.VSpherePlatformType,
clusterID: "vsphere-cluster",
presetClusterID: true,
name: "with vSphere and the template, workspace and network devices set",
platformType: osconfigv1.VSpherePlatformType,
clusterID: "vsphere-cluster",
providerSpecValue: &runtime.RawExtension{
Object: &vsphere.VSphereMachineProviderSpec{
Template: "template",
Expand Down Expand Up @@ -259,15 +257,6 @@ func TestMachineSetCreation(t *testing.T) {
},
}

presetClusterID := "anything"
if tc.presetClusterID {
ms.Spec.Selector.MatchLabels = make(map[string]string)
ms.Spec.Selector.MatchLabels[MachineClusterIDLabel] = presetClusterID

ms.Spec.Template.Labels = make(map[string]string)
ms.Spec.Template.Labels[MachineClusterIDLabel] = presetClusterID
}

err = c.Create(ctx, ms)
if err == nil {
defer func() {
Expand All @@ -279,14 +268,6 @@ func TestMachineSetCreation(t *testing.T) {
gs.Expect(err).ToNot(BeNil())
gs.Expect(apierrors.ReasonForError(err)).To(BeEquivalentTo(tc.expectedError))
} else {
if tc.presetClusterID {
gs.Expect(ms.Spec.Selector.MatchLabels[MachineClusterIDLabel]).To(BeIdenticalTo(presetClusterID))
gs.Expect(ms.Spec.Template.Labels[MachineClusterIDLabel]).To(BeIdenticalTo(presetClusterID))

} else {
gs.Expect(ms.Spec.Selector.MatchLabels[MachineClusterIDLabel]).To(BeIdenticalTo(tc.clusterID))
gs.Expect(ms.Spec.Template.Labels[MachineClusterIDLabel]).To(BeIdenticalTo(tc.clusterID))
}
Comment on lines -282 to -289
Copy link
Copy Markdown

@Danil-Grigorev Danil-Grigorev Jul 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it needs to test the opposite is true - the ClusterID label didn't change.

gs.Expect(err).To(BeNil())
}
})
Expand Down