From 5d00821843d2fccf444ca69cba8b7e4e1612931d Mon Sep 17 00:00:00 2001
From: git config --global --edit <dimon.xr@gmail.com>
Date: Tue, 26 Feb 2019 10:35:54 -0800
Subject: [PATCH 1/2] add aws-iam-authenticator, update helmfile version,
 update diff plugin

---
 Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d720307..294d892 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.10.1-alpine3.7 as helmfile
-ENV HELMFILE_VERSION v0.40.1
+ENV HELMFILE_VERSION v0.45.3
 RUN apk add --no-cache make git
 RUN go get github.com/roboll/helmfile
 WORKDIR /go/src/github.com/roboll/helmfile/
@@ -19,7 +19,7 @@ RUN curl -sLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-r
     && chmod +x /usr/local/bin/kubectl
 
 ENV HELM_VERSION v2.12.2
-ENV HELM_DIFF_VERSION v2.11.0+2
+ENV HELM_DIFF_VERSION v2.11.0+3
 ENV HELM_SECRET_VERSION v1.3.1
 ENV HELM_HOME /helm
 RUN curl -sLo /tmp/helm.tar.gz https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
@@ -39,6 +39,9 @@ RUN wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VER
  && unzip -d /bin vault_${VAULT_VERSION}_linux_amd64.zip \
  && rm vault_${VAULT_VERSION}_linux_amd64.zip
 
+RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \
+ && chmod +x /usr/local/bin/aws-iam-authenticator
+
 COPY entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

From bd179b364e6d9e4a42cb081d7595690b52926197 Mon Sep 17 00:00:00 2001
From: git config --global --edit <dimon.xr@gmail.com>
Date: Tue, 26 Feb 2019 13:57:51 -0800
Subject: [PATCH 2/2] add env variables for version

---
 Dockerfile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 294d892..e68dd07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,12 @@ RUN make static-linux
 
 FROM alpine:3.8
 
+ENV HELM_VERSION v2.12.2
+ENV HELM_DIFF_VERSION v2.11.0+3
+ENV HELM_SECRET_VERSION v1.3.1
+ENV AWS_IAM_AUTH_VERSION 1.11.5/2018-12-06
+ENV VAULT_VERSION 0.10.1
+
 RUN apk --no-cache add curl bash make openssh jq ca-certificates git \
     && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-git-crypt/master/sgerrand.rsa.pub \
     && wget https://github.com/sgerrand/alpine-pkg-git-crypt/releases/download/0.6.0-r0/git-crypt-0.6.0-r0.apk \
@@ -18,9 +24,6 @@ RUN apk --no-cache add curl bash make openssh jq ca-certificates git \
 RUN curl -sLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
     && chmod +x /usr/local/bin/kubectl
 
-ENV HELM_VERSION v2.12.2
-ENV HELM_DIFF_VERSION v2.11.0+3
-ENV HELM_SECRET_VERSION v1.3.1
 ENV HELM_HOME /helm
 RUN curl -sLo /tmp/helm.tar.gz https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \
  && tar -zxf /tmp/helm.tar.gz -C /tmp/ \
@@ -34,12 +37,11 @@ RUN mkdir -p "$(helm home)/plugins" \
 
 COPY --from=helmfile /go/src/github.com/roboll/helmfile/dist/helmfile_linux_amd64 /usr/local/bin/helmfile
 
-ENV VAULT_VERSION 0.10.1
 RUN wget https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip \
  && unzip -d /bin vault_${VAULT_VERSION}_linux_amd64.zip \
  && rm vault_${VAULT_VERSION}_linux_amd64.zip
 
-RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator \
+RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/${AWS_IAM_AUTH_VERSION}/bin/linux/amd64/aws-iam-authenticator \
  && chmod +x /usr/local/bin/aws-iam-authenticator
 
 COPY entrypoint.sh /entrypoint.sh