Add Mumbai

islamic-network · Jun 16, 2023 · 4586300 · 4586300
1 parent 3cf01d2
commit 4586300
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -49,7 +49,28 @@ jobs:
           export REF_NAME=${{ github.ref_name }}
           COMMIT_TAG=$REF_NAME
           export COMMIT_TAG=$REF_NAME
-          envsubst <./.k8s/manifest-london.yml >./.k8s/manifest-london.yml.out
-          mv ./.k8s/manifest-london.yml.out ./.k8s/manifest-london.yml
-          kubectl apply -f .k8s/manifest-london.yml --kubeconfig=/dev/null --server=$K8S_URL --certificate-authority=cert.crt --token=$K8S_TOKEN
+          envsubst <./.k8s/manifest.yml >./.k8s/manifest.yml.out
+          mv ./.k8s/manifest.yml.out ./.k8s/manifest.yml
+          kubectl apply -f .k8s/manifest.yml --kubeconfig=/dev/null --server=$K8S_URL --certificate-authority=cert.crt --token=$K8S_TOKEN
+
+  deploy-mumbai:
+    needs: docker-build-and-push
+    runs-on: ubuntu-latest
+    container:
+      image: meezaan/kubectl:latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Update Consumer and Keys
+        run: |
+          export K8S_URL=${{ secrets.K8S_MUMBAI_URL }}
+          export K8S_TOKEN=${{ secrets.K8S_MUMBAI_TOKEN }}
+          export K8S_CA=${{ secrets.K8S_MUMBAI_CA }}
+          echo "$K8S_CA" | base64 --decode > cert.crt
+          export REF_NAME=${{ github.ref_name }}
+          COMMIT_TAG=$REF_NAME
+          export COMMIT_TAG=$REF_NAME
+          envsubst <./.k8s/manifest.yml >./.k8s/manifest.yml.out
+          mv ./.k8s/manifest.yml.out ./.k8s/manifest.yml
+          kubectl apply -f .k8s/manifest.yml --kubeconfig=/dev/null --server=$K8S_URL --certificate-authority=cert.crt --token=$K8S_TOKEN
 
diff --git a/.k8s/manifest-london.yml → .k8s/manifest-aks.yml b/.k8s/manifest-london.yml → .k8s/manifest-aks.yml
@@ -19,10 +19,17 @@ spec:
       labels:
         app: alquran-cloud-api-memcached
     spec:
+      nodeSelector:
+        kubernetes.azure.com/scalesetpriority: "spot"
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: ScheduleAnyway
+      tolerations:
+        - key: kubernetes.azure.com/scalesetpriority
+          operator: "Equal"
+          value: spot
+          effect: NoSchedule
       containers:
         - name: alquran-cloud-api-memcached
           image: memcached:1.6
@@ -126,6 +133,11 @@ spec:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: ScheduleAnyway
+      tolerations:
+        - key: kubernetes.azure.com/scalesetpriority
+          operator: "Equal"
+          value: spot
+          effect: NoSchedule
       containers:
         - name: alquran-cloud-api
           image: islamicnetwork/api.alquran.cloud:$COMMIT_TAG

diff --git a/.k8s/manifest.yml b/.k8s/manifest.yml
@@ -19,17 +19,10 @@ spec:
       labels:
         app: alquran-cloud-api-memcached
     spec:
-      nodeSelector:
-        kubernetes.azure.com/scalesetpriority: "spot"
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: ScheduleAnyway
-      tolerations:
-        - key: kubernetes.azure.com/scalesetpriority
-          operator: "Equal"
-          value: spot
-          effect: NoSchedule
       containers:
         - name: alquran-cloud-api-memcached
           image: memcached:1.6
@@ -133,11 +126,6 @@ spec:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname
           whenUnsatisfiable: ScheduleAnyway
-      tolerations:
-        - key: kubernetes.azure.com/scalesetpriority
-          operator: "Equal"
-          value: spot
-          effect: NoSchedule
       containers:
         - name: alquran-cloud-api
           image: islamicnetwork/api.alquran.cloud:$COMMIT_TAG
@@ -223,7 +211,8 @@ spec:
   tls:
   - hosts:
     - "api.alquran.cloud"
-    - "dubai.api.alquran.cloud"
+    - "london.api.alquran.cloud"
+    - "mumbai.api.alquran.cloud"
     secretName: "alquran-cloud-api-tls"
   rules:
   - host: api.alquran.cloud
@@ -236,7 +225,17 @@ spec:
               name: alquran-cloud-api
               port: 
                 number: 80
-  - host: dubai.api.alquran.cloud
+  - host: london.api.alquran.cloud
+    http:
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: alquran-cloud-api
+              port: 
+                number: 80
+  - host: mumbai.api.alquran.cloud
     http:
       paths:
         - path: /