chore: update Zentao and enhance Helm deployment configuration

- Update Zentao version constants to new releases - Add deployment version configuration for Helm in the Init function - Adjust Helm arguments based on deployment type Signed-off-by: ysicing <[email protected]>
easysoft · Jan 13, 2025 · 24e7906 · 24e7906
1 parent fd66c79
commit 24e7906
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/common/const.go b/common/const.go
@@ -64,10 +64,10 @@ const (
 const (
 	DefaultQuickonOSSVersion      = "3.0.2" // 开源版本
 	DefaultQuickonEEVersion       = "1.0"
-	DefaultZentaoDevOPSOSSVersion = "21.3"
-	DefaultZentaoDevOPSMaxVersion = "6.3"
-	DefaultZentaoDevOPSBizVersion = "11.3"
-	DefaultZentaoDevOPSIPDVersion = "3.3"
+	DefaultZentaoDevOPSOSSVersion = "21.4"
+	DefaultZentaoDevOPSMaxVersion = "6.4"
+	DefaultZentaoDevOPSBizVersion = "11.4"
+	DefaultZentaoDevOPSIPDVersion = "3.4"
 	K3sBinName                    = "k3s"
 	K3sBinPath                    = "/usr/local/bin/k3s"
 	HelmBinName                   = "helm"

diff --git a/pkg/quickon/quickon.go b/pkg/quickon/quickon.go
@@ -387,6 +387,12 @@ func (m *Meta) Init() error {
 		// helmargs = append(helmargs, "--set", deployVersion)
 		if helmchan != "stable" {
 			helmargs = append(helmargs, "--set", "image.repository=test/zentao")
+			deployVersion := fmt.Sprintf("deploy.versions.%s=%s%s.k8s", m.Type, m.Type, installVersion)
+			helmargs = append(helmargs, "--set", deployVersion)
+			if m.Type == common.ZenTaoOSSType.String() || m.Type == common.ZenTaoOldOSSType.String() {
+				deployVersion = fmt.Sprintf("deploy.versions.open=%s", installVersion)
+			}
+			helmargs = append(helmargs, "--set", deployVersion)
 		}
 	} else {
 		if len(installVersion) > 0 {