Merge branch 'master' into cloudflare_ssl

valorem-labs-inc · Apr 12, 2023 · 79a462a · 79a462a
2 parents 0cdf84d + 516245a
commit 79a462a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -148,4 +148,26 @@ jobs:
           DOCKERFILE: indexer.dockerfile
         run: |
           docker build -f $DOCKERFILE -t $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA .
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA
+  update-k8s:
+    name: Update Manifests
+    needs: [ deploy-ecr ]
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_PAT }}
+      - name: Update service-indexer-manifests tag with git hash
+        run: |
+          sed -i "s/COMMIT_HASH/${GITHUB_SHA}/g" ./k8s-manifests/template-deployment.txt
+          mv ./k8s-manifests/template-deployment.txt ./k8s-manifests/deployment.yml
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "[GitHub] Updating manifests [skip ci]"
+          commit_user_name: GitHub Actions
+          commit_user_email: noreply@github.com
+          commit_author: GitHub Actions <noreply@github.com>
+          file_pattern: '*-manifests/*.yml'
diff --git a/k8s-manifests/deployment.yml b/k8s-manifests/deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: quay-indexer
-        image: 707302395155.dkr.ecr.us-east-1.amazonaws.com/quay:c0c54f4a7bdfc1192d1299b76a7eda6c1f252b93
+        image: 707302395155.dkr.ecr.us-east-1.amazonaws.com/quay:27a0161511f208096b634137e05f9af0d1769d7e
         env:
           - name: APP_DATABASE__DATABASE_NAME
             valueFrom:
@@ -85,24 +85,17 @@ spec:
       labels:
         app: quay-web-api
     spec:
-      topologySpreadConstraints:
-        - maxSkew: 2
-          topologyKey: kubernetes.io/hostname
-          whenUnsatisfiable: ScheduleAnyway
-          labelSelector:
-            matchLabels:
-              app: quay-web-api
       containers:
       - name: quay-web-api
-        image: 707302395155.dkr.ecr.us-east-1.amazonaws.com/quay-web-api:c0c54f4a7bdfc1192d1299b76a7eda6c1f252b93
+        image: 707302395155.dkr.ecr.us-east-1.amazonaws.com/quay-web-api:27a0161511f208096b634137e05f9af0d1769d7e
         ports:
           - name: http
-            containerPort: 443
+            containerPort: 8000
         env:
           - name: PORT
-            value: "443"
+            value: "8000"
           - name: APP_APPLICATION__PORT
-            value: "443"
+            value: "8000"
           - name: APP_APPLICATION__BASE_URL
             valueFrom:
               secretKeyRef: