Merge branch 'staging' into fix-imageRegistry

airqo-platform · Nov 21, 2022 · 17c40e3 · 17c40e3
2 parents f3e1b2b + 281812a
commit 17c40e3
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 254 deletions.
diff --git a/.github/workflows/deploy-frontend-pr-previews.yml b/.github/workflows/deploy-frontend-pr-previews.yml
@@ -119,8 +119,10 @@ jobs:
       - name: Build and Push Image
         run: |
           cd netmanager/
-          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }} ./
-          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }}
+          docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }} ./
+          docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -137,20 +139,6 @@ jobs:
             --command="/bin/sh","-c","cat /etc/env/.env >> /etc/environment; nginx -g 'daemon off;'" \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/netmanager/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)netmanager image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -218,8 +206,10 @@ jobs:
       - name: Build and Push Image
         run: |
           cd calibrate/
-          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }} .
-          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }}
+          docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }} .
+          docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -236,20 +226,6 @@ jobs:
             --command="/bin/sh","-c","cat /etc/env/.env >> /etc/environment; nginx -g 'daemon off;'" \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/calibrate/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)calibrate app image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -308,8 +284,10 @@ jobs:
       - name: Build and Push Image
         run: |
           cd platform/
-          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }} .
-          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }}
+          docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }} .
+          docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -324,20 +302,6 @@ jobs:
             --memory=256Mi \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/platform/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)next platform image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -393,8 +357,10 @@ jobs:
       - name: Build and Push Image
         run: |
           cd docs/
-          docker build --tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }} .
-          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }}
+          docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }} .
+          docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -409,20 +375,6 @@ jobs:
             --memory=256Mi \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/docs/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)docs app image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |

diff --git a/k8s/calibrate/charts/.gitkeep b/k8s/calibrate/charts/.gitkeep
diff --git a/k8s/calibrate/templates/tests/test-connection.yaml b/k8s/calibrate/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "calibrate-app.fullname" . }}-test-connection"
+  labels:
+{{ include "calibrate-app.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "calibrate-app.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/calibrate/values-dev.yaml b/k8s/calibrate/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-calibrate-app
+  repository: gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews
   pullPolicy: Always
   tag: latest
 

diff --git a/k8s/docs/charts/.gitkeep b/k8s/docs/charts/.gitkeep
diff --git a/k8s/docs/templates/tests/test-connection.yaml b/k8s/docs/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "airqo-docs.fullname" . }}-test-connection"
+  labels:
+{{ include "airqo-docs.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "airqo-docs.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/docs/values-dev.yaml b/k8s/docs/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-docs
+  repository: gcr.io/airqo-250220/pr-previews/docs-pr-previews
   pullPolicy: Always
   tag: latest
 

diff --git a/k8s/netmanager/values-dev.yaml b/k8s/netmanager/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: airqo-dev-platform-frontend
+  repository: gcr.io/airqo-250220/pr-previews/netmanager-pr-previews
   tag: latest
   pullPolicy: Always
 

diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml
@@ -10,15 +10,13 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
-
 service:
   type: NodePort
   nodePort: 31101
   targetPort: 80
   port: 80
 ingress:
   enabled: false
-
 nodeSelector: {}
 torelations: {}
 

diff --git a/k8s/platform/charts/.gitkeep b/k8s/platform/charts/.gitkeep
diff --git a/k8s/platform/templates/tests/test-connection.yaml b/k8s/platform/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "platform.fullname" . }}-test-connection"
+  labels:
+{{ include "platform.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "platform.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/platform/values-dev.yaml b/k8s/platform/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-next-platform
+  repository: gcr.io/airqo-250220/pr-previews/next-platform-pr-previews
   pullPolicy: Always
   tag: latest
 

diff --git a/mobile/lib/models/models.dart b/mobile/lib/models/models.dart
@@ -10,4 +10,3 @@ export 'kya.dart';
 export 'notification.dart';
 export 'place_details.dart';
 export 'profile.dart';
-export 'suggestion.dart';
diff --git a/mobile/lib/models/suggestion.dart b/mobile/lib/models/suggestion.dart
diff --git a/mobile/lib/models/suggestion.g.dart b/mobile/lib/models/suggestion.g.dart