fix(upgrade): fix upgrade

fix upgrade

Signed-off-by: ysicing <[email protected]>

Author: ysicing

common/const.go

@@ -64,10 +64,10 @@ const (
 const (
 	DefaultQuickonOSSVersion      = "3.0.2" // 开源版本
 	DefaultQuickonEEVersion       = "1.0"
-	DefaultZentaoDevOPSOSSVersion = "18.7"
-	DefaultZentaoDevOPSMaxVersion = "4.7"
-	DefaultZentaoDevOPSBizVersion = "8.7"
-	DefaultZentaoDevOPSIPDVersion = "1.0.2"
+	DefaultZentaoDevOPSOSSVersion = "18.8"
+	DefaultZentaoDevOPSMaxVersion = "4.8"
+	DefaultZentaoDevOPSBizVersion = "8.8"
+	DefaultZentaoDevOPSIPDVersion = "1.1"
 	K3sBinName                    = "k3s"
 	K3sBinPath                    = "/usr/local/bin/k3s"
 	HelmBinName                   = "helm"

hack/manifests/scripts/init.sh

@@ -14,7 +14,7 @@ if type apt >/dev/null 2>&1; then
 	export DEBIAN_FRONTEND=noninteractive
 	apt update -qq
 	apt remove -y -qq ufw lxd lxd-client lxcfs lxc-common
-	apt install --no-install-recommends --no-install-suggests -y -qq nfs-common iptables conntrack jq socat bash-completion open-iscsi rsync ipset ipvsadm htop net-tools wget psmisc git curl nload ebtables ethtool
+	apt install --no-install-recommends --no-install-suggests -y -qq nfs-common iptables conntrack jq socat bash-completion open-iscsi rsync ipset ipvsadm htop net-tools wget psmisc git curl nload ebtables ethtool procps
   systemctl enable --now iscsid
   # ufw disable
   # ufw allow 6443/tcp #apiserver

pkg/qucheng/upgrade/upgrade.go

@@ -109,8 +109,10 @@ func Upgrade(flagVersion string, log log.Logger) error {
 				deploy := defaultValue["deploy"]
 				product := deploy.(map[string]interface{})["product"]
 				versions := deploy.(map[string]interface{})["versions"]
-				appVersion := versions.(map[string]interface{})[product.(string)]
-				log.Infof("devops mode, product: %v, version: %v", product, appVersion)
+				appoldVersion := versions.(map[string]interface{})[product.(string)]
+				appnewVersion := fmt.Sprintf("%s%s.k8s", product, common.GetVersion(true, product.(string), ""))
+				log.Infof("devops mode, product: %v, oldversion: %v, newversion: %v", product, appoldVersion, appnewVersion)
+				defaultValue["deploy"].(map[string]interface{})["versions"].(map[string]interface{})[product.(string)] = appnewVersion
 			}
 			if _, err := helmClient.Upgrade(cv.Name, common.DefaultHelmRepoName, cv.Name, "", defaultValue); err != nil {
 				log.Warnf("upgrade %s failed, reason: %v", cv.Name, err)