github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: document "kubeletconfiguration" as a patch target

Browse Source 
Document the "kubeletconfiguration" as a patch target in the
v1beta3 API Init/JoinConfiguration.Patches struct
and also for the --patches flag.
This commit is contained in:
Lubomir I. Ivanov 2022-06-06 18:07:07 +03:00
parent c3c9fb8608
commit 428c3fe954
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/apis/kubeadm/types.go
View File

@ -421,8 +421,8 @@ type HostPathMount struct {
type Patches struct { type Patches struct {
// Directory is a path to a directory that contains files named "target[suffix][+patchtype].extension". // 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 // 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 // "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd", "kubeletconfiguration".
// of "strategic" "merge" or "json" and they match the patch formats supported by kubectl. // "patchtype" can be one of "strategic" "merge" or "json" and they match the patch formats supported by kubectl.
// The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". // The default "patchtype" is "strategic". "extension" must be either "json" or "yaml".
// "suffix" is an optional string that can be used to determine which patches are applied // "suffix" is an optional string that can be used to determine which patches are applied
// first alpha-numerically. // first alpha-numerically.

4
cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go
View File

@ -435,8 +435,8 @@ type HostPathMount struct {
type Patches struct { type Patches struct {
// Directory is a path to a directory that contains files named "target[suffix][+patchtype].extension". // 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 // 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 // "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd", "kubeletconfiguration".
// of "strategic" "merge" or "json" and they match the patch formats supported by kubectl. // "patchtype" can be one of "strategic" "merge" or "json" and they match the patch formats supported by kubectl.
// The default "patchtype" is "strategic". "extension" must be either "json" or "yaml". // The default "patchtype" is "strategic". "extension" must be either "json" or "yaml".
// "suffix" is an optional string that can be used to determine which patches are applied // "suffix" is an optional string that can be used to determine which patches are applied
// first alpha-numerically. // first alpha-numerically.

2
cmd/kubeadm/app/cmd/options/generic.go
View File

@ -96,7 +96,7 @@ func AddPatchesFlag(fs *pflag.FlagSet, patchesDir *string) {
const usage = `Path to a directory that contains files named ` + const usage = `Path to a directory that contains files named ` +
`"target[suffix][+patchtype].extension". For example, ` + `"target[suffix][+patchtype].extension". For example, ` +
`"kube-apiserver0+merge.yaml" or just "etcd.json". ` + `"kube-apiserver0+merge.yaml" or just "etcd.json". ` +
`"target" can be one of "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd". ` + `"target" can be one of "kube-apiserver", "kube-controller-manager", "kube-scheduler", "etcd", "kubeletconfiguration". ` +
`"patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats ` + `"patchtype" can be one of "strategic", "merge" or "json" and they match the patch formats ` +
`supported by kubectl. The default "patchtype" is "strategic". "extension" must be either ` + `supported by kubectl. The default "patchtype" is "strategic". "extension" must be either ` +
`"json" or "yaml". "suffix" is an optional string that can be used to determine ` + `"json" or "yaml". "suffix" is an optional string that can be used to determine ` +