fix:sync instance version not set (#159)

Author: chuntaojun

Makefile

@@ -29,7 +29,7 @@ build-multi-arch-image:
 	@echo "------------------"
 	@echo "--> Building multi-arch docker image for polaris-controller"
 	@echo "------------------"
-	@docker buildx build --platform $(PLATFORMS) --tag $(ORG)/$(REPO):$(IMAGE_TAG) -f ./docker/Dockerfile --push ./
+	@docker buildx build -f ./docker/Dockerfile --tag $(ORG)/$(REPO):$(IMAGE_TAG) --platform $(PLATFORMS) --push ./
 
 .PHONY: build-sidecar-init
 build-sidecar-init:

build.sh

@@ -29,9 +29,6 @@ workdir=$(dirname $(realpath $0))
 sed -i "s/##VERSION##/$version/g" "$workdir"/deploy/variables.txt
 cat "$workdir"/deploy/variables.txt
 
-folder_name="polaris-controller-release_${version}.k8s1.21"
-pkg_name="${folder_name}.zip"
-
 function replaceVar() {
   for file in $(ls *.yaml); do
     key="#$1#"
@@ -48,6 +45,11 @@ cd $workdir
 
 export -f replaceVar
 
+# 处理 kubernetes <= 1.21 的 polaris-controller 发布包
+
+folder_name="polaris-controller-release_${version}.k8s1.21"
+pkg_name="${folder_name}.zip"
+
 cd $workdir
 
 # 清理环境
@@ -58,10 +60,10 @@ rm -f "${pkg_name}"
 mkdir -p ${folder_name}
 
 cp -r deploy/kubernetes_v1.21/* ${folder_name}
-cp deploy/variables.txt ${folder_name}
+cp deploy/variables.txt ${folder_name}/kubernetes
 
 cd ${folder_name}/helm
-varFile="../variables.txt"
+varFile="../kubernetes/variables.txt"
 if [ ! -f "$varFile" ]; then
   echo "variables.txt not exists"
   exit 1
@@ -78,6 +80,8 @@ else
   md5sum ${pkg_name} >"${pkg_name}.md5sum"
 fi
 
+# 处理 kubernetes >= 1.22 的 polaris-controller 发布包
+
 folder_name="polaris-controller-release_${version}.k8s1.22"
 pkg_name="${folder_name}.zip"
 
@@ -91,10 +95,10 @@ rm -f "${pkg_name}"
 mkdir -p ${folder_name}
 
 cp -r deploy/kubernetes_v1.22/* ${folder_name}
-cp deploy/variables.txt ${folder_name}
+cp deploy/variables.txt ${folder_name}/kubernetes
 
 cd ${folder_name}/helm
-varFile="../variables.txt"
+varFile="../kubernetes/variables.txt"
 if [ ! -f "$varFile" ]; then
   echo "variables.txt not exists"
   exit 1

cmd/polaris-controller/app/polaris-controller-manager.go

@@ -491,6 +491,9 @@ func buildAPI() (api.ConsumerAPI, api.ProviderAPI, error) {
 	cfg.GetGlobal().GetServerConnector().SetConnectTimeout(time.Second * 10)
 	cfg.GetGlobal().GetServerConnector().SetMessageTimeout(time.Second * 10)
 	cfg.GetGlobal().GetAPI().SetTimeout(time.Second * 10)
+	cfg.GetConfigFile().GetConfigConnectorConfig().SetAddresses([]string{polarisapi.PolarisConfigGrpc})
+	cfg.GetConfigFile().GetConfigConnectorConfig().SetConnectTimeout(time.Second * 10)
+	cfg.GetConfigFile().GetConfigConnectorConfig().SetMessageTimeout(time.Second * 10)
 
 	consumerAPI, err := api.NewConsumerAPIByConfig(cfg)
 	if err != nil {

deploy/kubernetes_v1.21/helm/templates/controller-clusterrole.yaml

@@ -8,8 +8,8 @@ rules:
   resources:
   - services
   - namespaces
-  - configmaps
   - pods
+  - endpoints
   verbs:
   - get
   - list
@@ -18,7 +18,7 @@ rules:
   - ""
   resources:
   - events
-  - endpoints
+  - configmaps
   verbs:
   - create
   - update

deploy/kubernetes_v1.21/configmap.yaml renamed to deploy/kubernetes_v1.21/kubernetes/configmap.yaml

@@ -38,8 +38,8 @@ spec:
                   fieldPath: metadata.namespace
           imagePullPolicy: Always
           volumeMounts:
-            - mountPath: /polaris-controller/log
-              name: log
+            - mountPath: /polaris-controller/logs
+              name: logs
             - name: certs
               mountPath: /etc/polaris-inject/certs
               readOnly: true
@@ -72,6 +72,6 @@ spec:
           configMap:
             name: injector-mesh
         - hostPath:
-            path: /data/polaris-controller/log
+            path: /data/polaris-controller/logs
             type: "DirectoryOrCreate"
-          name: log
+          name: logs

deploy/kubernetes_v1.21/injector.yaml renamed to deploy/kubernetes_v1.21/kubernetes/injector.yaml

@@ -17,6 +17,7 @@ rules:
   - namespaces
   - configmaps
   - pods
+  - endpoints
   verbs:
   - get
   - list
@@ -25,7 +26,7 @@ rules:
   - ""
   resources:
   - events
-  - endpoints
+  - configmaps
   verbs:
   - create
   - update

deploy/kubernetes_v1.21/install.sh renamed to deploy/kubernetes_v1.21/kubernetes/install.sh

@@ -8,8 +8,8 @@ rules:
   resources:
   - services
   - namespaces
-  - configmaps
   - pods
+  - endpoints
   verbs:
   - get
   - list
@@ -18,7 +18,7 @@ rules:
   - ""
   resources:
   - events
-  - endpoints
+  - configmaps
   verbs:
   - create
   - update

deploy/kubernetes_v1.21/namespace.yaml renamed to deploy/kubernetes_v1.21/kubernetes/namespace.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: injector-mesh
+  name: polaris-controller-config
   namespace: polaris-system
 data:
   mesh: |-

deploy/kubernetes_v1.21/polaris-client-config-tpl.yaml renamed to deploy/kubernetes_v1.21/kubernetes/polaris-client-config-tpl.yaml

@@ -1,18 +1,3 @@
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: polaris-sidecar-injector
-  namespace: polaris-system
-  labels:
-    app: sidecar-injector
-spec:
-  minAvailable: 1
-  selector:
-    matchLabels:
-      app: sidecar-injector
-
----
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -254,45 +239,3 @@ data:
           emptyDir: {}
         - name: polaris-log
           emptyDir: {}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: polaris-sidecar-injector
-  namespace: polaris-system
-  labels:
-    app: sidecar-injector
-spec:
-  ports:
-    - port: 443
-      targetPort: 9443
-  selector:
-    app: sidecar-injector
----
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: polaris-sidecar-injector
-  labels:
-    app: sidecar-injector
-webhooks:
-  - name: polaris.tencent.com
-    clientConfig:
-      service:
-        name: polaris-sidecar-injector
-        namespace: polaris-system
-        path: "/inject"
-      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZpVENDQTNHZ0F3SUJBZ0lVSUJGZmZMeE84K2RNSTNrd3hOcXpibGg4Zm9Vd0RRWUpLb1pJaHZjTkFRRUwKQlFBd05qRTBNRElHQTFVRUF3d3JjRzlzWVhKcGN5MXphV1JsWTJGeUxXbHVhbVZqZEc5eUxuQnZiR0Z5YVhNdApjM2x6ZEdWdExuTjJZekFnRncweU1qQTNNRFF3TXpFNU1UaGFHQTh5TVRJeE1EWXhNREF6TVRreE9Gb3dOakUwCk1ESUdBMVVFQXd3cmNHOXNZWEpwY3kxemFXUmxZMkZ5TFdsdWFtVmpkRzl5TG5CdmJHRnlhWE10YzNsemRHVnQKTG5OMll6Q0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQUxMWmE4NzZkQnRmQlJ1cgpaSzZpK0UzRUs4UWJFWitlaG1lNWNhaXhsakRwTlJIdHFyb2I2NGExYldTUWQxU0IvMmVxbVdiY1ZXY24vVFRQCk45WFVHN2JsNExSaWRWQktYODE3ekdDWEYra3BqbTNOekFseEdEK3lteXhJeWhYS1U5K3A3VGk5SXpORXNPNE8KSlhaQm5iOVdzWGU2eGJJN0dlUUY5WXVCdit0ekNMNVJ0ZmRiUmtMVGQ2eWF3NlZYTFdEcDFrUUU4Q1pEc0g5ZApTZmxBeUhCUitaLzVqbzBtMnQzU3hiNTVPak9YcDhVNmV3bVRmdzZ0VXE1Z3dmZXBjWGNOUWlVTXJveFl0dXkxCkxnWGVBN3MvMFdCeDcrVlFPWXlGSGlaQUI0V1dkSEk1S0JIeFlpSFA3Y2N5aWEvM0gwQ2lYVSthYnd0NHk5TDQKdmVSMHQ5ZmMvbXZXUU01aFBjT1hwdzVJZU5sUG8wZE9vZ0NNdE1qaTkwTEFFS2RMQVNhemxDT0hzdVFqNkczaQp4Nk4rdzQrYy9VTGFxR1REUGc2K0c0UDl5UUVZNXVDNDRZWWpJSGxjQlhyR0YwVFFKTEZMM3F4dnU1VitpYXF1CnMvaWZyRzllY3RyY3lLczVWM0dESGlDdE93Y29MajI1TG1oYzF4MEdvT1RmWis3VFA1NjRyM1k3cVVhcUJ3WFgKMWREak4wREFtU1k1VW1tTGhhZ205bU9xcVo4T29XY0M2clFEVUJwbW1hTTUxVEVkeVEwbHNCc0g1T0Jvalp1UgpkeUZuTXkxWHdSRjVNenRrTW9nRnZKYWhnN1hVUTJBN1NBaUhxaUlCY1AyZTZKNDdUMVNqa0s4NUpwMU1WRW5PCjZhSFZxR29wQm9tUi9BNzBTUlRLeGp2UW52UC9BZ01CQUFHamdZd3dnWWt3SFFZRFZSME9CQllFRkNMTkZlMHUKd3Z3RGRiT0VRQWwxNFMwRTRBQzhNQjhHQTFVZEl3UVlNQmFBRkNMTkZlMHV3dndEZGJPRVFBbDE0UzBFNEFDOApNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdOZ1lEVlIwUkJDOHdMWUlyY0c5c1lYSnBjeTF6YVdSbFkyRnlMV2x1CmFtVmpkRzl5TG5CdmJHRnlhWE10YzNsemRHVnRMbk4yWXpBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQWdFQWx5aXQKVjdYaHRqZTFXK3RBMUtiUUtBUi8rendiUW1RUHpRTHpRdEdqUERvbmk5VVYyK3A1OEF5YmtvVVo3cEhXb2hFcgoxUGI2WGpKVVYxNjhGb3FZMUR4OS9SRCtDeC9mOWZ1MkswTTEvc2pYTk9oVERuMHZwZ2VvMFZJOVdCcUMrK1EyCllORmZNM2ZhaDQyaXVaSTBZNldnRldJM3dGbUQ3MTBWTC8xOVhMQ0dpditUbmc0ZnRwcHhOZW9rWlI1dU1janAKM0hNeExnUkExbnFYQ2ZhT3VrRVZLbnhvQ1hoQmRySXErV1VsOUZjZ09iVGxaU0RMNEpkZTl2R1B3cFBFRS9pVgo5cHhsMkhxWWdUZEdXZjJXeWluSmhZazFXempmZzFRTEY0TnJIQ2o3alJNbDBFbXZHM0hTNDM0ME9PUURKTlptClBDVHVrODV6L2dwaml5b3RxUlorcmNXSThBbVZDdURWbkg0VHVqb2swU1RXdUlWUDM5c21DUE5kUElwUVIxblIKSnZ1L2szV0IrTmlZbU94QzJ5SjRvMWRtYnZvS2ZadGIxVVBObVRJcmxXNThlMDdmUGV4QmNwR3JSRk5yVS9kaQpJbEpMNytXVVBKQWluTC8zL0FLQm5md1ZaemtrOVlUdld0b2xZeElhRExTd3JsdEdvZjBQUkptYnI0UDdxbm56ClFDUXVlZDFsUjRaUHJnYUlnZEdHSjdac1lESlVZbS8xd2g3N3FmR3FlYlRFZmorV09JYzV2S09vcEZTY0ZXd3oKNGVZVmVMYjBZdkc0dmc3ZHhCNFArbElzaFNpdmRVUE5XMW5ZY05pcFIrNnI2Q3h0ZnIwWjZWSkFjZjdTR1FHNwpYZkNuQXdMdlJtMEs2Q1Z6WUhPTFVRR2ZVSjBEbGFEeUR3c0JOc009Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-    rules:
-      - operations: ["CREATE"]
-        apiGroups: [""]
-        apiVersions: ["v1"]
-        resources: ["pods"]
-    admissionReviewVersions: ["v1"]
-    sideEffects: "None"
-    failurePolicy: Fail
-    namespaceSelector:
-      matchLabels:
-        polaris-injection: enabled
----
-

deploy/kubernetes_v1.21/polaris-controller.yaml renamed to deploy/kubernetes_v1.21/kubernetes/polaris-controller.yaml

@@ -0,0 +1,133 @@
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: polaris-sidecar-injector
+  namespace: polaris-system
+  labels:
+    app: sidecar-injector
+spec:
+  minAvailable: 1
+  selector:
+    matchLabels:
+      app: sidecar-injector
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: polaris-sidecar-injector
+  namespace: polaris-system
+  labels:
+    app: sidecar-injector
+spec:
+  ports:
+    - port: 443
+      targetPort: 9443
+  selector:
+    app: sidecar-injector
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: polaris-sidecar-injector
+  labels:
+    app: sidecar-injector
+webhooks:
+  - name: polaris.tencent.com
+    clientConfig:
+      service:
+        name: polaris-sidecar-injector
+        namespace: polaris-system
+        path: "/inject"
+      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZpVENDQTNHZ0F3SUJBZ0lVSUJGZmZMeE84K2RNSTNrd3hOcXpibGg4Zm9Vd0RRWUpLb1pJaHZjTkFRRUwKQlFBd05qRTBNRElHQTFVRUF3d3JjRzlzWVhKcGN5MXphV1JsWTJGeUxXbHVhbVZqZEc5eUxuQnZiR0Z5YVhNdApjM2x6ZEdWdExuTjJZekFnRncweU1qQTNNRFF3TXpFNU1UaGFHQTh5TVRJeE1EWXhNREF6TVRreE9Gb3dOakUwCk1ESUdBMVVFQXd3cmNHOXNZWEpwY3kxemFXUmxZMkZ5TFdsdWFtVmpkRzl5TG5CdmJHRnlhWE10YzNsemRHVnQKTG5OMll6Q0NBaUl3RFFZSktvWklodmNOQVFFQkJRQURnZ0lQQURDQ0Fnb0NnZ0lCQUxMWmE4NzZkQnRmQlJ1cgpaSzZpK0UzRUs4UWJFWitlaG1lNWNhaXhsakRwTlJIdHFyb2I2NGExYldTUWQxU0IvMmVxbVdiY1ZXY24vVFRQCk45WFVHN2JsNExSaWRWQktYODE3ekdDWEYra3BqbTNOekFseEdEK3lteXhJeWhYS1U5K3A3VGk5SXpORXNPNE8KSlhaQm5iOVdzWGU2eGJJN0dlUUY5WXVCdit0ekNMNVJ0ZmRiUmtMVGQ2eWF3NlZYTFdEcDFrUUU4Q1pEc0g5ZApTZmxBeUhCUitaLzVqbzBtMnQzU3hiNTVPak9YcDhVNmV3bVRmdzZ0VXE1Z3dmZXBjWGNOUWlVTXJveFl0dXkxCkxnWGVBN3MvMFdCeDcrVlFPWXlGSGlaQUI0V1dkSEk1S0JIeFlpSFA3Y2N5aWEvM0gwQ2lYVSthYnd0NHk5TDQKdmVSMHQ5ZmMvbXZXUU01aFBjT1hwdzVJZU5sUG8wZE9vZ0NNdE1qaTkwTEFFS2RMQVNhemxDT0hzdVFqNkczaQp4Nk4rdzQrYy9VTGFxR1REUGc2K0c0UDl5UUVZNXVDNDRZWWpJSGxjQlhyR0YwVFFKTEZMM3F4dnU1VitpYXF1CnMvaWZyRzllY3RyY3lLczVWM0dESGlDdE93Y29MajI1TG1oYzF4MEdvT1RmWis3VFA1NjRyM1k3cVVhcUJ3WFgKMWREak4wREFtU1k1VW1tTGhhZ205bU9xcVo4T29XY0M2clFEVUJwbW1hTTUxVEVkeVEwbHNCc0g1T0Jvalp1UgpkeUZuTXkxWHdSRjVNenRrTW9nRnZKYWhnN1hVUTJBN1NBaUhxaUlCY1AyZTZKNDdUMVNqa0s4NUpwMU1WRW5PCjZhSFZxR29wQm9tUi9BNzBTUlRLeGp2UW52UC9BZ01CQUFHamdZd3dnWWt3SFFZRFZSME9CQllFRkNMTkZlMHUKd3Z3RGRiT0VRQWwxNFMwRTRBQzhNQjhHQTFVZEl3UVlNQmFBRkNMTkZlMHV3dndEZGJPRVFBbDE0UzBFNEFDOApNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdOZ1lEVlIwUkJDOHdMWUlyY0c5c1lYSnBjeTF6YVdSbFkyRnlMV2x1CmFtVmpkRzl5TG5CdmJHRnlhWE10YzNsemRHVnRMbk4yWXpBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQWdFQWx5aXQKVjdYaHRqZTFXK3RBMUtiUUtBUi8rendiUW1RUHpRTHpRdEdqUERvbmk5VVYyK3A1OEF5YmtvVVo3cEhXb2hFcgoxUGI2WGpKVVYxNjhGb3FZMUR4OS9SRCtDeC9mOWZ1MkswTTEvc2pYTk9oVERuMHZwZ2VvMFZJOVdCcUMrK1EyCllORmZNM2ZhaDQyaXVaSTBZNldnRldJM3dGbUQ3MTBWTC8xOVhMQ0dpditUbmc0ZnRwcHhOZW9rWlI1dU1janAKM0hNeExnUkExbnFYQ2ZhT3VrRVZLbnhvQ1hoQmRySXErV1VsOUZjZ09iVGxaU0RMNEpkZTl2R1B3cFBFRS9pVgo5cHhsMkhxWWdUZEdXZjJXeWluSmhZazFXempmZzFRTEY0TnJIQ2o3alJNbDBFbXZHM0hTNDM0ME9PUURKTlptClBDVHVrODV6L2dwaml5b3RxUlorcmNXSThBbVZDdURWbkg0VHVqb2swU1RXdUlWUDM5c21DUE5kUElwUVIxblIKSnZ1L2szV0IrTmlZbU94QzJ5SjRvMWRtYnZvS2ZadGIxVVBObVRJcmxXNThlMDdmUGV4QmNwR3JSRk5yVS9kaQpJbEpMNytXVVBKQWluTC8zL0FLQm5md1ZaemtrOVlUdld0b2xZeElhRExTd3JsdEdvZjBQUkptYnI0UDdxbm56ClFDUXVlZDFsUjRaUHJnYUlnZEdHSjdac1lESlVZbS8xd2g3N3FmR3FlYlRFZmorV09JYzV2S09vcEZTY0ZXd3oKNGVZVmVMYjBZdkc0dmc3ZHhCNFArbElzaFNpdmRVUE5XMW5ZY05pcFIrNnI2Q3h0ZnIwWjZWSkFjZjdTR1FHNwpYZkNuQXdMdlJtMEs2Q1Z6WUhPTFVRR2ZVSjBEbGFEeUR3c0JOc009Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    rules:
+      - operations: ["CREATE"]
+        apiGroups: [""]
+        apiVersions: ["v1"]
+        resources: ["pods"]
+    admissionReviewVersions: ["v1"]
+    sideEffects: "None"
+    failurePolicy: Fail
+    namespaceSelector:
+      matchLabels:
+        polaris-injection: enabled
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  labels:
+    qcloud-app: polaris-controller
+  name: polaris-controller
+  namespace: polaris-system
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  serviceName: polaris-controller
+  selector:
+    matchLabels:
+      k8s-app: polaris-controller
+  updateStrategy:
+    rollingUpdate:
+      partition: 0
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        k8s-app: polaris-controller
+        app: sidecar-injector
+    spec:
+      containers:
+        - name: polaris-controller
+          image: polarismesh/polaris-controller:#CONTROLLER_VERSION#
+          command: ["./polaris-controller"]
+          args: ["--min-resync-period=60s",
+                 "--leader-elect-namespace=polaris-system",
+                 "--concurrency-polaris-size=100",
+                 "--leader-elect=true"
+          ]
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          imagePullPolicy: Always
+          volumeMounts:
+            - mountPath: /polaris-controller/log
+              name: log
+            - name: certs
+              mountPath: /etc/polaris-inject/certs
+              readOnly: true
+            - name: inject-config
+              mountPath: /etc/polaris-inject/inject
+              readOnly: true
+            - name: config-volume
+              mountPath: /etc/polaris-inject/config
+              readOnly: true
+      dnsPolicy: ClusterFirst
+      imagePullSecrets:
+        - name: qcloudregistrykey
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      terminationGracePeriodSeconds: 30
+      serviceAccountName: polaris-controller
+      volumes:
+        - name: certs
+          secret:
+            secretName: polaris-sidecar-injector
+        - name: inject-config
+          configMap:
+            name: polaris-sidecar-injector
+            items:
+              - key: mesh-config
+                path: mesh-config
+              - key: dns-config
+                path: dns-config
+              - key: values
+                path: values
+        - name: config-volume
+          configMap:
+            name: polaris-controller-config
+        - hostPath:
+            path: /data/polaris-controller/log
+            type: "DirectoryOrCreate"
+          name: log

deploy/kubernetes_v1.21/polaris-metrics-svc.yaml renamed to deploy/kubernetes_v1.21/kubernetes/polaris-metrics-svc.yaml

@@ -15,8 +15,8 @@ rules:
   resources:
   - services
   - namespaces
-  - configmaps
   - pods
+  - endpoints
   verbs:
   - get
   - list
@@ -25,7 +25,7 @@ rules:
   - ""
   resources:
   - events
-  - endpoints
+  - configmaps
   verbs:
   - create
   - update