kubeadm: add support for patching a "kubeletconfiguration" target #110405
Conversation
This file contains 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
k8s-ci-robot
added
release-note
4 tasks
k8s-ci-robot
added
approved
k8s-ci-robot
added
priority/important-soon
|
/hold for review |
k8s-ci-robot
added
the
do-not-merge/hold
neolit123
force-pushed
the
1.25-kubelet-config-patches
branch
2 times, most recently
from
c3ea06c
to
0cba01d
Compare
k8s-ci-robot
added
size/L
With phases/kubelet/WriteConfigToDisk() about to support patches it is required that the function accepts an io.Writer where the PatchManager can output to and also a patch directory. Modify all call sites of the function WriteConfigToDisk() to properly prepare an pass an io.Writer and patches dir to it. This results in command phases for init/join/upgrade to pass the root io.Writer (usually stdout) and the patchesDir populated either via the config file or --patches flag.
In phases/kubelet/WriteConfigToDisk() create a patch manager for the root patches directory and apply the user patches with a target "kubeletconfiguration".
Document the "kubeletconfiguration" as a patch target in the v1beta3 API Init/JoinConfiguration.Patches struct and also for the --patches flag.
Allow passing the --patches flag to init/join/node phases relevant to the kubelet writing the config file on disk.
neolit123
force-pushed
the
1.25-kubelet-config-patches
branch
from
0cba01d
to
2134026
Compare
k8s-ci-robot
added
size/M
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123, SataQiu 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 |
k8s-ci-robot
added
the
lgtm
|
/lgtm |
k8s-ci-robot
removed
the
do-not-merge/hold
pacoxu
reviewed
Jun 7, 2022
| @@ -421,8 +421,8 @@ type HostPathMount struct { | |||
| type Patches struct { | |||
| // Directory is a path to a directory that contains files named "target[suffix][+patchtype].extension". | |||
| // For example, "kube-apiserver0+merge.yaml" or just "etcd.json". "target" can be one of | |||
| // "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd". "patchtype" can be one | |||
| // of "strategic" "merge" or "json" and they match the patch formats supported by kubectl. | |||
| // "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd", "kubeletconfiguration". | |||
There was a problem hiding this comment.
Is there a reason that we don't use kubelet-configuration?
There was a problem hiding this comment.
tried to keep the name consistent with the original "kind" KubeletConfiguration -> kubeletconfiguration.
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What type of PR is this?
/kind feature
What this PR does / why we need it:
Enhance the kubeadm "patches" functionality to be able to patch kubelet config files containing v1beta1.KubeletConfiguration before writing the kubelet config.yaml to disk during init/join/upgrade
Which issue(s) this PR fixes:
xref kubernetes/kubeadm#1682
Special notes for your reviewer:
Please review one commit at a time.
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: