2

.github/workflows/develop.yml

@@ -7,29 +7,13 @@ on:
 env:
   REGION_ID: cn-shenzhen
   REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
-<<<<<<< HEAD
-<<<<<<< HEAD
   NAMESPACE: sharefly-dev
-=======
-  NAMESPACE: sharefly
->>>>>>> 39dc22a (Create develop.yml)
-=======
-  NAMESPACE: sharefly-dev
->>>>>>> 31b1b2a (Update develop.yml)
   IMAGE: ims
   TAG: ${{ github.sha }}
 
   ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
   ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
-<<<<<<< HEAD
-<<<<<<< HEAD
-  ACR_EE_NAMESPACE: sharefly-dev
-=======
-  ACR_EE_NAMESPACE: sharefly
->>>>>>> 39dc22a (Create develop.yml)
-=======
   ACR_EE_NAMESPACE: sharefly-dev
->>>>>>> 31b1b2a (Update develop.yml)
   ACR_EE_IMAGE: ims
   ACR_EE_TAG: ${{ github.sha }}
   JAVA_VERSION: '8'

.github/workflows/master.yml

@@ -2,64 +2,6 @@ name: Build and Push to ACR
 
 on:
   push:
-    branches: [ "master" ]
-
-env:
-  REGION_ID: cn-shenzhen
-  REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
-  NAMESPACE: sharefly
-  IMAGE: ims
-  TAG: ${{ github.sha }}
-
-  ACR_EE_REGISTRY: mmc-registry.cn-shenzhen.cr.aliyuncs.com
-  ACR_EE_INSTANCE_ID: cri-yhk5zgfc2v1sia6l
-  ACR_EE_NAMESPACE: sharefly
-  ACR_EE_IMAGE: ims
-  ACR_EE_TAG: ${{ github.sha }}
-  JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/ims.git
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment: prod
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{env.JAVA_VERSION}}
-
-      - name: Login to ACR EE with the AccessKey pair
-        uses: aliyun/acr-login@v1
-        with:
-          login-server: "https://${{ env.ACR_EE_REGISTRY }}"
-          region-id: "${{ env.REGION_ID }}"
-          username: "QD--KeBiTeHangKong@1354706964800968"
-          password: "MMC@2023&ACR"
-          instance-id: "${{ env.ACR_EE_INSTANCE_ID }}"
-
-      - name: Build and push image to ACR EE
-        run: |
-          mvn clean package
-          docker build -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
-          docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
-
-      - name: Kustomize Set Image
-        run: |-
-          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
-
-<<<<<<< HEAD
-on:
-  push:
     ### Production
     branches: [ "master" ]
 
@@ -104,8 +46,6 @@ jobs:
           username: "QD--KeBiTeHangKong@1354706964800968"
           password: "MMC@2023&ACR"
           instance-id: "${{ env.ACR_EE_INSTANCE_ID }}"
-<<<<<<< HEAD
-=======
 
       - name: Build and push image to ACR EE
         run: |
@@ -119,23 +59,10 @@ jobs:
           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
       ### Production
-=======
->>>>>>> f6ab32a (Update master.yml)
       - name: Commit and Push
         run: |
           git config user.name "Chuck"
           git config user.email "Chuck@users.noreply.github.com"
           git remote set-url origin "$GITLAB_URL"
-<<<<<<< HEAD
-          git add .
-          git commit -m "Generated Image New Tag"
-          git push origin master
->>>>>>> 9ec03fb (Update master.yml)
-=======
-          git commit -am "generated Image update"
-<<<<<<< HEAD
-          git push origin develop
->>>>>>> f6ab32a (Update master.yml)
-=======
+          git commit -am "Generated Image New Tag"
           git push origin master
->>>>>>> 99771eb (1)

kustomization/overlays/prod/kustomization.yaml

 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base
+  - ../../base
 namespace: prod
 #namePrefix: prod-
 commonLabels:
@@ -9,16 +9,12 @@ commonLabels:
 commonAnnotations:
   note: This is prod!
 patches:
-- path: configMap.yaml
-- path: service-patch.yaml
+  - path: configMap.yaml
+  - path: service-patch.yaml
     target:
       kind: Service
       name: ims-svc
 images:
-- name: REGISTRY/NAMESPACE/IMAGE:TAG
+  - name: REGISTRY/NAMESPACE/IMAGE:TAG
     newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-<<<<<<< HEAD
     newTag: 710ed85fcf0bb1899d3fead60a638d29cd6b2cb7
-=======
-  newTag: ae05d4c5c8344ff931d88bfabdf672104b90d73a
->>>>>>> a5f0e5c (Generated Image New Tag)