diff --git a/kubernetes/lookit/base/patches_/add-lookit-env-vars-to-second-container.yaml b/kubernetes/lookit/base/patches_/add-lookit-env-vars-to-second-container.yaml index 0768fab..f95cc76 100644 --- a/kubernetes/lookit/base/patches_/add-lookit-env-vars-to-second-container.yaml +++ b/kubernetes/lookit/base/patches_/add-lookit-env-vars-to-second-container.yaml @@ -392,46 +392,6 @@ key: PIPE_WEBHOOK_KEY name: lookit-secrets -- op: add - path: /spec/template/spec/containers/1/env/- - value: - name: S3_REGION - valueFrom: - secretKeyRef: - key: S3_REGION - name: lookit-secrets - optional: true - -- op: add - path: /spec/template/spec/containers/1/env/- - value: - name: S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - key: S3_ACCESS_KEY_ID - name: lookit-secrets - optional: true - -- op: add - path: /spec/template/spec/containers/1/env/- - value: - name: S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - key: S3_SECRET_ACCESS_KEY - name: lookit-secrets - optional: true - -- op: add - path: /spec/template/spec/containers/1/env/- - value: - name: S3_BUCKET - valueFrom: - secretKeyRef: - key: S3_BUCKET - name: lookit-secrets - optional: true - - op: add path: /spec/template/spec/containers/1/env/- value: diff --git a/kubernetes/lookit/base/patches_/add-lookit-env-vars.yaml b/kubernetes/lookit/base/patches_/add-lookit-env-vars.yaml index 21c9588..1473ed6 100644 --- a/kubernetes/lookit/base/patches_/add-lookit-env-vars.yaml +++ b/kubernetes/lookit/base/patches_/add-lookit-env-vars.yaml @@ -392,45 +392,12 @@ key: PIPE_WEBHOOK_KEY name: lookit-secrets -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: S3_REGION - valueFrom: - secretKeyRef: - key: S3_REGION - name: lookit-secrets - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - key: S3_ACCESS_KEY_ID - name: lookit-secrets - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - key: S3_SECRET_ACCESS_KEY - name: lookit-secrets - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: S3_BUCKET - valueFrom: - secretKeyRef: - key: S3_BUCKET - name: lookit-secrets - optional: true + + + - op: add path: /spec/template/spec/containers/0/env/- diff --git a/kubernetes/lookit/base/patches_/replace-lookit-env-vars.yaml b/kubernetes/lookit/base/patches_/replace-lookit-env-vars.yaml index 843a697..f39552f 100644 --- a/kubernetes/lookit/base/patches_/replace-lookit-env-vars.yaml +++ b/kubernetes/lookit/base/patches_/replace-lookit-env-vars.yaml @@ -209,30 +209,6 @@ secretKeyRef: key: PIPE_WEBHOOK_KEY name: lookit-secrets - - name: S3_REGION - valueFrom: - secretKeyRef: - key: S3_REGION - name: lookit-secrets - optional: true - - name: S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - key: S3_ACCESS_KEY_ID - name: lookit-secrets - optional: true - - name: S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - key: S3_SECRET_ACCESS_KEY - name: lookit-secrets - optional: true - - name: S3_BUCKET - valueFrom: - secretKeyRef: - key: S3_BUCKET - name: lookit-secrets - optional: true - name: SECRET_KEY valueFrom: secretKeyRef: diff --git a/kubernetes/lookit/environments/production/cloudsql-client-creds.json.enc b/kubernetes/lookit/environments/production/cloudsql-client-creds.json.enc index 216e174..68099b3 100644 Binary files a/kubernetes/lookit/environments/production/cloudsql-client-creds.json.enc and b/kubernetes/lookit/environments/production/cloudsql-client-creds.json.enc differ diff --git a/kubernetes/lookit/environments/production/googleAppCreds.json.enc b/kubernetes/lookit/environments/production/googleAppCreds.json.enc index dc5c27c..9893f2c 100644 Binary files a/kubernetes/lookit/environments/production/googleAppCreds.json.enc and b/kubernetes/lookit/environments/production/googleAppCreds.json.enc differ diff --git a/kubernetes/lookit/environments/production/lookit-secrets.env.enc b/kubernetes/lookit/environments/production/lookit-secrets.env.enc index 04709ee..21b7e05 100644 Binary files a/kubernetes/lookit/environments/production/lookit-secrets.env.enc and b/kubernetes/lookit/environments/production/lookit-secrets.env.enc differ diff --git a/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc b/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc index b3e92d4..559fe1f 100644 Binary files a/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc and b/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc differ diff --git a/kubernetes/lookit/environments/staging/googleAppCreds.json.enc b/kubernetes/lookit/environments/staging/googleAppCreds.json.enc index 7e60bc3..01a4ee5 100644 Binary files a/kubernetes/lookit/environments/staging/googleAppCreds.json.enc and b/kubernetes/lookit/environments/staging/googleAppCreds.json.enc differ diff --git a/kubernetes/lookit/environments/staging/lookit-secrets.env.enc b/kubernetes/lookit/environments/staging/lookit-secrets.env.enc index a3461d0..decc2ab 100644 Binary files a/kubernetes/lookit/environments/staging/lookit-secrets.env.enc and b/kubernetes/lookit/environments/staging/lookit-secrets.env.enc differ