Refactor v1.14.0 (#65)

* mod:update go.mod file

* fix:修复mesh模式服务名错误匹配问题

* fix:修复mesh模式服务名错误匹配问题

* fix:search name需要递归处理

Author: chuntaojun

bootstrap/dns.go

@@ -42,11 +42,23 @@ func (d *dnsHandler) preprocess(qname string) string {
 	if len(d.searchNames) == 0 {
 		return qname
 	}
-	for _, searchName := range d.searchNames {
-		if strings.HasSuffix(qname, searchName) {
-			return qname[:len(qname)-len(searchName)]
+
+	var matched bool
+
+	for {
+		for _, searchName := range d.searchNames {
+			if strings.HasSuffix(qname, searchName) {
+				matched = true
+				qname = qname[:len(qname)-len(searchName)]
+			}
 		}
+
+		if !matched {
+			break
+		}
+		matched = false
 	}
+
 	return qname
 }
 

bootstrap/dns_test.go

@@ -0,0 +1,88 @@
+/**
+ * Tencent is pleased to support the open source community by making Polaris available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package bootstrap
+
+import (
+	"testing"
+)
+
+func Test_dnsHandler_preprocess(t *testing.T) {
+	type fields struct {
+		searchNames []string
+	}
+	type args struct {
+		qname string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   string
+	}{
+		{
+			name: "",
+			fields: fields{
+				searchNames: []string{"polaris-system.svc.cluster.local.", "svc.cluster.local.", "cluster.local."},
+			},
+			args: args{
+				qname: "polaris.polaris-system.polaris-system.svc.cluster.local.",
+			},
+			want: "polaris.polaris-system.",
+		},
+		{
+			name: "",
+			fields: fields{
+				searchNames: []string{"polaris-system.svc.cluster.local.", "svc.cluster.local.", "cluster.local."},
+			},
+			args: args{
+				qname: "polaris.polaris-system.",
+			},
+			want: "polaris.polaris-system.",
+		},
+		{
+			name: "",
+			fields: fields{
+				searchNames: []string{"polaris-system.svc.cluster.local.", "svc.cluster.local.", "cluster.local."},
+			},
+			args: args{
+				qname: "polaris.polaris-system.svc.cluster.local.",
+			},
+			want: "polaris.",
+		},
+		{
+			name: "",
+			fields: fields{
+				searchNames: []string{"svc.cluster.local.", "polaris-system.svc.cluster.local.", "cluster.local."},
+			},
+			args: args{
+				qname: "polaris.polaris-system.svc.cluster.local.",
+			},
+			want: "polaris.polaris-system.",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			d := &dnsHandler{
+				searchNames: tt.fields.searchNames,
+			}
+			if got := d.preprocess(tt.args.qname); got != tt.want {
+				t.Errorf("dnsHandler.preprocess() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

deploy/k8s/deployment-dnsagent.yaml

@@ -26,7 +26,6 @@ metadata:
     app: polaris-sidecar-dns
   name: polaris-sidecar-dns
 spec:
-  podManagementPolicy: OrderedReady
   replicas: 1
   selector:
     matchLabels:
@@ -37,7 +36,7 @@ spec:
         app: polaris-sidecar-dns
     spec:
       containers:
-        - image: polarismesh/polaris-sidecar:lastest
+        - image: polarismesh/polaris-sidecar:latest
           imagePullPolicy: Always
           name: polaris-sidecar
           command: ["./polaris-sidecar"]
@@ -72,7 +71,7 @@ spec:
             runAsNonRoot: false
             runAsUser: 0
           volumeMounts:
-            - mountPath: /root/polaris.yaml
+            - mountPath: /data/polaris.yaml
               name: polaris-client-config
               subPath: polaris.yaml
           terminationMessagePath: /dev/termination-log
@@ -83,7 +82,3 @@ spec:
             defaultMode: 420
             name: polaris-client-config
           name: polaris-client-config
-  updateStrategy:
-    rollingUpdate:
-      partition: 0
-    type: RollingUpdate