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.

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

Jump to bottom

🌱 test: remove kube-vip cleanup #2583

Merged
merged 1 commit into from
Jan 2, 2024
Merged

🌱 test: remove kube-vip cleanup #2583

merged 1 commit into from
Jan 2, 2024

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Dec 29, 2023 •
edited
Loading

What this PR does / why we need it:

Removes the kube-vip-cleanup.sh script from templates.

The cleanup caused an additional recreation of the kube-vip pod and by that as side-effect, some tests to fail.

An alternative approach may be not doing an in-place sed, but creating a new file instead.

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 #2584

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 29, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 29, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 29, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5ba0691) 64.42% compared to head (98be02e) 64.69%.
Report is 5 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2583      +/-   ##
==========================================
+ Coverage   64.42%   64.69%   +0.26%     
==========================================
  Files         118      118              
  Lines        8585     8585              
==========================================
+ Hits         5531     5554      +23     
+ Misses       2623     2606      -17     
+ Partials      431      425       -6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 29, 2023
@chrischdi chrischdi force-pushed the pr-wait-for-kubevip-finish branch 2 times, most recently from 929275e to 47201f2 Compare December 29, 2023 10:14
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 29, 2023
@chrischdi chrischdi force-pushed the pr-wait-for-kubevip-finish branch from 47201f2 to 6f0ee83 Compare December 29, 2023 10:19
@chrischdi
Copy link
Member Author

/retest

@chrischdi chrischdi force-pushed the pr-wait-for-kubevip-finish branch from 6f0ee83 to b789269 Compare December 29, 2023 10:39
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-conformance-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/assign sbueringer

@chrischdi chrischdi changed the title 🌱 [WIP] test: introduce function to wait for kube-vip to finish 🌱 test: introduce function to wait for kube-vip to finish Dec 29, 2023
@chrischdi chrischdi changed the title 🌱 test: introduce function to wait for kube-vip to finish 🌱 test: remove kube-vip cleanup Dec 29, 2023
zhanggbj
zhanggbj approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@zhanggbj zhanggbj left a comment

Choose a reason for hiding this comment

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

Jut a nit.
/lgtm

packaging/flavorgen/flavors/kubevip/topology.go
// Op: "add",
// Path: "/spec/template/spec/kubeadmConfigSpec/postKubeadmCommands/-",
// ValueFrom: &clusterv1.JSONPatchValue{Template: ptr.To("/etc/kube-vip-cleanup.sh")},
// },
)
Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @chrischdi ,

Are the commented code left intentionally? Otherwise, I think we could remove them :-)

Copy link
Member

Choose a reason for hiding this comment

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

Good catch. I agree => deleted

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

LGTM label has been added.

Git tree hash: 2f602d1724e598b75b80ebd3427a51529b9df7f5

@chrischdi @sbueringer
test: remove kube-vip cleanup
98be02e 
kube-vip cleanup causes kube-vip to restart and a short unavailability for the kube-apiserver.

Conformance e2e tests did try to find the old kube-vip pod in running state which never happened
because it gets recreated and restarted.
@sbueringer sbueringer force-pushed the pr-wait-for-kubevip-finish branch from b789269 to 98be02e Compare January 2, 2024 13:07
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 2, 2024
@sbueringer
Copy link
Member

/lgtm
/approve

@chrischdi Pleas take a quick look once you're back. But I'll merge now to get CI back to green / unblock other stuff

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

LGTM label has been added.

Git tree hash: e236dab52a54f2a5c6da8f06f01b64be28c96e29

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Jan 2, 2024
@k8s-ci-robot k8s-ci-robot merged commit df86ac8 into kubernetes-sigs:main Jan 2, 2024
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Jan 2, 2024
@chrischdi
Copy link
Member Author

/lgtm /approve

@chrischdi Pleas take a quick look once you're back. But I'll merge now to get CI back to green / unblock other stuff

Thanks for finishing this! 👍

@chrischdi chrischdi mentioned this pull request Jan 8, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srm09 srm09 Awaiting requested review from srm09

@sbueringer sbueringer Awaiting requested review from sbueringer

@zhanggbj zhanggbj Awaiting requested review from zhanggbj

Assignees

@zhanggbj zhanggbj

@sbueringer sbueringer

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.9
Development

Successfully merging this pull request may close these issues.

v1.29 based tests are flaky, e.g. conformance
4 participants
@chrischdi @k8s-ci-robot @sbueringer @zhanggbj