fix: promotion and memory (#141)

* fix: fixing image promotion * fix: changing again the workflow adding docker login to avoid issues when retagging changing memory limits
bcgov · Mar 27, 2023 · 2c913e6 · 2c913e6
1 parent 37917ca
commit 2c913e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
@@ -189,37 +189,45 @@ jobs:
           name: ${{ steps.changelog.outputs.tag }}
           body: ${{ steps.changelog.outputs.clean_changelog }}
 
+      - name: Log in to the Container registry
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Promoting API
         uses: shrink/actions-docker-registry-tag@v3
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/api
           target: test
+          tags: prod
           tags: ${{ steps.changelog.outputs.tag }}
 
       - name: Promoting API
         uses: shrink/actions-docker-registry-tag@v3
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/api
-          target: ${{ steps.changelog.outputs.tag }}
-          tags: prod
+          target: test
+          tags: ${{ steps.changelog.outputs.tag }}
 
       - name: Promoting Init
         uses: shrink/actions-docker-registry-tag@v3
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/init
           target: test
-          tags: ${{ steps.changelog.outputs.tag }}
+          tags: prod
 
       - name: Promoting Init
         uses: shrink/actions-docker-registry-tag@v3
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/init
-          target: ${{ steps.changelog.outputs.tag }}
-          tags: prod
+          target: test
+          tags: ${{ steps.changelog.outputs.tag }}
 
   deploy-prod:
     name: PROD Deployment

diff --git a/openshift.deploy.yml b/openshift.deploy.yml
@@ -4,7 +4,7 @@ metadata:
   name: ${NAME}
   annotations:
     description: "Nr-Forest-Client-Api"
-    tags: "nrfc-api"
+    tags: "nr-forest-client-api"
     iconClass: icon-js
 labels:
   app: ${NAME}-${ZONE}
@@ -29,9 +29,9 @@ parameters:
   - name: CPU_LIMIT
     value: 25m
   - name: MEMORY_REQUEST
-    value: 50Mi
+    value: 75Mi
   - name: MEMORY_LIMIT
-    value: 150Mi
+    value: 75Mi
   - name: REGISTRY
     description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
     value: ghcr.io