Merge branch 'master' of http://git.mmcuav.cn/iuav/ims into develop

# Conflicts:
#	kustomization/overlays/dev/kustomization.yaml

.github/workflows/alibabacloud.yml

@@ -2,7 +2,8 @@ name: Build and Push to ACR
 
 on:
   push:
-    branches: [ "develop" ]
+    ### Production
+    branches: [ "master" ]
 
 env:
   REGION_ID: cn-shenzhen
@@ -17,7 +18,8 @@ env:
   ACR_EE_IMAGE: ims
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
+  ### Kustomize
+  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/kustomize/iuav-ims.git
 
 permissions:
   contents: read
@@ -25,7 +27,8 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: dev
+    ### Production
+    environment: prod
 
     steps:
       - name: Checkout
@@ -53,7 +56,7 @@ jobs:
 
       - name: Kustomize Set Image
         run: |-
-          cd kustomization/overlays/dev
+          cd kustomization/overlays/prod
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
           ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
 
@@ -62,5 +65,6 @@ jobs:
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-          git commit -am "generated Image update"
-          git push origin develop
+          git add .
+          git commit -m "Generated Image New Tag"
\ No newline at end of file
+          git push origin master
\ No newline at end of file

.gitignore

@@ -7,3 +7,4 @@ target
 .idea
 *.iml
 */application.yml
+.github/

kustomization/overlays/dev/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: ims-svc
-  namespace: default
+  namespace: dev
 spec:
   selector:
     app: ims
@@ -10,4 +10,4 @@ spec:
   ports:
     - protocol: TCP
       port: 10001
-      nodePort: 30001
+      nodePort: 30002
\ No newline at end of file

kustomization/overlays/prod/kustomization.yaml

@@ -9,4 +9,5 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-  - configMap.yaml
+  - path: configMap.yaml
\ No newline at end of file
+  - path: service.yaml
\ No newline at end of file

kustomization/overlays/prod/service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: ims-svc
+  namespace: prod
+spec:
+  selector:
+    app: ims
+  type: NodePort
+  ports:
+    - protocol: TCP
+      port: 10001
+      nodePort: 30001
\ No newline at end of file