Skip to content

Commit 5ff1633

Browse files
committed
chore: refactor deployment logic for Zentao DevOPS components
- Update version constants for Zentao DevOPS components - Comment out sections of code related to deploying custom tools - Comment out sections of code for uninstalling custom tools - Maintain structure for deploying and uninstalling the CNE operator Signed-off-by: ysicing <i@ysicing.me>
1 parent 4eb87b6 commit 5ff1633

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

common/const.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ const (
4545
const (
4646
DefaultQuickonOSSVersion = "3.0.2" // 开源版本
4747
DefaultQuickonEEVersion = "1.0"
48-
DefaultZentaoDevOPSOSSVersion = "21.6.1"
49-
DefaultZentaoDevOPSMaxVersion = "6.6.1"
50-
DefaultZentaoDevOPSBizVersion = "11.6.1"
51-
DefaultZentaoDevOPSIPDVersion = "3.6.1"
48+
DefaultZentaoDevOPSOSSVersion = "21.7"
49+
DefaultZentaoDevOPSMaxVersion = "6.7"
50+
DefaultZentaoDevOPSBizVersion = "11.7"
51+
DefaultZentaoDevOPSIPDVersion = "3.7"
5252
K3sBinName = "k3s"
5353
K3sBinPath = "/usr/local/bin/k3s"
5454
HelmBinName = "helm"

pkg/quickon/quickon.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -341,12 +341,12 @@ func (m *Meta) Init() error {
341341
cfg.S3.Password = expass.PwGenAlphaNum(16)
342342
cfg.SaveConfig()
343343
m.Log.Info("start deploy custom tools")
344-
toolargs := []string{"experimental", "helm", "upgrade", "--name", "selfcert", "--repo", common.DefaultHelmRepoName, "--chart", "selfcert", "--namespace", common.GetDefaultSystemNamespace(true)}
345-
if helmstd, err := qcexec.Command(os.Args[0], toolargs...).CombinedOutput(); err != nil {
346-
m.Log.Warnf("deploy custom tools err: %v, std: %s", err, string(helmstd))
347-
} else {
348-
m.Log.Done("deployed custom tools success")
349-
}
344+
// toolargs := []string{"experimental", "helm", "upgrade", "--name", "selfcert", "--repo", common.DefaultHelmRepoName, "--chart", "selfcert", "--namespace", common.GetDefaultSystemNamespace(true)}
345+
// if helmstd, err := qcexec.Command(os.Args[0], toolargs...).CombinedOutput(); err != nil {
346+
// m.Log.Warnf("deploy custom tools err: %v, std: %s", err, string(helmstd))
347+
// } else {
348+
// m.Log.Done("deployed custom tools success")
349+
// }
350350
m.Log.Info("start deploy operator")
351351
operatorargs := []string{"experimental", "helm", "upgrade", "--name", common.DefaultCneOperatorName, "--repo", common.DefaultHelmRepoName, "--chart", common.DefaultCneOperatorName, "--namespace", common.GetDefaultSystemNamespace(true),
352352
"--set", "minio.ingress.enabled=true",
@@ -541,13 +541,13 @@ func (m *Meta) UnInstall() error {
541541
m.Log.Warnf("start clean platform")
542542
cfg, _ := config.LoadConfig()
543543
// 清理helm安装应用
544-
m.Log.Info("start uninstall cne custom tools")
545-
toolArgs := []string{"experimental", "helm", "uninstall", "--name", "selfcert", "--namespace", common.GetDefaultSystemNamespace(true)}
546-
if cleanStd, err := qcexec.Command(os.Args[0], toolArgs...).CombinedOutput(); err != nil {
547-
m.Log.Warnf("uninstall cne custom tools err: %v, std: %s", err, string(cleanStd))
548-
} else {
549-
m.Log.Done("uninstall cne custom tools success")
550-
}
544+
// m.Log.Info("start uninstall cne custom tools")
545+
// toolArgs := []string{"experimental", "helm", "uninstall", "--name", "selfcert", "--namespace", common.GetDefaultSystemNamespace(true)}
546+
// if cleanStd, err := qcexec.Command(os.Args[0], toolArgs...).CombinedOutput(); err != nil {
547+
// m.Log.Warnf("uninstall cne custom tools err: %v, std: %s", err, string(cleanStd))
548+
// } else {
549+
// m.Log.Done("uninstall cne custom tools success")
550+
// }
551551
m.Log.Info("start uninstall cne operator")
552552
operatorArgs := []string{"experimental", "helm", "uninstall", "--name", common.DefaultCneOperatorName, "--namespace", common.GetDefaultSystemNamespace(true)}
553553
if cleanStd, err := qcexec.Command(os.Args[0], operatorArgs...).CombinedOutput(); err != nil {

0 commit comments

Comments
 (0)