Merge pull request #33 from tribofustack/chore/update-configmap

Chore/update configmap

Author: LucasGomesSantos

.github/workflows/apply.yaml

@@ -6,7 +6,7 @@ jobs:
   apply:
     runs-on: ubuntu-latest
     env:
-      GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CRED }}
+      GOOGLE_CREDENTIALS: ${{ secrets.CREDENTIALS }}
 
     steps:
       - name: Checkout Repo
@@ -15,7 +15,7 @@ jobs:
       - name: Auth GCloud
         uses: 'google-github-actions/auth@v2.1.2'
         with:
-            credentials_json: ${{ secrets.GOOGLE_CRED }}
+            credentials_json: ${{ secrets.CREDENTIALS }}
             export_environment_variables: true
             create_credentials_file: true
 
@@ -28,11 +28,25 @@ jobs:
       - name: Setup Cluster Kubernetes
         uses: 'google-github-actions/get-gke-credentials@v2'
         with:
-          cluster_name: ${{ vars.CLUSTER }}
+          cluster_name: ${{ vars.CLUSTER_NAME }}
           location: ${{ vars.ZONE }}
 
       - name: Setup Namespace
         run: kubectl config set-context --current --namespace=orderly
 
+      - name: Create ConfigMap
+        working-directory: k8s/
+        run: |
+          echo "$(cat api-configmap.yaml)" | envsubst | kubectl apply -f -
+        env:
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          DB_IP: ${{ vars.DB_IP }}
+          DB_USERNAME: ${{ vars.DB_USERNAME }}
+          DB_NAME: ${{ vars.DB_NAME }}
+
+
       - name: apply api
-        run: kubectl apply -f k8s/
+        run: |
+          kubectl apply -f k8s/api-deployment.yaml
+          kubectl apply -f k8s/api-hpa.yaml
+          kubectl apply -f k8s/api-service.yaml

.github/workflows/destroy.yaml

@@ -6,7 +6,7 @@ jobs:
   destroy:
     runs-on: ubuntu-latest
     env:
-      GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CRED }}
+      GOOGLE_CREDENTIALS: ${{ secrets.CREDENTIALS }}
 
     steps:
       - name: Checkout Repo
@@ -15,7 +15,7 @@ jobs:
       - name: Auth GCloud
         uses: 'google-github-actions/auth@v2.1.2'
         with:
-            credentials_json: ${{ secrets.GOOGLE_CRED }}
+            credentials_json: ${{ secrets.CREDENTIALS }}
             export_environment_variables: true
             create_credentials_file: true
 
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Cluster Kubernetes
         uses: 'google-github-actions/get-gke-credentials@v2'
         with:
-          cluster_name: ${{ vars.CLUSTER }}
+          cluster_name: ${{ vars.CLUSTER_NAME }}
           location: ${{ vars.ZONE }}
 
       - name: Setup Namespace

k8s/api-configmap.yaml

@@ -5,11 +5,11 @@ metadata:
 data:
   PORT: "3000"
   NODE_ENV: "production"
-  DB_HOST: "34.31.179.110" # db-service
-  DB_USERNAME: "postgres-user" # "postgres"
+  DB_HOST: "${DB_IP}" # db-service
+  DB_USERNAME: "${DB_USERNAME}" # "postgres"
   DB_PORT: "5432"
-  DB_PASSWORD: "postgres-pass" # "postgres"
-  DB_NAME: "orderly-db" # postgres
+  DB_PASSWORD: "${DB_PASSWORD}" # "postgres"
+  DB_NAME: "${DB_NAME}" # postgres
   DB_DIALECT: postgres
   CACHE_HOST: cache-service
   CACHE_PORT: "6379"