Merge branch 'develop'

kustomization/base/configMap.yaml

@@ -5,5 +5,5 @@ metadata:
   namespace: default
 data:
   SPRING_PROFILES_ACTIVE: default
-  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.default:11800"
+  SW_AGENT_COLLECTOR_BACKEND_SERVICES: "default-oap.skywalking-swck-system:11800"
   SW_AGENT_NAME: pms

kustomization/base/deployment.yaml

@@ -22,6 +22,9 @@ spec:
           volumeMounts:
             - name: log-of-app
               mountPath: /var/log/app
+            - name: localtime
+              mountPath: /etc/localtime
+              readOnly: true
           resources:
             limits:
               memory: 1024Mi
@@ -47,4 +50,7 @@ spec:
       volumes:
         - name: log-of-app
           hostPath:
-            path: /var/log/app
\ No newline at end of file
+            path: /var/log/app
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: 025798e0fbac9a213a458be9bd8d2b8571abdbaf
+  newTag: 868338f86a3a6fbcc87b972c320f44db3e05f997