Skip to content
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.

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

🐛 Fix metadata assert failure in clusterclass rollout test #10840

Merged

Conversation

zhanggbj
Copy link
Contributor

@zhanggbj zhanggbj commented Jul 8, 2024

What this PR does / why we need it:
Add union() to convert a potential nil map to an empty map, otherwise the test will faile due to compare a nil map and an empty one.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #10839

/area testing

@k8s-ci-robot k8s-ci-robot added area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 8, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 8, 2024
Add union() to convert a potential nil map to an empty map, otherwise the test
will faile due to compare a nil map and an empty one.
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ad1b18411a967488c77f5ab59e70edb0873b49b1

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 2d45e62 into kubernetes-sigs:main Jul 8, 2024
25 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Jul 8, 2024
@@ -407,7 +407,7 @@ func assertControlPlane(g Gomega, clusterClassObjects clusterClassObjects, clust
ccControlPlaneTemplateMachineTemplateMetadata.Labels,
),
))
g.Expect(controlPlaneMachineTemplateMetadata.Annotations).To(BeEquivalentTo(
g.Expect(union(controlPlaneMachineTemplateMetadata.Annotations)).To(BeEquivalentTo(
Copy link
Member

Choose a reason for hiding this comment

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

What is the pattern behind adding this to in some places but not in others?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey @sbueringer , I only added union() for the cases which are more possible to compare a nil and empty map, when only have union() in one of Expect or BeEquivalentTo as below

		g.Expect(machineDeployment.Spec.Template.Annotations).To(BeEquivalentTo(
			union(
				mdTopology.Metadata.Annotations,
				mdClass.Template.Metadata.Annotations,
			),
		))

I think other cases are less likely to run into this situation, such as

		g.Expect(infrastructureMachineTemplate.GetAnnotations()).To(BeEquivalentTo(
			union(
				map[string]string{
					clusterv1.TemplateClonedFromGroupKindAnnotation: groupKind(mdClass.Template.Infrastructure.Ref),
					clusterv1.TemplateClonedFromNameAnnotation:      mdClass.Template.Infrastructure.Ref.Name,
				},
				ccInfrastructureMachineTemplate.GetAnnotations(),   ===> We defined expected annotations, and  if infrastructureMachineTemplate.GetAnnotations() are nil or empty, that's a failure we should catch.
			),
		))
		// MachineDeployment InfrastructureMachineTemplate.spec.template.metadata
		g.Expect(infrastructureMachineTemplateTemplateMetadata.Labels).To(BeEquivalentTo(
			ccInfrastructureMachineTemplateTemplateMetadata.Labels,  ===> Usually they either have labels defined or are nil
		))

Copy link
Member

@sbueringer sbueringer Jul 9, 2024

Choose a reason for hiding this comment

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

Hm. I think the following might be a better option.

func expectMapsToBeEquivalent(g Gomega, m1, m2 map[string]string) {
	if m1 == nil {
		m1 = map[string]string{}
	}
	if m2 == nil {
		m2 = map[string]string{}
	}
	g.ExpectWithOffset(1, m1).To(BeEquivalentTo(m2))
}

This would then be used like this (everywhere)

expectMapsToBeEquivalent(g, clusterObjects.InfrastructureCluster.GetLabels(),
		union(
			map[string]string{
				clusterv1.ClusterNameLabel:          cluster.Name,
				clusterv1.ClusterTopologyOwnedLabel: "",
			},
			ccInfrastructureClusterTemplateTemplateMetadata.Labels,
		),
	)

(It's not important/urgent, I can also take it over if you want, up to you)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Look great, feel free to take it over :-)

Copy link
Member

Choose a reason for hiding this comment

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

Opened a PR: #10851

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ClusterClassRolloutSpec Fail with metadata assertion
4 participants