From b8b5a153c1ae771c61628227f20b38cf78cd948e Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 8 Nov 2022 15:41:45 +0000 Subject: [PATCH 1/6] Update docs staging image tag to stage-090ad16f-1667922055 --- k8s/docs/values-stage.yaml | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 k8s/docs/values-stage.yaml diff --git a/k8s/docs/values-stage.yaml b/k8s/docs/values-stage.yaml new file mode 100644 index 0000000000..82d3c2ccf6 --- /dev/null +++ b/k8s/docs/values-stage.yaml @@ -0,0 +1,46 @@ +replicaCount: 1 +image: + repository: gcr.io/airqo-250220/airqo-stage-docs + pullPolicy: Always + tag: stage-090ad16f-1667922055 +imagePullSecrets: [] +nameOverride: '' +fullnameOverride: '' +podAnnotations: {} +podSecurityContext: {} +securityContext: {} +service: + type: NodePort + port: 3000 + protocol: TCP + targetPort: 3000 + nodePort: 31104 +ingress: + enabled: false +resources: + limits: + cpu: 50m + memory: 100Mi + requests: + cpu: 10m + memory: 20Mi +autoscaling: + minReplicas: 1 + maxReplicas: 2 + targetCPUUtilizationPercentage: 80 +nodeSelector: {} +tolerations: [] +affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 10 + preference: + matchExpressions: + - key: node-type + operator: In + values: + - general-purpose +app: + name: airqo-stage-docs + label: sta-docs + namespace: staging From 730f2d14da15f9f93687b4b3a694939b8c742133 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 8 Nov 2022 15:56:45 +0000 Subject: [PATCH 2/6] Update netmanger staging image tag to stage-45ddd0db-1667922355 --- k8s/netmanager/values-stage.yaml | 61 ++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml index 1a69ba0b8e..46caf139ab 100644 --- a/k8s/netmanager/values-stage.yaml +++ b/k8s/netmanager/values-stage.yaml @@ -1,35 +1,50 @@ -# values for platform frontend. -env: - deployment_name: airqo-stage-platform-frontend - service_name: airqo-stage-platform-ui-svc - labels: sta-platform-ui - secret: env-platform-staging - replicaCount: 2 - image: - repository: us.gcr.io/airqo-250220/airqo-stage-platform-frontend - tag: latest + repository: gcr.io/airqo-250220/airqo-stage-platform-frontend + tag: stage-45ddd0db-1667922355 pullPolicy: Always - imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - +nameOverride: '' +fullnameOverride: '' service: type: NodePort - nodePort: 31104 + nodePort: 31101 targetPort: 80 port: 80 - ingress: enabled: false - nodeSelector: {} -resources: {} -affinity: {} torelations: {} - - -## Application level settings -appMode: staging \ No newline at end of file +resources: + requests: + cpu: 5m + memory: 20Mi + limits: + cpu: 50m + memory: 80Mi +autoscaling: + minReplicas: 1 + maxReplicas: 3 + targetMemoryUtilizationPercentage: 80 +affinity: + nodeAffinity: + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 10 + preference: + matchExpressions: + - key: node-type + operator: In + values: + - general-purpose + - weight: 1 + preference: + matchExpressions: + - key: node-type + operator: In + values: + - high-memory +app: + name: airqo-stage-platform-frontend + label: airqo-platform + namespace: staging + configmap: env-platform-staging From 222fa11d6dedb6ee8010b1d8c5ffbd6754fbe1ac Mon Sep 17 00:00:00 2001 From: Mike Mwanje Date: Fri, 11 Nov 2022 10:10:11 +0300 Subject: [PATCH 3/6] add pr-preview image names --- k8s/calibrate/values-dev.yaml | 2 +- k8s/docs/values-dev.yaml | 2 +- k8s/netmanager/values-dev.yaml | 2 +- k8s/platform/values-dev.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/calibrate/values-dev.yaml b/k8s/calibrate/values-dev.yaml index 32937a7049..b4a96494ad 100644 --- 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/values-dev.yaml b/k8s/docs/values-dev.yaml index 82b753ca71..43284c10a6 100644 --- 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 index 5fff9866f2..44178a90a5 100644 --- 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/platform/values-dev.yaml b/k8s/platform/values-dev.yaml index c42c2a4396..70c007c828 100644 --- 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 From 6d312608e9efc4ecaf646a1620b55f6e2e21448c Mon Sep 17 00:00:00 2001 From: Mike Mwanje Date: Fri, 11 Nov 2022 10:17:56 +0300 Subject: [PATCH 4/6] remove auto update for deploy previews --- .../workflows/deploy-frontend-pr-previews.yml | 64 +++---------------- 1 file changed, 8 insertions(+), 56 deletions(-) diff --git a/.github/workflows/deploy-frontend-pr-previews.yml b/.github/workflows/deploy-frontend-pr-previews.yml index c77b52977e..47c2de5087 100644 --- a/.github/workflows/deploy-frontend-pr-previews.yml +++ b/.github/workflows/deploy-frontend-pr-previews.yml @@ -120,6 +120,8 @@ jobs: cd netmanager/ 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 gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:latest + docker push gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:latest - name: Deploy to Cloud Run run: |- @@ -136,20 +138,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": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews", - "image.tag": "${{ github.sha }}" - } - - name: Get preview service url id: preview-url run: | @@ -222,6 +210,8 @@ jobs: cd calibrate/ 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 gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:latest + docker push gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:latest - name: Deploy to Cloud Run run: |- @@ -238,20 +228,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": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews", - "image.tag": "${{ github.sha }}" - } - - name: Get preview service url id: preview-url run: | @@ -315,6 +291,8 @@ jobs: cd platform/ 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 gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:latest + docker push gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:latest - name: Deploy to Cloud Run run: |- @@ -329,20 +307,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": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews", - "image.tag": "${{ github.sha }}" - } - - name: Get preview service url id: preview-url run: | @@ -403,6 +367,8 @@ jobs: cd docs/ 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 gcr.io/airqo-250220/pr-previews/docs-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/docs-pr-previews:latest + docker push gcr.io/airqo-250220/pr-previews/docs-pr-previews:latest - name: Deploy to Cloud Run run: |- @@ -417,20 +383,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": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews", - "image.tag": "${{ github.sha }}" - } - - name: Get preview service url id: preview-url run: | From 963a82b93b2a4db9fd52edf10feabf015c673cce Mon Sep 17 00:00:00 2001 From: Mike Mwanje Date: Fri, 11 Nov 2022 10:56:01 +0300 Subject: [PATCH 5/6] add missing helm autogenerate files --- k8s/calibrate/charts/.gitkeep | 0 .../templates/tests/test-connection.yaml | 15 +++++++++++++++ k8s/docs/charts/.gitkeep | 0 k8s/docs/templates/tests/test-connection.yaml | 15 +++++++++++++++ k8s/platform/charts/.gitkeep | 0 k8s/platform/templates/tests/test-connection.yaml | 15 +++++++++++++++ 6 files changed, 45 insertions(+) create mode 100644 k8s/calibrate/charts/.gitkeep create mode 100644 k8s/calibrate/templates/tests/test-connection.yaml create mode 100644 k8s/docs/charts/.gitkeep create mode 100644 k8s/docs/templates/tests/test-connection.yaml create mode 100644 k8s/platform/charts/.gitkeep create mode 100644 k8s/platform/templates/tests/test-connection.yaml diff --git a/k8s/calibrate/charts/.gitkeep b/k8s/calibrate/charts/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/k8s/calibrate/templates/tests/test-connection.yaml b/k8s/calibrate/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..b1586c4461 --- /dev/null +++ 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/docs/charts/.gitkeep b/k8s/docs/charts/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/k8s/docs/templates/tests/test-connection.yaml b/k8s/docs/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..a933c654de --- /dev/null +++ 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/platform/charts/.gitkeep b/k8s/platform/charts/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/k8s/platform/templates/tests/test-connection.yaml b/k8s/platform/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..20e7a84822 --- /dev/null +++ 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 From ab93db7390ecca4dd9870692dfba4e0bccb655a8 Mon Sep 17 00:00:00 2001 From: Mike Mwanje Date: Thu, 17 Nov 2022 19:04:42 +0300 Subject: [PATCH 6/6] use gihub action global env --- .../workflows/deploy-frontend-pr-previews.yml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-frontend-pr-previews.yml b/.github/workflows/deploy-frontend-pr-previews.yml index 47c2de5087..bdb1145194 100644 --- a/.github/workflows/deploy-frontend-pr-previews.yml +++ b/.github/workflows/deploy-frontend-pr-previews.yml @@ -5,6 +5,10 @@ on: branches: - staging +env: + REGISTRY_URL: gcr.io + PROJECT_ID: airqo-250220 + jobs: branch-name: name: Format branch name string @@ -120,8 +124,8 @@ jobs: cd netmanager/ 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 gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:latest - docker push gcr.io/airqo-250220/pr-previews/netmanager-pr-previews:latest + 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: |- @@ -210,8 +214,8 @@ jobs: cd calibrate/ 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 gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:latest - docker push gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews:latest + 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: |- @@ -291,8 +295,8 @@ jobs: cd platform/ 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 gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:latest - docker push gcr.io/airqo-250220/pr-previews/next-platform-pr-previews:latest + 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: |- @@ -367,8 +371,8 @@ jobs: cd docs/ 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 gcr.io/airqo-250220/pr-previews/docs-pr-previews:${{ github.sha }} gcr.io/airqo-250220/pr-previews/docs-pr-previews:latest - docker push gcr.io/airqo-250220/pr-previews/docs-pr-previews:latest + 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: |-