Skip to content

Commit

Permalink
fix(eks): Use latest aws authenticator (#1107)
Browse files Browse the repository at this point in the history
- Use latest version of the aws authenticator
- Use aws-iam-authenticator instead of deprecated heptio-authenticator-aws
See - https://docs.aws.amazon.com/eks/latest/userguide/getting-started.html
Signed-off-by: S.Cavallo <smcavallo@hotmail.com>
  • Loading branch information
smcavallo authored and ezimanyi committed Dec 7, 2018
1 parent 26bbc0e commit 1fe697c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Expand Up @@ -3,7 +3,7 @@ FROM openjdk:8
MAINTAINER delivery-engineering@netflix.com

ENV KUBECTL_RELEASE=1.10.3
ENV HEPTIO_BINARY_RELEASE_DATE=2018-06-05
ENV AWS_BINARY_RELEASE_DATE=2018-07-26

COPY . workdir/

Expand All @@ -23,11 +23,11 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECT
chmod +x ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl

RUN curl -o heptio-authenticator-aws https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${HEPTIO_BINARY_RELEASE_DATE}/bin/linux/amd64/heptio-authenticator-aws && \
chmod +x ./heptio-authenticator-aws && \
mv ./heptio-authenticator-aws /usr/local/bin/heptio-authenticator-aws
RUN curl -o heptio-authenticator-aws https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${AWS_BINARY_RELEASE_DATE}/bin/linux/amd64/aws-iam-authenticator && \
chmod +x ./aws-iam-authenticator && \
mv ./aws-iam-authenticator /usr/local/bin/aws-iam-authenticator

ENV PATH "$PATH:/usr/local/bin/heptio-authenticator-aws"
ENV PATH "$PATH:/usr/local/bin/aws-iam-authenticator"

RUN wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
python /tmp/get-pip.py && \
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.local
Expand Up @@ -3,7 +3,7 @@ FROM openjdk:8
MAINTAINER delivery-engineering@netflix.com

ENV KUBECTL_RELEASE=1.10.3
ENV HEPTIO_BINARY_RELEASE_DATE=2018-06-05
ENV AWS_BINARY_RELEASE_DATE=2018-07-26

COPY . workdir/

Expand All @@ -22,11 +22,11 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECT
chmod +x ./kubectl && \
mv ./kubectl /usr/local/bin/kubectl

RUN curl -o heptio-authenticator-aws https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${HEPTIO_BINARY_RELEASE_DATE}/bin/linux/amd64/heptio-authenticator-aws && \
chmod +x ./heptio-authenticator-aws && \
mv ./heptio-authenticator-aws /usr/local/bin/heptio-authenticator-aws
RUN curl -o heptio-authenticator-aws https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${AWS_BINARY_RELEASE_DATE}/bin/linux/amd64/aws-iam-authenticator && \
chmod +x ./aws-iam-authenticator && \
mv ./aws-iam-authenticator /usr/local/bin/aws-iam-authenticator

ENV PATH "$PATH:/usr/local/bin/heptio-authenticator-aws"
ENV PATH "$PATH:/usr/local/bin/aws-iam-authenticator"

RUN useradd -m spinnaker

Expand Down

2 comments on commit 1fe697c

@ewiseblatt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke our build as aws-iam-authenticator does not exist. Is there some other change missing here?

@duftler
Copy link

@duftler duftler commented on 1fe697c Dec 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we were looking at the same time.
Fix is here: #1122

Please sign in to comment.