Merge pull request #19 from cmdlabs/helm-v3

Helm v3

Author: aarongorka

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.0] - 2019-12-17
+### Changed
+- helm v3
+### Removed
+- velero
+- kubectx
+- helm tiller
+
 ## [0.10.0] - 2019-11-26
 ### Updated
  - alpine to 3.10

Dockerfile

@@ -3,52 +3,29 @@ FROM alpine:3.10
 #Versions
 ENV KUBECTL_VERSION="1.14.6/2019-08-22"
 ENV AWS_VERSION="1.16.290"
-ENV HELM_VERSION="2.16.1"
-ENV HELM_TILLER_VERSION="0.9.3"
-ENV HELM_DIFF_VERSION="v2.11.0+5"
-ENV KUBECTX_VERSION="0.7.1"
-ENV VELERO_VERSION="1.2.0"
+ENV AWS_VERSION="1.16.191"
+ENV HELM_VERSION="3.0.1"
+ENV HELM_DIFF_VERSION="3.0.0-rc.7"
 
 #Install Packages
-RUN apk add --update --no-cache bash bash-completion curl git groff make ca-certificates less jq python3 fzf ncurses coreutils gettext-dev
+RUN apk add --update --no-cache bash bash-completion curl git make ca-certificates less jq python3 coreutils gettext-dev
 
 #kubectl
-RUN curl -L https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl && \
+RUN curl -sL https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl && \
     chmod +x /usr/local/bin/kubectl
 
 #helm
-RUN curl -L https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz -o /tmp/helm.tar.gz && \
+RUN curl -sL https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz -o /tmp/helm.tar.gz && \
     tar -xvzf /tmp/helm.tar.gz -C /tmp && \
     mv /tmp/linux-amd64/helm /usr/local/bin/helm && \
-    mv /tmp/linux-amd64/tiller /usr/local/bin/tiller && \
     chmod +x /usr/local/bin/helm && \
-    chmod +x /usr/local/bin/tiller && \
-    helm init -c && \
-    helm plugin install https://github.com/rimusz/helm-tiller --version ${HELM_TILLER_VERSION}  && \
-    helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} && \
+    helm repo add stable https://kubernetes-charts.storage.googleapis.com/ && \
     helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator && \
+    helm plugin install https://github.com/databus23/helm-diff --version v${HELM_DIFF_VERSION} && \
     rm -rf /tmp/*
 
 #aws-cli
-RUN pip3 install awscli==${AWS_VERSION}
-
-#kubectx
-RUN curl -L https://github.com/ahmetb/kubectx/archive/v${KUBECTX_VERSION}.tar.gz -o /tmp/kubectx.tar.gz && \
-    tar -xvzf /tmp/kubectx.tar.gz -C /tmp && \
-    mv /tmp/kubectx-${KUBECTX_VERSION}/kubectx /usr/local/bin/kubectx && \
-    mv /tmp/kubectx-${KUBECTX_VERSION}/kubens /usr/local/bin/kubens && \
-    chmod +x /usr/local/bin/kubectx && \
-    chmod +x /usr/local/bin/kubens && \
-    mv /tmp/kubectx-${KUBECTX_VERSION}/completion/kubectx.bash /usr/share/bash-completion/completions/kubectx.bash && \
-    mv /tmp/kubectx-${KUBECTX_VERSION}/completion/kubens.bash /usr/share/bash-completion/completions/kubens.bash && \
-    rm -rf /tmp/*
-
-#velero
-RUN curl -L https://github.com/heptio/velero/releases/download/v${VELERO_VERSION}/velero-v${VELERO_VERSION}-linux-amd64.tar.gz -o /tmp/velero.tar.gz && \
-    tar -xvzf /tmp/velero.tar.gz -C /tmp && \
-    mv /tmp/velero-v${VELERO_VERSION}-linux-amd64/velero /usr/local/bin/velero && \
-    chmod +x /usr/local/bin/velero && \
-    rm -rf /tmp/*
+RUN pip3 install --no-cache-dir awscli==${AWS_VERSION}
 
 #General Setup
 RUN mkdir /work

Makefile

@@ -1,4 +1,4 @@
-VERSION = 0.10.0
+VERSION = 1.0.0
 IMAGE_NAME ?= cmdlabs/eks-utils
 
 build:

README.md

@@ -8,30 +8,26 @@ https://hub.docker.com/r/cmdlabs/eks-utils
 docker-eks-utils implements a container containing a variety of tools for managing your EKS cluster.
 
   * kubectl
-  * Helm, including the [Tillerless Helm][] plugin
+  * Helm v3
   * awscli
-  * [kubectx][] (including [kubens][])
-  * [velero][]
-
-[Tillerless Helm]: https://github.com/rimusz/helm-tiller
-[kubectx]: https://github.com/ahmetb/kubectx
-[kubens]: https://github.com/ahmetb/kubectx/blob/master/kubens
-[velero]: https://github.com/heptio/velero
 
 ## Usage
 
 This container can be used with the [3 Musketeers][] pattern:
 
   * docker-compose.yml
 ```yml
+version: '3.7'
+services:
   eks:
-    image: cmdlabs/eks-utils:0.10.0
+    image: cmdlabs/eks-utils:1.0.0
     env_file: .env
     working_dir: /work
     volumes:
       - .:/work
       - ~/.kube:/root/.kube
       - ~/.aws:/root/.aws
+      - ~/.helm/repository:/root/.helm/repository
 ```
 
   * Makefile

run_tests.sh

@@ -4,7 +4,5 @@ set -euxo pipefail
 
 kubectl --help
 helm --help
-helm tiller --help
 #Cant test helm diff as it requires a kubernetes cluster
 aws --version
-velero help