Initial commit

rpksh · Apr 9, 2019 · 6124480 · 6124480
1 parent 076722c
commit 6124480
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/challenge2/README.md b/challenge2/README.md
@@ -18,7 +18,7 @@ buckets)
  - build from alpine:3.7 base image.
  - fluent is installed to the base image.
  - custom entrypoint script is copied.
- - entrypoint.sh check for the fluent configuration and stop the container on error.
+ - entrypoint.sh check for the fluent configuration and stop the container on configuration error.
  - fluent starts if there is no issue with the configuration.
 
 ## Helm chart details `nginx-helm-chart/`

diff --git a/challenge2/nginx-helm-chart/templates/deployment.yaml b/challenge2/nginx-helm-chart/templates/deployment.yaml
@@ -52,22 +52,22 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: aws_secrets
-                key: AWS_KEY_ID
+                key: aws_key_id
           - name: AWS_SECRET_KEY
             valueFrom:
               secretKeyRef:
                 name: aws_secrets
-                key: AWS_SECRET_KEY
+                key: aws_secret_key
           - name: S3_BUCKET_NAME
             valueFrom:
               secretKeyRef:
                 name: aws_secrets
-                key: S3_BUCKET_NAME
+                key: s3_bucket_name
           - name: S3_REGION
             valueFrom:
               secretKeyRef:
                 name: aws_secrets
-                key: S3_REGION
+                key: s3_region
           volumeMounts:
           - name: log-storage
             mountPath: /mnt/log

diff --git a/challenge2/nginx-helm-chart/templates/secret.yaml b/challenge2/nginx-helm-chart/templates/secret.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/name: {{ template "nginx.name" . }}
 type: Opaque
 data:
-  AWS_KEY_ID: {{ b64enc "aws_key_id_goes_here" }}
-  AWS_SECRET_KEY: {{ b64enc "aws_secret_key_goes_here" }}
-  S3_BUCKET_NAME: {{ b64enc "s3_bucket_name_goes_here" }}
-  S3_REGION: {{ b64enc "s3_region_goes_here" }}
+  aws_key_id: {{ b64enc "aws_key_id_goes_here" }}
+  aws_secret_key: {{ b64enc "aws_secret_key_goes_here" }}
+  s3_bucket_name: {{ b64enc "s3_bucket_name_goes_here" }}
+  s3_region: {{ b64enc "s3_region_goes_here" }}