From 230f1024107c98ec5bfa3badbcdb5f408eed2e5f Mon Sep 17 00:00:00 2001 From: 24sama Date: Tue, 28 Jun 2022 11:34:04 +0800 Subject: [PATCH] cleanup: do not need to exec init_os script when upgrading the k8s cluster Signed-off-by: 24sama --- pkg/pipelines/upgrade_cluster.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/pipelines/upgrade_cluster.go b/pkg/pipelines/upgrade_cluster.go index 996babdc..49f2047a 100644 --- a/pkg/pipelines/upgrade_cluster.go +++ b/pkg/pipelines/upgrade_cluster.go @@ -18,9 +18,11 @@ package pipelines import ( "fmt" + + "github.com/pkg/errors" + "github.com/kubesphere/kubekey/pkg/artifact" "github.com/kubesphere/kubekey/pkg/bootstrap/confirm" - "github.com/kubesphere/kubekey/pkg/bootstrap/os" "github.com/kubesphere/kubekey/pkg/bootstrap/precheck" "github.com/kubesphere/kubekey/pkg/certs" "github.com/kubesphere/kubekey/pkg/common" @@ -30,7 +32,6 @@ import ( "github.com/kubesphere/kubekey/pkg/kubernetes" "github.com/kubesphere/kubekey/pkg/kubesphere" "github.com/kubesphere/kubekey/pkg/loadbalancer" - "github.com/pkg/errors" ) func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error { @@ -42,7 +43,6 @@ func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error { &precheck.ClusterPreCheckModule{}, &confirm.UpgradeConfirmModule{Skip: runtime.Arg.SkipConfirmCheck}, &artifact.UnArchiveModule{Skip: noArtifact}, - &os.ConfigureOSModule{}, &kubernetes.SetUpgradePlanModule{Step: kubernetes.ToV121}, &kubernetes.ProgressiveUpgradeModule{Step: kubernetes.ToV121}, &loadbalancer.HaproxyModule{Skip: !runtime.Cluster.ControlPlaneEndpoint.IsInternalLBEnabled()},