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

[release-1.5] ✨ Re-introduce the keep alive flag #2194

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[release-1.5] ✨ Re-introduce the keep alive flag #2194

merged 1 commit into from
Aug 9, 2023

Conversation

zhanggbj
Copy link
Contributor

@zhanggbj zhanggbj commented Aug 9, 2023 •
edited
Loading

What this PR does / why we need it:
Manual cherry-pick to resolve conflicts

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

@srm09 @zhanggbj
[Release-1.5] Re-introduce the keep alive flag
8e9714a 
Thie patch re-introduces the keep alive flag on the CAPV manager. The
flag is by enabled default so there are no breaking changes after
upgrades.
@k8s-ci-robot k8s-ci-robot added this to the v1.5 milestone Aug 9, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 9, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 9, 2023
@k8s-ci-robot
Copy link
Contributor

@zhanggbj: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-vsphere-apidiff-release-1-5 8e9714a link false /test pull-cluster-api-provider-vsphere-apidiff-release-1-5

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

sbueringer
sbueringer reviewed Aug 9, 2023
View reviewed changes
pkg/constants/constants.go
// DefaultEnableKeepAlive is false by default.
DefaultEnableKeepAlive = false
// DefaultEnableKeepAlive is true by default.
DefaultEnableKeepAlive = true
Copy link
Member

Choose a reason for hiding this comment

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

Just for other reviewers. Please note this is not a change in behavior as the default value / flag was effectively not used anymore

@sbueringer
Copy link
Member

/lgtm

/assign @chrischdi

/hold
Let's just ensure we merge the v1.6 cherry-pick first (usually I would be fine with doing this somewhat in parallel, but the way that CI is going at the moment I want to ensure that they are merged in the right order)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 9, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ff2c67e6b61713f53021ca219f1d0785dbbcfa51

@sbueringer
Copy link
Member

/retitle [release-1.5] ✨ Re-introduce the keep alive flag

@k8s-ci-robot k8s-ci-robot changed the title ✨ [Release-1.5] Re-introduce the keep alive flag [release-1.5] ✨ Re-introduce the keep alive flag Aug 9, 2023
@chrischdi
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Aug 9, 2023
@sbueringer
Copy link
Member

/hold cancel
1.6 PR is merged

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 9, 2023
@k8s-ci-robot k8s-ci-robot merged commit 74c5b10 into kubernetes-sigs:release-1.5 Aug 9, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@vrabbi vrabbi Awaiting requested review from vrabbi

@yastij yastij Awaiting requested review from yastij

Assignees

@chrischdi chrischdi

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
5 participants
@zhanggbj @k8s-ci-robot @sbueringer @chrischdi @srm09