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

Merge pull request #120040 from chendave/unused_args

Browse Source 
kubeadm: Cleanup the unused input parameters
This commit is contained in:
Kubernetes Prow Robot 2023-08-18 05:38:30 -07:00 committed by GitHub
commit e2afa175e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/componentconfigs/kubelet.go
View File

@ -69,7 +69,7 @@ var kubeletHandler = handler{
fromCluster: kubeletConfigFromCluster, fromCluster: kubeletConfigFromCluster,
} }
func kubeletConfigFromCluster(h *handler, clientset clientset.Interface, clusterCfg *kubeadmapi.ClusterConfiguration) (kubeadmapi.ComponentConfig, error) { func kubeletConfigFromCluster(h *handler, clientset clientset.Interface, _ *kubeadmapi.ClusterConfiguration) (kubeadmapi.ComponentConfig, error) {
configMapName := constants.KubeletBaseConfigurationConfigMap configMapName := constants.KubeletBaseConfigurationConfigMap
klog.V(1).Infof("attempting to download the KubeletConfiguration from ConfigMap %q", configMapName) klog.V(1).Infof("attempting to download the KubeletConfiguration from ConfigMap %q", configMapName)
cm, err := h.fromConfigMap(clientset, configMapName, constants.KubeletBaseConfigurationConfigMapKey, true) cm, err := h.fromConfigMap(clientset, configMapName, constants.KubeletBaseConfigurationConfigMapKey, true)

6
cmd/kubeadm/app/phases/upgrade/health.go
View File

@ -82,10 +82,8 @@ func CheckClusterHealth(client clientset.Interface, cfg *kubeadmapi.ClusterConfi
f: controlPlaneNodesReady, f: controlPlaneNodesReady,
}, },
&healthCheck{ &healthCheck{
name: "StaticPodManifest", name: "StaticPodManifest",
client: client, f: staticPodManifestHealth,
cfg: cfg,
f: staticPodManifestHealth,
}, },
} }