🌱 Add kubeadm cluster role (minimal backport of kubernetes-sigs#13664) - #25
Closed
thunderboltsid wants to merge 1 commit into
Closed
thunderboltsid wants to merge 1 commit into
thunderboltsid wants to merge 1 commit into
Conversation
Minimal backport of kubernetes-sigs#13664 to release-1.10. (cherry picked from commit 3b6c4b3) Conflicts resolved by keeping the kubelet/bootstrap-token RBAC reconciliation that release-1.10 still performs; upstream had already removed it in kubernetes-sigs#12303, which is not part of this branch.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Straight cherry-pick of kubernetes-sigs/cluster-api@3b6c4b3fd (the release-1.11 backport of kubernetes-sigs#13664) onto release-1.10.10:
AllowClusterAdminPermissionsbecomesEnsureKubeadmPermissions, which also creates thekubeadm:apiserver-kubelet-clientClusterRoleBinding for K8s < 1.38.Opened as an alternative to #24 for comparison. The difference is that the conflicts are resolved by keeping what release-1.10 still has:
ReconcileKubeletRBACRole,ReconcileKubeletRBACBindingandAllowBootstrapTokensToGetNodesstay wired intoupgradeControlPlaneandreconcile, and the existing tests inworkload_cluster_rbac_test.goare kept. Those calls only disappeared upstream in kubernetes-sigs#12303, a breaking change that is in release-1.11+ but not in this branch.Testing
go build ./...,gofmt -l, andgo test ./controlplane/kubeadm/internal/...(with envtest assets) pass locally, including the four pre-existing RBAC tests and the newTestEnsureKubeadmPermissions.