Merge pull request #105888 from neolit123/1.23-remove-reset-update-clusterstatus

kubeadm: remove the reset/update-cluster-status phase
This commit is contained in:
Kubernetes Prow Robot 2021-10-29 09:13:03 -07:00 committed by GitHub
commit c9ddd248b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 58 deletions

View File

@ -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)
}

View File

@ -197,7 +197,6 @@ func newCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
// initialize the workflow runner with the list of phases // initialize the workflow runner with the list of phases
resetRunner.AppendPhase(phases.NewPreflightPhase()) resetRunner.AppendPhase(phases.NewPreflightPhase())
resetRunner.AppendPhase(phases.NewUpdateClusterStatus())
resetRunner.AppendPhase(phases.NewRemoveETCDMemberPhase()) resetRunner.AppendPhase(phases.NewRemoveETCDMemberPhase())
resetRunner.AppendPhase(phases.NewCleanupNodePhase()) resetRunner.AppendPhase(phases.NewCleanupNodePhase())