From c468dad23c4b4de4cef1af930c285a7045a4010b Mon Sep 17 00:00:00 2001
From: Tuan Anh Tran <me@tuananh.org>
Date: Tue, 10 Oct 2017 13:38:16 +0700
Subject: [PATCH] fix: invalid tag, add requirements to readme, remove -w arg
 to base64

---
 README.md | 7 ++++++-
 deploy.sh | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 75b31c1..8773a38 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
 # Fluentd image to send Kubernetes logs to CloudWatch
 
+
+## Requirements
+
+* envsubst: this is part of `gettext` package. If you're on macOS and using `brew`, you will have to force link `brew link --force gettext`
+
 ## Deployment
 
 1. Create AWS IAM user which has permission to store logs to CloudWatch
@@ -28,7 +33,7 @@ LOGGING_AWS_ACCESS_KEY_ID=<your key> LOGGING_AWS_SECRET_ACCESS_KEY=<your secret>
 
 ## Removal
 
-1. If you set custom values for the namespace or resource name environment variables, 
+1. If you set custom values for the namespace or resource name environment variables,
 ensure they are still set to your values (`NAMESPACE`,`APP_NAME`,`SECRET_NAME`,`CONFIG_NAME`)
 
 2. Run `delete.sh`
diff --git a/deploy.sh b/deploy.sh
index dd626ad..6a97480 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -14,7 +14,7 @@ set -e
 : ${CONFIG_NAME:=$APP_NAME}
 : ${ENV_NAME:=system}
 : ${NAMESPACE:=kube-system}
-: ${IMAGE_NAME:=callstats/fluentd-kubernetes-cloudwatch:v1.1.2}
+: ${IMAGE_NAME:=callstats/fluentd-kubernetes-cloudwatch:latest}
 : ${CW_LOG_GROUP:=kubernetes-cluster}
 
 #
@@ -38,8 +38,8 @@ metadata:
     app: $APP_NAME
     env: $ENV_NAME
 data:
-  AWS_ACCESS_KEY_ID: $(echo -n "${LOGGING_AWS_ACCESS_KEY_ID}" | base64 -w 0)
-  AWS_SECRET_ACCESS_KEY: $(echo -n "${LOGGING_AWS_SECRET_ACCESS_KEY}" | base64 -w 0)
+  AWS_ACCESS_KEY_ID: $(echo -n "${LOGGING_AWS_ACCESS_KEY_ID}" | base64)
+  AWS_SECRET_ACCESS_KEY: $(echo -n "${LOGGING_AWS_SECRET_ACCESS_KEY}" | base64)
 END
 
 #