diff --git a/cmd/kubeadm/app/util/apiclient/wait.go b/cmd/kubeadm/app/util/apiclient/wait.go index 3a75b8c6d1e..bb145336038 100644 --- a/cmd/kubeadm/app/util/apiclient/wait.go +++ b/cmd/kubeadm/app/util/apiclient/wait.go @@ -211,20 +211,6 @@ func (w *KubeWaiter) WaitForStaticPodHashChange(nodeName, component, previousHas }) } -// getStaticPodControlPlaneHashes computes hashes for all the control plane's Static Pod resources -func getStaticPodControlPlaneHashes(client clientset.Interface, nodeName string) (map[string]string, error) { - - mirrorPodHashes := map[string]string{} - for _, component := range constants.MasterComponents { - hash, err := getStaticPodSingleHash(client, nodeName, component) - if err != nil { - return nil, err - } - mirrorPodHashes[component] = hash - } - return mirrorPodHashes, nil -} - // getStaticSinglePodHash computes hashes for a single Static Pod resource func getStaticPodSingleHash(client clientset.Interface, nodeName string, component string) (string, error) { diff --git a/cmd/kubelet/app/options/globalflags.go b/cmd/kubelet/app/options/globalflags.go index d088245ef78..db85071ffad 100644 --- a/cmd/kubelet/app/options/globalflags.go +++ b/cmd/kubelet/app/options/globalflags.go @@ -78,12 +78,6 @@ func registerDeprecated(global *flag.FlagSet, local *pflag.FlagSet, globalName, local.Lookup(normalize(globalName)).Deprecated = deprecated } -// pflagRegisterDeprecated registers the flag with pflagRegister, and then marks it deprecated -func pflagRegisterDeprecated(global, local *pflag.FlagSet, globalName, deprecated string) { - pflagRegister(global, local, globalName) - local.Lookup(normalize(globalName)).Deprecated = deprecated -} - // addCredentialProviderFlags adds flags from k8s.io/kubernetes/pkg/credentialprovider func addCredentialProviderFlags(fs *pflag.FlagSet) { // lookup flags in global flag set and re-register the values with our flagset