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

update client-go to 0.28 and update resource lease lock #315

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

galal-hussein
Copy link
Contributor

@galal-hussein galal-hussein commented Aug 15, 2023

Kubernetes has removed support for ConfigMapsLeasesResourceLock in v1.28 and moved to LeasesResourceLock kubernetes/kubernetes#117558

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Copy link
Contributor

@brandond brandond left a comment

Choose a reason for hiding this comment

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

🤞🏻

@brandond
Copy link
Contributor

FYI this is a blocker for K3s and RKE2 1.28

Copy link
Contributor

@KevinJoiner KevinJoiner left a comment

Choose a reason for hiding this comment

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

Nice ConfigMapsLeasesResourceLock was causing a bug in my dev environment.

@cwayne18
Copy link

@cbron this is something we need to get RKE2/K3s 1.28.0 out, should we be merging this into master or would you prefer we create a branch or use dev-2.8 for it?

@brandond
Copy link
Contributor

This should go into master, and anything that needs to remain on 1.27 and earlier can use a branch.

Unfortunately this repo now has two branching strategies - one that follows the tag structure for this repo, and another that follows rancher release versions. That should probably be addressed before any further branching occurs.

@rmweir
Copy link
Contributor

rmweir commented Aug 18, 2023

@brandond we're not using two branching strategies. You can disregard the release/v2.x branches. Branching strategy is described in the README:

Wrangler releases are not from the default branch. Instead they are from branches with the naming pattern release-MAJOR.MINOR. The default branch (i.e. master) is where changes initially go. This includes bug fixes and new features. Bug fixes are cherry-picked to release branches to be included in patch releases. When it's time to create a new minor or major release, a new release branch is created from the default branch.

@rmweir
Copy link
Contributor

rmweir commented Aug 18, 2023

Merging and this will go into 2.1

@rmweir rmweir merged commit 3604a6b into rancher:master Aug 18, 2023
2 checks passed
@brandond
Copy link
Contributor

@rmweir can we get rid of the old release/v2.x branches then? Both from here and from rancher/lasso?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants