github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: Fix typo where API group is not correct

Browse Source 
Signed-off-by: Dave Chen <dave.chen@arm.com>
This commit is contained in:
Dave Chen 2023-08-18 17:24:32 +08:00
parent f563910656
commit f407b31d42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/upgrade/common.go
View File

@ -61,7 +61,7 @@ func isKubeadmConfigPresent(docmap kubeadmapi.DocumentMap) bool {
// loadConfig loads configuration from a file and/or the cluster. InitConfiguration, ClusterConfiguration and (optionally) component configs
// are loaded. This function allows the component configs to be loaded from a file that contains only them. If the file contains any kubeadm types
// in it (API group "kubeadm.kubernetes.io" present), then the supplied file is treaded as a legacy reconfiguration style "--config" use and the
// in it (API group "kubeadm.k8s.io" present), then the supplied file is treaded as a legacy reconfiguration style "--config" use and the
// returned bool value is set to true (the only case to be done so).
func loadConfig(cfgPath string, client clientset.Interface, skipComponentConfigs bool, printer output.Printer) (*kubeadmapi.InitConfiguration, bool, error) {
// Used for info logs here
@ -86,7 +86,7 @@ func loadConfig(cfgPath string, client clientset.Interface, skipComponentConfigs
return nil, false, err
}
// If there are kubeadm types (API group kubeadm.kubernetes.io) present, we need to keep the existing behavior
// If there are kubeadm types (API group kubeadm.k8s.io) present, we need to keep the existing behavior
// here. Basically, we have to load all of the configs from the file and none from the cluster. Configs that are
// missing from the file will be automatically regenerated by kubeadm even if they are present in the cluster.
// The resulting configs overwrite the existing cluster ones at the end of a successful upgrade apply operation.