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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃悰 Fix cluster topology and UpdateCoreDNS test flakes #5815

Merged
merged 1 commit into from
Dec 8, 2021

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan B眉ringer buringerst@vmware.com

Co-authored-by: killianmuldoon kmuldoon@vmware.com
Co-authored-by: Yuvaraj Kakaraparthi kakaraparthy@vmware.com

What this PR does / why we need it:

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 #

Signed-off-by: Stefan B眉ringer buringerst@vmware.com

Co-authored-by: killianmuldoon <kmuldoon@vmware.com>
Co-authored-by: Yuvaraj Kakaraparthi <kakaraparthy@vmware.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 7, 2021
@@ -547,7 +547,7 @@ func setupTestEnvForIntegrationTests(ns *corev1.Namespace) (func() error, error)
cleanup := func() error {
// Delete Objects in reverse, because we cannot delete a ClusterCLass if it is still used by a Cluster.
for i := len(initObjs) - 1; i >= 0; i-- {
if err := env.Delete(ctx, initObjs[i]); err != nil {
if err := env.CleanupAndWait(ctx, initObjs[i]); err != nil {
Copy link
Member Author

@sbueringer sbueringer Dec 7, 2021

Choose a reason for hiding this comment

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

Sometimes the Cluster was not gone in the local cache and then the subsequent ClusterClass deletion failed (because the webhook blocked the ClusterClass deletion)

g.Expect(expectedKubeadmConfigMap.Data).To(HaveKeyWithValue("ClusterConfiguration", ContainSubstring(tt.kcp.Spec.KubeadmConfigSpec.ClusterConfiguration.DNS.ImageTag)))
g.Expect(expectedKubeadmConfigMap.Data).To(HaveKeyWithValue("ClusterConfiguration", ContainSubstring(tt.kcp.Spec.KubeadmConfigSpec.ClusterConfiguration.DNS.ImageRepository)))
return nil
}, "5s").Should(Succeed())
Copy link
Member Author

@sbueringer sbueringer Dec 7, 2021

Choose a reason for hiding this comment

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

Sometimes the local cache was stale, so the test still checked the old version of the ConfigMap

@sbueringer
Copy link
Member Author

/cc @killianmuldoon @ykakarap
Thx for debugging / fixing this together!

/assign @fabriziopandini

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

馃槃

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 7, 2021
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
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 Dec 8, 2021
@k8s-ci-robot k8s-ci-robot merged commit 9f88802 into kubernetes-sigs:main Dec 8, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.1 milestone Dec 8, 2021
@sbueringer sbueringer deleted the pr-fix-test-flakes branch December 8, 2021 19:36
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. 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.

None yet

4 participants