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

add capi patch to enable kubeadm feature flags mutation #2958

Merged
merged 1 commit into from
Feb 28, 2024

Conversation

abhinavmpandey08
Copy link
Member

Description of changes:
Currently, kubeadm feature flags are immutable which cause issues when upgrading a cluster from 1.28 to 1.29 as we try to disable the EtcdLearnerMode feature flag. This gets blocked by webhooks because the feature flag itself is immutable.

This PR patches CAPI based on this upstream PR kubernetes-sigs/cluster-api#10154 to make this field mutable.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 28, 2024
@tatlat
Copy link
Member

tatlat commented Feb 28, 2024

/lgtm

@abhinavmpandey08
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavmpandey08

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

@eks-distro-bot eks-distro-bot merged commit 86cb2ba into aws:release-0.19 Feb 28, 2024
2 checks passed
@abhinavmpandey08
Copy link
Member Author

/cherry-pick main

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #2958 failed to apply on top of branch "main":

Applying: add capi patch to enable kubeadm feature flags mutation
.git/rebase-apply/patch:68: space before tab in indent.
 		},
.git/rebase-apply/patch:69: space before tab in indent.
 	}
.git/rebase-apply/patch:70: space before tab in indent.
 	g.Expect(env.Create(ctx, kubeadmCM)).To(Succeed())
.git/rebase-apply/patch:76: space before tab in indent.
 	return nil
.git/rebase-apply/patch:78: trailing whitespace.
 
warning: squelched 480 whitespace errors
warning: 485 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	projects/kubernetes-sigs/cluster-api/CHECKSUMS
Falling back to patching base and 3-way merge...
Auto-merging projects/kubernetes-sigs/cluster-api/CHECKSUMS
CONFLICT (content): Merge conflict in projects/kubernetes-sigs/cluster-api/CHECKSUMS
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 add capi patch to enable kubeadm feature flags mutation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick main

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.

@abhinavmpandey08
Copy link
Member Author

/cherry-pick main

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: new pull request created: #2966

In response to this:

/cherry-pick main

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants