Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

kustomization/api-wx-external.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  name: api-wx
-  namespace: default
-spec:
-  type: ExternalName
-  externalName: api.weixin.qq.com
-  ports:
-    - port: 80
\ No newline at end of file

kustomization/application.yaml

-# application.yaml
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cms-application
-  namespace: argocd
-spec:
-  project: default # 项目名
-  source:
-    repoURL: http://git.mmcuav.cn/iuav/cms.git
-    targetRevision: HEAD #develop master # 分支名
-    path: kustomization/overlays/dev  # 资源文件路径
-  destination:
-    server: https://kubernetes.default.svc  # API Server 地址
-    namespace: dev # 部署应用的命名空间
-  #  默认情况下每 3 分钟会检测 Git 仓库一次
-  syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
-    automated:
-      selfHeal: true
-      prune: true

kustomization/ingress.yaml

-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: sharefly-ingress #不能超过 253 个字符；只能包含小写字母、数字，以及 '-' 和 '.'；必须以字母数字开头；必须以字母数字结尾
-  namespace: default
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: / #使用注解（annotations）来配置一些选项，具体取决于 Ingress 控制器
-spec:
-  #ingressClassName: nginx
-  rules:
-#    - host: iuav.mmcuav.cn
-#      http
-    - http:
-        paths:
-          - path: /pms
-            pathType: Prefix
-            backend:
-              service:
-                name: pms-svc
-                port:
-                  number: 8099
-

kustomization/mysql-external.yaml

-apiVersion: v1
-kind: Service
-metadata:
-  name: mysql
-  namespace: default
-spec:
-  type: ExternalName
-  externalName: rm-wz9dd796t4j1giz6t.mysql.rds.aliyuncs.com
-  ports:
-    - port: 3306
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 4930721159f6cd570b7b50519e9e74c8e57e37ab
+  newTag: 276a574a6aa29c2d2fd600a6ead34bc7032aae4f

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/cms
-  newTag: 9ffd6700ab759bdb2deb9e5a78a3cf277c8dccbd
+  newTag: ebb48a7ba127ab0f86962957ea75d69cad41e870