Merge pull request #41 from lookit/add-s3-env-vars-staging

Add S3 env vars to patch files (with optional: true) and prod/statging secrets files
lookit · Jun 5, 2023 · ad0d18f · ad0d18f
2 parents a9d8926 + fcb2838
commit ad0d18f
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 3 deletions.
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
@@ -392,6 +392,46 @@
         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
@@ -392,12 +392,45 @@
         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
@@ -209,6 +209,30 @@
         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
diff --git a/kubernetes/lookit/environments/production/googleAppCreds.json.enc b/kubernetes/lookit/environments/production/googleAppCreds.json.enc
diff --git a/kubernetes/lookit/environments/production/lookit-secrets.env.enc b/kubernetes/lookit/environments/production/lookit-secrets.env.enc
diff --git a/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc b/kubernetes/lookit/environments/staging/cloudsql-client-creds.json.enc
diff --git a/kubernetes/lookit/environments/staging/googleAppCreds.json.enc b/kubernetes/lookit/environments/staging/googleAppCreds.json.enc
diff --git a/kubernetes/lookit/environments/staging/lookit-secrets.env.enc b/kubernetes/lookit/environments/staging/lookit-secrets.env.enc