From b9171aee20a2e3bd60cdf8ed3f269577b443eb4c Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <lubomirivanov@vmware.com>
Date: Mon, 25 Oct 2021 22:47:15 +0300
Subject: [PATCH] kubeadm: remove the reset/update-cluster-status phase

The phase has been deprecated and a NO-OP since 1.22.
Remove the phase related code.
---
 .../cmd/phases/reset/updateclusterstatus.go   | 57 -------------------
 cmd/kubeadm/app/cmd/reset.go                  |  1 -
 2 files changed, 58 deletions(-)
 delete mode 100644 cmd/kubeadm/app/cmd/phases/reset/updateclusterstatus.go

diff --git a/cmd/kubeadm/app/cmd/phases/reset/updateclusterstatus.go b/cmd/kubeadm/app/cmd/phases/reset/updateclusterstatus.go
deleted file mode 100644
index a08d97baf0b..00000000000
--- a/cmd/kubeadm/app/cmd/phases/reset/updateclusterstatus.go
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package phases
-
-import (
-	"errors"
-	"fmt"
-	"os"
-
-	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow"
-	kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
-)
-
-// NewUpdateClusterStatus creates a kubeadm workflow phase for update-cluster-status
-func NewUpdateClusterStatus() workflow.Phase {
-	return workflow.Phase{
-		Name:  "update-cluster-status",
-		Short: "Remove this node from the ClusterStatus object (DEPRECATED).",
-		Run:   runUpdateClusterStatus,
-	}
-}
-
-func runUpdateClusterStatus(c workflow.RunData) error {
-	r, ok := c.(resetData)
-	if !ok {
-		return errors.New("update-cluster-status phase invoked with an invalid data struct")
-	}
-
-	cfg := r.Cfg()
-	if isControlPlane() && cfg != nil {
-		fmt.Println("The 'update-cluster-status' phase is deprecated and will be removed in a future release. " +
-			"Currently it performs no operation")
-	}
-	return nil
-}
-
-// isControlPlane checks if a node is a control-plane node by looking up
-// the kube-apiserver manifest file
-func isControlPlane() bool {
-	filepath := kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeAPIServer, kubeadmconstants.GetStaticPodDirectory())
-	_, err := os.Stat(filepath)
-	return !os.IsNotExist(err)
-}
diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go
index 865dd6abd8b..5d6221e2561 100644
--- a/cmd/kubeadm/app/cmd/reset.go
+++ b/cmd/kubeadm/app/cmd/reset.go
@@ -197,7 +197,6 @@ func newCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
 
 	// initialize the workflow runner with the list of phases
 	resetRunner.AppendPhase(phases.NewPreflightPhase())
-	resetRunner.AppendPhase(phases.NewUpdateClusterStatus())
 	resetRunner.AppendPhase(phases.NewRemoveETCDMemberPhase())
 	resetRunner.AppendPhase(phases.NewCleanupNodePhase())