From 9dddb92a12ccedf2a7156d9e0c9ff4b0ae8d448d Mon Sep 17 00:00:00 2001 From: 24sama Date: Mon, 7 Mar 2022 16:01:00 +0800 Subject: [PATCH] fix upgrade logic bug Signed-off-by: 24sama --- pkg/kubesphere/modules.go | 10 ++++++++++ pkg/pipelines/upgrade_cluster.go | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/kubesphere/modules.go b/pkg/kubesphere/modules.go index 724ac8a9..506ef5c8 100644 --- a/pkg/kubesphere/modules.go +++ b/pkg/kubesphere/modules.go @@ -190,6 +190,11 @@ func (c *CheckResultModule) Init() { type CleanClusterConfigurationModule struct { common.KubeModule + Skip bool +} + +func (c *CleanClusterConfigurationModule) IsSkip() bool { + return c.Skip } func (c *CleanClusterConfigurationModule) Init() { @@ -210,6 +215,11 @@ func (c *CleanClusterConfigurationModule) Init() { type ConvertModule struct { common.KubeModule + Skip bool +} + +func (c *ConvertModule) IsSkip() bool { + return c.Skip } func (c *ConvertModule) Init() { diff --git a/pkg/pipelines/upgrade_cluster.go b/pkg/pipelines/upgrade_cluster.go index 553aedb1..8698b0df 100644 --- a/pkg/pipelines/upgrade_cluster.go +++ b/pkg/pipelines/upgrade_cluster.go @@ -45,10 +45,10 @@ func NewUpgradeClusterPipeline(runtime *common.KubeRuntime) error { &kubernetes.SetUpgradePlanModule{Step: kubernetes.ToV121}, &kubernetes.ProgressiveUpgradeModule{Step: kubernetes.ToV121}, &loadbalancer.HaproxyModule{Skip: !runtime.Cluster.ControlPlaneEndpoint.IsInternalLBEnabled()}, - &kubesphere.CleanClusterConfigurationModule{}, - &kubesphere.ConvertModule{}, - &kubesphere.DeployModule{}, - &kubesphere.CheckResultModule{}, + &kubesphere.CleanClusterConfigurationModule{Skip: !runtime.Cluster.KubeSphere.Enabled}, + &kubesphere.ConvertModule{Skip: !runtime.Cluster.KubeSphere.Enabled}, + &kubesphere.DeployModule{Skip: !runtime.Cluster.KubeSphere.Enabled}, + &kubesphere.CheckResultModule{Skip: !runtime.Cluster.KubeSphere.Enabled}, &kubernetes.SetUpgradePlanModule{Step: kubernetes.ToV122}, &kubernetes.ProgressiveUpgradeModule{Step: kubernetes.ToV122}, &filesystem.ChownModule{},