From b3b29b04a7ea2f4a1f0ad694300546f5400b49d8 Mon Sep 17 00:00:00 2001 From: ysicing Date: Fri, 8 Sep 2023 16:53:51 +0800 Subject: [PATCH] fix(typo): fix paas typo fix paas typo Signed-off-by: ysicing --- common/const.go | 2 +- common/func.go | 2 +- go.mod | 2 +- go.sum | 2 ++ pkg/qucheng/upgrade/upgrade.go | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/const.go b/common/const.go index 0428341b..eb6b21e8 100644 --- a/common/const.go +++ b/common/const.go @@ -93,7 +93,7 @@ const ( DefaultAppNamespace = "quickon-app" DefaultCINamespace = "quickon-ci" DefaultQuchengName = "qucheng" - DefaultZentaoPassName = "zentaopass" + DefaultZentaoPaasName = "zentaopaas" DefaultCneOperatorName = "cne-operator" DefaultIngressName = "nginx-ingress-controller" DefaultKubeAPIDomain = "kubeapi.quickon.local" diff --git a/common/func.go b/common/func.go index 40e87b45..f0c79e7f 100644 --- a/common/func.go +++ b/common/func.go @@ -197,7 +197,7 @@ func GetCustomScripts(path string) string { // GetReleaseName get chart release name func GetReleaseName(devops bool) string { if devops == true { - return DefaultZentaoPassName + return DefaultZentaoPaasName } return DefaultQuchengName } diff --git a/go.mod b/go.mod index 17b5b8f1..3b5b000a 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/cockroachdb/redact v1.1.5 // indirect github.com/containerd/containerd v1.7.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/daviddengcn/go-colortext v1.0.0 // indirect github.com/docker/cli v23.0.5+incompatible // indirect diff --git a/go.sum b/go.sum index 35261fb2..f0ad552c 100644 --- a/go.sum +++ b/go.sum @@ -162,6 +162,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/qucheng/upgrade/upgrade.go b/pkg/qucheng/upgrade/upgrade.go index c38bb272..2a71da46 100644 --- a/pkg/qucheng/upgrade/upgrade.go +++ b/pkg/qucheng/upgrade/upgrade.go @@ -172,7 +172,7 @@ func QuchengVersion(devops bool) (Version, error) { } name := common.DefaultQuchengName if devops { - name = common.DefaultZentaoPassName + name = common.DefaultZentaoPaasName } if apiVersion, err := opt.Fetch(common.GetDefaultSystemNamespace(true), name); err == nil { v.Components = append(v.Components, apiVersion)