Merge pull request #2281 from Sefaria/json-cleanup

fix(helm): remove json file mount from rambi cronjob

.github/workflows/helm.yaml

@@ -14,19 +14,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up Helm
-        uses: azure/setup-helm@v1
-        with:
-          version: v3.5.0
+        uses: azure/[email protected]
       - name: Set up Python
         uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
       - name: Set up chart-testing
         uses: helm/[email protected]
         with:
           version: v3.5.1
       - name: Lint chart
-        run: ct lint --charts helm-chart/sefaria-project
+        run: ct lint --charts helm-chart/sefaria
 
   chart:
     name: Release Chart
@@ -87,9 +83,9 @@ jobs:
           wget -nv -nc -O yq https://github.com/mikefarah/yq/releases/download/v4.20.2/yq_linux_amd64
           chmod +x yq
       - name: Update chart version
-        run: ./yq -i e '.version = "${{ steps.chartVersion.outputs.chartVersion }}"' helm-chart/sefaria-project/Chart.yaml
+        run: ./yq -i e '.version = "${{ steps.chartVersion.outputs.chartVersion }}"' helm-chart/sefaria/Chart.yaml
       - name: Update chart appVersion
-        run: ./yq -i e '.appVersion = "${{ steps.appVersion.outputs.appVersion }}"' helm-chart/sefaria-project/Chart.yaml
+        run: ./yq -i e '.appVersion = "${{ steps.appVersion.outputs.appVersion }}"' helm-chart/sefaria/Chart.yaml
       - name: Publish Helm charts
         uses: stefanprodan/helm-gh-pages@master
         with:

build/ci/integration-helm-deploy.sh

@@ -21,5 +21,5 @@ yq e -i '.secrets.localSettings.data.SEFARIA_DB = "sefaria-integration"' $1
 yq e -i '.ingress.hosts[0].host = strenv(GIT_COMMIT)+".integration.sefaria.org"' $1
 yq e -i '.localSettings.FRONT_END_URL = "https://"+strenv(GIT_COMMIT)+".integration.sefaria.org"' $1
 
-helm upgrade -i $NAME ./helm-chart/sefaria-project --namespace $NAMESPACE -f $1 --debug --timeout=30m0s
+helm upgrade -i $NAME ./helm-chart/sefaria --namespace $NAMESPACE -f $1 --debug --timeout=30m0s
 

build/ci/sandbox-helm-deploy.sh

@@ -19,5 +19,5 @@ yq e -i '.monitor.containerImage.tag = strenv(TAG)' $1
 yq e -i '.deployEnv = strenv(NAME)' $1
 yq e -i '.localSettings.FRONT_END_URL = "https://"+strenv(NAME)+".cauldron.sefaria.org"' $1
 
-helm upgrade -i $NAME ./helm-chart/sefaria-project --namespace $NAMESPACE -f $1 --debug --timeout=30m0s
+helm upgrade -i $NAME ./helm-chart/sefaria --namespace $NAMESPACE -f $1 --debug --timeout=30m0s
 

helm-chart/sefaria-project/templates/cronjob/rambi-webpages-weekly.yaml → helm-chart/sefaria/templates/cronjob/rambi-webpages-weekly.yaml

@@ -45,9 +45,6 @@ spec:
                 name: local-settings
                 subPath: local_settings.py
                 readOnly: true
-              - mountPath: /google-cloud-secret
-                name: backup-manager-secret
-                readOnly: true
             command: ["bash"]
             args: [
               "-c",
@@ -66,9 +63,6 @@ spec:
               items:
                 - key: local_settings.py
                   path: local_settings.py
-          - name: backup-manager-secret  # used to access google cloud
-            secret:
-              secretName: {{ template "sefaria.secrets.backupManager" . }}
   successfulJobsHistoryLimit: 1
   failedJobsHistoryLimit: 2
 {{- end }}