Skip to content

Add webhook test for machineSet/machine clusterID label machine.openshift.io/cluster-api-cluster #175

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

Closed
enxebre wants to merge 1 commit into from
Closed

Add webhook test for machineSet/machine clusterID label machine.openshift.io/cluster-api-cluster #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 53 additions & 0 deletions pkg/infra/webhooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/utils/pointer"
aws "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"
azure "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -161,6 +162,58 @@ var _ = Describe("[Feature:Machines] Webhooks", func() {
}

})

// https://bugzilla.redhat.com/show_bug.cgi?id=1857175
It("should enforce the machineSet selector and the machine template label machine.openshift.io/cluster-api-cluster to be the real clusterID when creating a machineSet", func() {
ms := &mapiv1.MachineSet{
TypeMeta: metav1.TypeMeta{
Kind: "MachineSet",
APIVersion: "machine.openshift.io/v1beta1",
},
ObjectMeta: metav1.ObjectMeta{
GenerateName: machineSetParams.Name,
Namespace: framework.MachineAPINamespace,
Labels: machineSetParams.Labels,
},
Spec: mapiv1.MachineSetSpec{
Selector: metav1.LabelSelector{
MatchLabels: map[string]string{
"e2e.openshift.io": machineSetParams.Labels["e2e.openshift.io"],
framework.ClusterKey: "foo",
},
},
Template: mapiv1.MachineTemplateSpec{
ObjectMeta: mapiv1.ObjectMeta{
Labels: map[string]string{
"e2e.openshift.io": machineSetParams.Labels["e2e.openshift.io"],
framework.ClusterKey: "bar",
},
},
Spec: mapiv1.MachineSpec{
ObjectMeta: mapiv1.ObjectMeta{
Labels: machineSetParams.Labels,
},
ProviderSpec: *machineSetParams.ProviderSpec,
},
},
Replicas: pointer.Int32Ptr(machineSetParams.Replicas),
},
}

err := client.Create(context.Background(), ms)
Expect(err).ToNot(HaveOccurred())

ms, err = framework.GetMachineSet(client, ms.Name)
Expect(err).ToNot(HaveOccurred())

clusterInfra, err := framework.GetInfrastructure(client)
Expect(err).NotTo(HaveOccurred())

Expect(ms.Spec.Selector.MatchLabels[framework.ClusterKey]).To(BeIdenticalTo(clusterInfra.Status.InfrastructureName))
Expect(ms.Spec.Template.Labels[framework.ClusterKey]).To(BeIdenticalTo(clusterInfra.Status.InfrastructureName))

framework.WaitForMachineSet(client, ms.Name)
})
})

func createMinimalProviderSpec(platform configv1.PlatformType, ps *mapiv1.ProviderSpec) (*mapiv1.ProviderSpec, error) {
Expand Down