diff --git a/common/const.go b/common/const.go index eea75b8a..c03ab29b 100644 --- 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 index 0aa28e16..e3c1f36d 100644 --- 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 {