Merge pull request #17 from sorry-cypress/change-bucket-access-defaul…

…t-variable Change S3 access default variables
sorry-cypress · Jan 13, 2021 · ac57871 · ac57871
2 parents 50a6e92 + cc2e0d0
commit ac57871
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -108,8 +108,8 @@ https://sorry-cypress.dev/director/configuration
 | `director.environmentVariables.screenshotsDriver` | Set the screenshots driver. Valid options are `"../screenshots/dummy.driver"` and `"../screenshots/s3.driver"`                                                               | `"../screenshots/dummy.driver"`  |
 | `director.s3.bucketName`                          | Set the screenshots storage bucket name, if the screenshots driver is set to `"../screenshots/s3.driver"`                                                                    | `example-bucket`                 |
 | `director.s3.region`                              | Set the screenshots storage bucket region, if the screenshots driver is set to `"../screenshots/s3.driver"`                                                                  | `us-east-1`                      |
-| `director.s3.accessKey`                           | The `AWS_ACCESS_KEY_ID` environment variable to configure AWS credentials, if the screenshots driver is set to `"../screenshots/s3.driver"`                                  | `abc`                            |
-| `director.s3.secretAccessKey`                     | The `AWS_SECRET_ACCESS_KEY` environment variable to configure AWS credentials, if the screenshots driver is set to `"../screenshots/s3.driver"`                              | `zyx`                            |
+| `director.s3.accessKey`                           | The `AWS_ACCESS_KEY_ID` environment variable to configure AWS credentials, if the screenshots driver is set to `"../screenshots/s3.driver"`                                  | `""`                             |
+| `director.s3.secretAccessKey`                     | The `AWS_SECRET_ACCESS_KEY` environment variable to configure AWS credentials, if the screenshots driver is set to `"../screenshots/s3.driver"`                              | `""`                             |
 | `director.podAnnotations`                         | Set annotations for pods                                                                                                                                                     | `{}`                             |
 | `director.podLabels`                              | Set additional labels for pods                                                                                                                                               | `{}`                             |
 | `director.service.port`                           | Kubernetes service port                                                                                                                                                      | `4000`                           |

diff --git a/charts/sorry-cypress/Chart.yaml b/charts/sorry-cypress/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sorry-cypress
 description: A Helm chart for Sorry Cypress
 type: application
-version: 0.1.13
+version: 0.1.14
 appVersion: 0.6.1
 home: https://sorry-cypress.dev/
 sources:

diff --git a/charts/sorry-cypress/templates/deployment-director.yml b/charts/sorry-cypress/templates/deployment-director.yml
@@ -41,14 +41,18 @@ spec:
           value: {{ .Values.director.s3.bucketName }}
         - name: S3_REGION
           value: {{ .Values.director.s3.region }}
+        {{- with .Values.director.s3.accessKeyId }}
         - name: AWS_ACCESS_KEY_ID
-          value: {{ .Values.director.s3.accessKeyId }}
+          value: {{ . }}
+        {{- end }}
+        {{- if .Values.director.s3.secretAccessKey }}
         - name: AWS_SECRET_ACCESS_KEY
           valueFrom:
             secretKeyRef:
               name: {{ include "sorry-cypress-helm.fullname" . }}-s3Secrets
               key: AWS_SECRET_ACCESS_KEY
         {{- end }}
+        {{- end }}
         image: "{{ .Values.director.image.repository }}:{{ .Values.director.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.director.image.pullPolicy }}
         name: {{ include "sorry-cypress-helm.fullname" . }}-director

diff --git a/charts/sorry-cypress/templates/secret-s3SecretAccessKey.yml b/charts/sorry-cypress/templates/secret-s3SecretAccessKey.yml
@@ -1,4 +1,4 @@
-{{- if eq .Values.director.environmentVariables.screenshotsDriver "../screenshots/s3.driver" -}}
+{{- if and (eq .Values.director.environmentVariables.screenshotsDriver "../screenshots/s3.driver") (.Values.director.s3.secretAccessKey) -}}
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/charts/sorry-cypress/values.yaml b/charts/sorry-cypress/values.yaml
@@ -131,8 +131,8 @@ director:
   s3:
     bucketName: example-bucket
     region: us-east-1
-    accessKeyId: abc
-    secretAccessKey: zyx
+    accessKeyId: ""
+    secretAccessKey: ""
 
   # Set annotations for pods
   podAnnotations: {}