diff --git a/common/const.go b/common/const.go index 86e80701..52dfe659 100644 --- a/common/const.go +++ b/common/const.go @@ -64,10 +64,10 @@ const ( const ( DefaultQuickonOSSVersion = "3.0.2" // 开源版本 DefaultQuickonEEVersion = "1.0" - DefaultZentaoDevOPSOSSVersion = "20.3.0" - DefaultZentaoDevOPSMaxVersion = "5.2.0" - DefaultZentaoDevOPSBizVersion = "10.2.0" - DefaultZentaoDevOPSIPDVersion = "2.2.0" + DefaultZentaoDevOPSOSSVersion = "20.4.0" + DefaultZentaoDevOPSMaxVersion = "5.3.0" + DefaultZentaoDevOPSBizVersion = "10.3.0" + DefaultZentaoDevOPSIPDVersion = "2.3.0" K3sBinName = "k3s" K3sBinPath = "/usr/local/bin/k3s" HelmBinName = "helm" diff --git a/pkg/quickon/quickon.go b/pkg/quickon/quickon.go index 3ec6739b..b31d2b68 100644 --- a/pkg/quickon/quickon.go +++ b/pkg/quickon/quickon.go @@ -364,6 +364,9 @@ func (m *Meta) Init() error { // 指定类型 helmargs = append(helmargs, "--set", fmt.Sprintf("deploy.product=%s", m.Type)) // 指定版本 + if strings.HasSuffix(installVersion, ".0") { + installVersion = strings.TrimSuffix(installVersion, ".0") + } deployVersion := fmt.Sprintf("deploy.versions.%s=%s%s.k8s", m.Type, m.Type, installVersion) if m.Type == common.ZenTaoOSSType.String() { deployVersion = fmt.Sprintf("deploy.versions.%s=%s", m.Type, installVersion)