prod

makerdao · May 16, 2024 · e7bfcb1 · e7bfcb1
1 parent 4cce0d7
commit e7bfcb1
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 54 deletions.
diff --git a/.github/workflows/angular-dev.yml b/.github/workflows/angular-dev.yml
@@ -20,7 +20,7 @@ jobs:
       HELM_FILE: helm/staging/frontend.yaml
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
@@ -61,16 +61,6 @@ jobs:
 
         docker push $ECR_REGISTRY/$AWS_ECR_NAME --all-tags
 
-    - name: Replace variables in the Helm values file
-      id: replace-vars
-      if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-        # USERS_LIST: ${{ secrets.STAGING_USERS_LIST }}
-      run: |
-        sed -i 's/${ECR_REGISTRY}/'$ECR_REGISTRY/ $HELM_FILE
-        sed -i 's/${USERS_LIST}/'$USERS_LIST/ $HELM_FILE
-
     - name: Deploying Service to Kubernetes with Helm
       id: deploy
       if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}

diff --git a/.github/workflows/angular-prod.yml b/.github/workflows/angular-prod.yml
@@ -2,7 +2,7 @@ name: Build Prod Angular - Frontend
 
 on: 
   push:
-    branches: [ main ]
+    branches: [ develop ]
     paths:
       - "frontend/**"
       - ".github/workflows/angular-prod.yml"
@@ -20,7 +20,7 @@ jobs:
       HELM_FILE: helm/prod/frontend.yaml
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
@@ -61,15 +61,6 @@ jobs:
 
         docker push $ECR_REGISTRY/$AWS_ECR_NAME --all-tags
 
-    - name: Replace variables in the Helm values file
-      id: replace-vars
-      if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-      run: |
-        sed -i 's/${ECR_REGISTRY}/'$ECR_REGISTRY/ $HELM_FILE
-        sed -i 's/${USERS_LIST}/'$USERS_LIST/ $HELM_FILE
-
     - name: Deploying Service to Kubernetes with Helm
       id: deploy
       if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}

diff --git a/.github/workflows/node.js-dev.yml b/.github/workflows/node.js-dev.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Running the Test Suit
       env:
@@ -80,14 +80,6 @@ jobs:
 
         docker push $ECR_REGISTRY/$AWS_ECR_NAME --all-tags
 
-    - name: Replace variables in the Helm values file
-      id: replace-vars
-      if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-      run: |
-        sed -i 's/${ECR_REGISTRY}/'$ECR_REGISTRY/ $HELM_FILE
-
     - name: Deploying Service to Kubernetes with Helm
       id: deploy
       if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}

diff --git a/.github/workflows/node.js-prod.yml b/.github/workflows/node.js-prod.yml
@@ -2,7 +2,7 @@ name: Node.js Prod CI - Backend
 
 on:
   push:
-    branches: [ main ] 
+    branches: [ develop ] 
     paths:
       - "backend/**"
       - ".github/workflows/node.js-prod.yml"
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Running the Test Suit
       env:
@@ -80,14 +80,6 @@ jobs:
 
         docker push $ECR_REGISTRY/$AWS_ECR_NAME --all-tags
 
-    - name: Replace variables in the Helm values file
-      id: replace-vars
-      if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}
-      env:
-        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-      run: |
-        sed -i 's/${ECR_REGISTRY}/'$ECR_REGISTRY/ $HELM_FILE
-
     - name: Deploying Service to Kubernetes with Helm
       id: deploy
       if: ${{ !contains(github.event.head_commit.message , '[skip deploy]') }}

diff --git a/.github/workflows/test-pull-request-dev.yml b/.github/workflows/test-pull-request-dev.yml
@@ -13,7 +13,7 @@ jobs:
         node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with: 
@@ -30,4 +30,3 @@ jobs:
         npm run pre-start-develop
         npm test
       working-directory: backend
-
diff --git a/.github/workflows/test-pull-request-prod.yml b/.github/workflows/test-pull-request-prod.yml
@@ -13,7 +13,7 @@ jobs:
         node-version: [14.x]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with: 
@@ -30,4 +30,3 @@ jobs:
         npm run pre-start
         npm test
       working-directory: backend
-
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,4 +1,5 @@
 FROM node:14.16.1-alpine3.13 as builder
+#FROM node:18.8.0-alpine3.16 TODO Upgrade
 
 WORKDIR /usr/src/app
 

diff --git a/helm/prod/backend.yaml b/helm/prod/backend.yaml
@@ -10,9 +10,7 @@ service:
     issuerName: letsencrypt
 
 image:
-  repository: ${ECR_REGISTRY}/mips-backend-prod
   pullPolicy: Always
-  tag: latest
 
 serviceAccount:
   create: false
@@ -54,7 +52,7 @@ env:
   GIT_ACCESS_API_TOKEN:
     type: parameterStore
     name: webhooks-secret-token
-    parameter_name: /eks/maker-staging/mips-backend/git-access-api-token
+    parameter_name: /eks/maker-prod-eu/mips-backend/git-access-api-token
 
 externalSecrets:
   clusterSecretStoreName: maker-prod-eu

diff --git a/helm/prod/frontend.yaml b/helm/prod/frontend.yaml
@@ -10,9 +10,7 @@ service:
     issuerName: letsencrypt
 
 image:
-  repository: ${ECR_REGISTRY}/mips-frontend-prod
   pullPolicy: Always
-  tag: latest
 
 serviceAccount:
   create: false

diff --git a/helm/staging/backend.yaml b/helm/staging/backend.yaml
@@ -10,9 +10,7 @@ service:
     issuerName: letsencrypt
 
 image:
-  repository: ${ECR_REGISTRY}/mips-backend-staging
   pullPolicy: Always
-  tag: latest
 
 serviceAccount:
   create: false

diff --git a/helm/staging/frontend.yaml b/helm/staging/frontend.yaml
@@ -10,9 +10,7 @@ service:
     issuerName: letsencrypt
 
 image:
-  repository: ${ECR_REGISTRY}/mips-frontend-staging
   pullPolicy: Always
-  tag: latest
 
 serviceAccount:
   create: false