Merge pull request #888 from Sefaria/prod-pipeline

Prod pipeline
Sefaria · Jun 14, 2022 · 440136f · 440136f
2 parents db36a44 + 4da992f
commit 440136f
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 73 deletions.
diff --git a/.github/workflows/production-deploy.yaml b/.github/workflows/production-deploy.yaml
@@ -117,7 +117,7 @@ jobs:
       - name: Deploy Sandbox
         run: ./build/ci/production-helm-deploy.sh build/ci/production-values.yaml
         env:
-          GIT_COMMIT: "${{ github.ref }}"
+          GIT_COMMIT: "${{ github.ref_name }}"
           PROJECT_ID: "${{ secrets.PROD_GKE_PROJECT }}"
           NAMESPACE: "${{secrets.PROD_GKE_NAMESPACE}}"
           CHART_VERSION: 0.0.12

diff --git a/helm-chart/sefaria-project/templates/cronjob/daily-email-notifications.yaml b/helm-chart/sefaria-project/templates/cronjob/daily-email-notifications.yaml
@@ -24,13 +24,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/index-from-queue.yaml b/helm-chart/sefaria-project/templates/cronjob/index-from-queue.yaml
@@ -35,13 +35,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/metrics.yaml b/helm-chart/sefaria-project/templates/cronjob/metrics.yaml
@@ -24,13 +24,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/mongo-backup.yaml b/helm-chart/sefaria-project/templates/cronjob/mongo-backup.yaml
@@ -34,14 +34,14 @@ spec:
           - name: mongo-dumper
             image:  mongo:4.4
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - configMapRef:
-                  name: local-settings-{{ .Values.deployEnv }}
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - configMapRef:
+                name: local-settings-{{ .Values.deployEnv }}
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
             volumeMounts:
             - name: shared-volume
               mountPath: /mongodumps/shared_volume

diff --git a/helm-chart/sefaria-project/templates/cronjob/nation-builder-sync.yaml b/helm-chart/sefaria-project/templates/cronjob/nation-builder-sync.yaml
@@ -31,13 +31,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/regenerate-long-cached-data.yaml b/helm-chart/sefaria-project/templates/cronjob/regenerate-long-cached-data.yaml
@@ -24,13 +24,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/reindex-elasticsearch.yaml b/helm-chart/sefaria-project/templates/cronjob/reindex-elasticsearch.yaml
@@ -44,13 +44,13 @@ spec:
                   name: {{ template "sefaria.secrets.slackWebhook" . }}
                   key: slack-webhook
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py

diff --git a/helm-chart/sefaria-project/templates/cronjob/sitemaps.yaml b/helm-chart/sefaria-project/templates/cronjob/sitemaps.yaml
@@ -37,13 +37,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - name: shared-volume
@@ -54,7 +54,6 @@ spec:
                 readOnly: true
             command: ["bash"]
             args: ["-c", "/app/run /app/scripts/generate_sitemaps.py -o /storage/"]
-
           containers:
           - name: file-uploader
             image: google/cloud-sdk

diff --git a/helm-chart/sefaria-project/templates/cronjob/topics-indexing.yaml b/helm-chart/sefaria-project/templates/cronjob/topics-indexing.yaml
@@ -27,14 +27,14 @@ spec:
               - name: VARNISH_HOST
                 value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
               envFrom:
-                - secretRef:
-                    name: {{ .Values.secrets.localSettings.ref }}
-                    optional: true
-                - configMapRef:
+              - secretRef:
+                  name: {{ .Values.secrets.localSettings.ref }}
+                  optional: true
+              - configMapRef:
                   name: local-settings-{{ .Values.deployEnv }}
-                - secretRef:
-                    name: local-settings-secrets-{{ .Values.deployEnv }}
-                    optional: true
+              - secretRef:
+                  name: local-settings-secrets-{{ .Values.deployEnv }}
+                  optional: true
               volumeMounts:
                 - mountPath: /app/sefaria/local_settings.py
                   name: local-settings

diff --git a/helm-chart/sefaria-project/templates/cronjob/weekly-email-notifications.yaml b/helm-chart/sefaria-project/templates/cronjob/weekly-email-notifications.yaml
@@ -24,13 +24,13 @@ spec:
             - name: VARNISH_HOST
               value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
             envFrom:
-              - secretRef:
-                  name: {{ .Values.secrets.localSettings.ref }}
-                  optional: true
-              - secretRef:
-                  name: local-settings-secrets-{{ .Values.deployEnv }}
-                  optional: true
-              - configMapRef:
+            - secretRef:
+                name: {{ .Values.secrets.localSettings.ref }}
+                optional: true
+            - secretRef:
+                name: local-settings-secrets-{{ .Values.deployEnv }}
+                optional: true
+            - configMapRef:
                 name: local-settings-{{ .Values.deployEnv }}
             volumeMounts:
               - mountPath: /app/sefaria/local_settings.py