Use the IRSA for the json bucket

ministryofjustice · Sep 6, 2023 · e906f3d · e906f3d
1 parent 6b01291
commit e906f3d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -47,16 +47,16 @@
 
   # Annotate rendered view with file names.
   # config.action_view.annotate_rendered_view_with_filenames = true
-  config.x.s3_internal_bucket_config = {
-    access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
-    secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
-    stub_responses: true
-  }
-  config.x.s3_external_bucket_config = {
-    access_key_id: ENV.fetch('AWS_S3_EXTERNAL_BUCKET_ACCESS_KEY_ID'),
-    secret_access_key: ENV.fetch('AWS_S3_EXTERNAL_BUCKET_SECRET_ACCESS_KEY'),
-    stub_responses: true
-  }
+  # config.x.s3_internal_bucket_config = {
+  #   access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID'),
+  #   secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY'),
+  #   stub_responses: true
+  # }
+  # config.x.s3_external_bucket_config = {
+  #   access_key_id: ENV.fetch('AWS_S3_EXTERNAL_BUCKET_ACCESS_KEY_ID'),
+  #   secret_access_key: ENV.fetch('AWS_S3_EXTERNAL_BUCKET_SECRET_ACCESS_KEY'),
+  #   stub_responses: true
+  # }
 
   config.hosts.clear
 end
diff --git a/deploy-eks/fb-user-filestore-chart/templates/deployment.yaml b/deploy-eks/fb-user-filestore-chart/templates/deployment.yaml
@@ -105,21 +105,21 @@ spec:
               secretKeyRef:
                 name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
                 key: bucket_name
-          - name: AWS_S3_EXTERNAL_BUCKET_ARN
-            valueFrom:
-              secretKeyRef:
-                name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
-                key: bucket_arn
-          - name: AWS_S3_EXTERNAL_BUCKET_ACCESS_KEY_ID
-            valueFrom:
-              secretKeyRef:
-                name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
-                key: access_key_id
-          - name: AWS_S3_EXTERNAL_BUCKET_SECRET_ACCESS_KEY
-            valueFrom:
-              secretKeyRef:
-                name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
-                key: secret_access_key
+          # - name: AWS_S3_EXTERNAL_BUCKET_ARN
+          #   valueFrom:
+          #     secretKeyRef:
+          #       name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
+          #       key: bucket_arn
+          # - name: AWS_S3_EXTERNAL_BUCKET_ACCESS_KEY_ID
+          #   valueFrom:
+          #     secretKeyRef:
+          #       name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
+          #       key: access_key_id
+          # - name: AWS_S3_EXTERNAL_BUCKET_SECRET_ACCESS_KEY
+          #   valueFrom:
+          #     secretKeyRef:
+          #       name: json-output-attachments-s3-bucket-{{ .Values.environmentName }}
+          #       key: secret_access_key
       volumes:
         - name: tmp-files
           emptyDir: {}