Merge pull request #1358 from 24sama/patch-1

cleanup: do not need to exec init_os script when upgrading the k8s cluster
kubesphere · Jun 30, 2022 · 3f65bca · 3f65bca
2 parents edc1aa4 + 230f102
commit 3f65bca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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()},