fix(renewtls): fix renewtls typo

fix renewtls typo Signed-off-by: ysicing <[email protected]>
easysoft · Nov 9, 2022 · 5e83812 · 5e83812
1 parent a9b5242
commit 5e83812
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 13 deletions.
diff --git a/backend/docs/docs.go b/backend/docs/docs.go
@@ -734,7 +734,7 @@ const docTemplate = `{
                 "settings": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/model.stringSetting"
+                        "$ref": "#/definitions/model.StringSetting"
                     }
                 },
                 "settings_map": {
@@ -831,7 +831,7 @@ const docTemplate = `{
                 }
             }
         },
-        "model.stringSetting": {
+        "model.StringSetting": {
             "type": "object",
             "properties": {
                 "key": {

diff --git a/backend/docs/swagger.json b/backend/docs/swagger.json
@@ -725,7 +725,7 @@
                 "settings": {
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/model.stringSetting"
+                        "$ref": "#/definitions/model.StringSetting"
                     }
                 },
                 "settings_map": {
@@ -822,7 +822,7 @@
                 }
             }
         },
-        "model.stringSetting": {
+        "model.StringSetting": {
             "type": "object",
             "properties": {
                 "key": {

diff --git a/backend/docs/swagger.yaml b/backend/docs/swagger.yaml
@@ -13,7 +13,7 @@ definitions:
         type: string
       settings:
         items:
-          $ref: '#/definitions/model.stringSetting'
+          $ref: '#/definitions/model.StringSetting'
         type: array
       settings_map:
         additionalProperties: true
@@ -82,7 +82,7 @@ definitions:
     required:
     - name
     type: object
-  model.stringSetting:
+  model.StringSetting:
     properties:
       key:
         type: string

diff --git a/backend/internal/app/patch/patch.go b/backend/internal/app/patch/patch.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2022 北京渠成软件有限公司 All rights reserved.
+// Use of this source code is governed by Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// license that can be found in the LICENSE file.
+
 package patch
 
 import "context"

diff --git a/backend/internal/app/patch/patch20221103.go b/backend/internal/app/patch/patch20221103.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2022 北京渠成软件有限公司 All rights reserved.
+// Use of this source code is governed by Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// license that can be found in the LICENSE file.
+
 package patch
 
 import (
@@ -8,6 +12,7 @@ import (
 	"github.com/Masterminds/semver"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
+
 	"gitlab.zcorp.cc/pangu/cne-api/internal/app/model"
 	"gitlab.zcorp.cc/pangu/cne-api/internal/app/service"
 	"gitlab.zcorp.cc/pangu/cne-api/internal/pkg/constant"

diff --git a/backend/internal/app/serve/serve.go b/backend/internal/app/serve/serve.go
@@ -7,11 +7,12 @@ package serve
 import (
 	"context"
 	"fmt"
-	"gitlab.zcorp.cc/pangu/cne-api/internal/app/patch"
 	"net/http"
 	"os"
 	"time"
 
+	"gitlab.zcorp.cc/pangu/cne-api/internal/app/patch"
+
 	"github.com/spf13/viper"
 
 	"gitlab.zcorp.cc/pangu/cne-api/internal/pkg/analysis"

diff --git a/backend/internal/app/service/app/instance/domain.go b/backend/internal/app/service/app/instance/domain.go
@@ -1,9 +1,14 @@
+// Copyright (c) 2022 北京渠成软件有限公司 All rights reserved.
+// Use of this source code is governed by Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// license that can be found in the LICENSE file.
+
 package instance
 
 import (
+	"strings"
+
 	"gitlab.zcorp.cc/pangu/cne-api/internal/app/model"
 	"gitlab.zcorp.cc/pangu/cne-api/internal/pkg/constant"
-	"strings"
 )
 
 func (i *Instance) ListIngressHosts() []string {

diff --git a/backend/internal/pkg/constant/env.go b/backend/internal/pkg/constant/env.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2022 北京渠成软件有限公司 All rights reserved.
+// Use of this source code is governed by Z PUBLIC LICENSE 1.2 (ZPL 1.2)
+// license that can be found in the LICENSE file.
+
 package constant
 
 const (

diff --git a/backend/internal/pkg/job/httptls.go b/backend/internal/pkg/job/httptls.go
@@ -29,7 +29,9 @@ import (
 // CheckReNewCertificate 检查证书是否过期
 func CheckReNewCertificate() error {
 	logger := logging.DefaultLogger().WithField("job", "renewtls")
-	domain := os.Getenv("APP_DOMAIN")
+	kubeCluster := cluster.Get("primary")
+	// 兼容老版本域名, 域名从ingress获取
+	domain := domainGet(kubeCluster, logger)
 
 	if strings.HasSuffix(domain, "haogs.cn") || strings.HasSuffix(domain, "corp.cc") {
 		needRenew, err := checkCertificate(domain, logger)
@@ -38,7 +40,7 @@ func CheckReNewCertificate() error {
 			return err
 		}
 		if needRenew {
-			return renewCertificate(domain, logger)
+			return renewCertificate(kubeCluster, domain, logger)
 		}
 		logger.Infof("skip domain %s renew tls", domain)
 		return nil
@@ -47,6 +49,19 @@ func CheckReNewCertificate() error {
 	return nil
 }
 
+func domainGet(kubeCluster *cluster.Cluster, logger logrus.FieldLogger) string {
+	defaultDomain := os.Getenv("APP_DOMAIN")
+	ingressClient := kubeCluster.Clients.Base.NetworkingV1().Ingresses(viper.GetString(constant.FlagRuntimeNamespace))
+	ingress, err := ingressClient.Get(context.TODO(), "qucheng", metav1.GetOptions{})
+	if err != nil {
+		return defaultDomain
+	}
+	if ingress != nil && len(ingress.Spec.Rules) > 0 {
+		return ingress.Spec.Rules[0].Host
+	}
+	return defaultDomain
+}
+
 func checkCertificate(domain string, logger logrus.FieldLogger) (bool, error) {
 	client := &http.Client{
 		Transport: &http.Transport{
@@ -74,11 +89,12 @@ func checkCertificate(domain string, logger logrus.FieldLogger) (bool, error) {
 	return false, nil
 }
 
-func renewCertificate(domain string, logger logrus.FieldLogger) error {
+func renewCertificate(kubeCluster *cluster.Cluster, domain string, logger logrus.FieldLogger) error {
 	logging.DefaultLogger().WithField("job", "renewtls").Info("try create renewtls job")
+	ds := strings.Split(domain, ".")
+	coreDomain := fmt.Sprintf("%s.%s.%s", ds[len(ds)-3], ds[len(ds)-2], ds[len(ds)-1])
 	// renew default tls certificate
 	// renew ingress tls certificate
-	kubeCluster := cluster.Get("primary")
 	jobclient := kubeCluster.Clients.Base.BatchV1().Jobs(viper.GetString(constant.FlagRuntimeNamespace))
 	object := &batchv1.Job{
 		TypeMeta: metav1.TypeMeta{
@@ -103,7 +119,7 @@ func renewCertificate(domain string, logger logrus.FieldLogger) error {
 							Env: []corev1.EnvVar{
 								{
 									Name:  "DOMAIN",
-									Value: domain,
+									Value: coreDomain,
 								},
 							},
 						},