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

NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api:v1.6.2 (da795db) into master #199

Merged
merged 110 commits into from Mar 12, 2024

Conversation

damdo
Copy link
Member

@damdo damdo commented Feb 22, 2024

No description provided.

mjlshen and others added 30 commits December 5, 2023 19:03
Signed-off-by: Michael Shen <mishen@umich.edu>
…ot/cherry-pick-9767-to-release-1.6

[release-1.6] 📖 add release 1.5 book link
…ot/cherry-pick-9801-to-release-1.6

[release-1.6] 📖 Update clusterctl version to v1.6.x in quick start
Replace env.Create and env.Cleanup with env.CreateAndWait and
env.CleanupAndWait, remove namespace from cleanup.
Signed-off-by: Anurag <contact.anurag7@gmail.com>
…ot/cherry-pick-9817-to-release-1.6

[release-1.6] 📖 Set 1.4 EOL date and update coredns version table
…ot/cherry-pick-9745-to-release-1.6

[release-1.6] 🐛 Fix TestReconcileMachinePoolScaleToFromZero flakes
…ot/cherry-pick-9819-to-release-1.6

[release-1.6] 🐛 test: wait for topology to get rolled out before continuing with scaling checks
…ot/cherry-pick-9829-to-release-1.6

[release-1.6] 🌱  Add proxmox to provider list
…ot/cherry-pick-9808-to-release-1.6

[release-1.6] 🐛 clusterctl: validate no objects exist from CRDs before deleting them
Signed-off-by: Stefan Büringer buringerst@vmware.com
…ot/cherry-pick-9840-to-release-1.6

[release-1.6] 🌱 Bump to Go 1.20.12
…ot/cherry-pick-9861-to-release-1.6

[release-1.6] 🐛 ipam: fix webhooks using mixed api versions
…ot/cherry-pick-9876-to-release-1.6

[release-1.6] 🌱 Update glossary.md: Fix typo in level of heading.
…ot/cherry-pick-9813-to-release-1.6

[release-1.6] 🐛 Improve log k/v pairs and a improve/drop a few log lines
Signed-off-by: Stefan Büringer buringerst@vmware.com
…ot/cherry-pick-9871-to-release-1.6

[release-1.6] ✨ KCP: Allow mutation of all fields that should be mutable
…ot/cherry-pick-9894-to-release-1.6

[release-1.6] 🐛 capd: fix ignition to also set the kube-proxy configuration to skip setting sysctls
✨ [release-1.6] v1.29: Prepare quickstart, capd and tests for the new release including kind bump
g-gaston and others added 2 commits February 19, 2024 22:38
This fixes a race condition in the machine controller when the
controller is restarted after a machine has been marked for deletion but
before the infra machine or bootstrap config are deleted. In that case,
the controller doesn't have watches on those external objects, so the
reconciliation is not triggered once they are deleted. This means that
Machines stay in Deleting state for the resync period, the default is 10
minutes.
…-machine-controller-release-1.6

[release-1.6] 🐛 Watch external objects for machine before deleting
Copy link

openshift-ci bot commented Feb 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2024
@damdo damdo changed the title Merge https://github.com/kubernetes-sigs/cluster-api:v1.6.2 (da795db) into master NO-JIRA: Merge https://github.com/kubernetes-sigs/cluster-api:v1.6.2 (da795db) into master Feb 22, 2024
@openshift-ci-robot
Copy link

@damdo: This pull request explicitly references no jira issue.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 22, 2024
@damdo
Copy link
Member Author

damdo commented Feb 22, 2024

/retest

1 similar comment
@damdo
Copy link
Member Author

damdo commented Feb 27, 2024

/retest

@damdo
Copy link
Member Author

damdo commented Mar 6, 2024

/hold
/retest

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 7, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 8, 2024
@damdo
Copy link
Member Author

damdo commented Mar 12, 2024

/retest

Copy link

openshift-ci bot commented Mar 12, 2024

@damdo: all tests passed!

Full PR test history. Your PR dashboard.

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.

@damdo
Copy link
Member Author

damdo commented Mar 12, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 12, 2024
@nrb
Copy link

nrb commented Mar 12, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit bb7f378 into openshift:master Mar 12, 2024
11 checks passed
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cluster-api-container-v4.16.0-202403122214.p0.gbb7f378.assembly.stream.el9 for distgit ose-cluster-api.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet