diff --git a/Dockerfile b/Dockerfile index b91bb5ad..26d4b093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,24 @@ ARG ALPINE_VERSION="3.12" ARG GLOBAL_KUBE_VERSION="v1.19.0" ARG GLOBAL_HELM_VERSION="v3.3.4" ARG GLOBAL_HELM_DIFF_VERSION="v3.1.3" +ARG GLOBAL_SOPS_VERSION="v3.7.0" ### Helm Installer ### FROM alpine:${ALPINE_VERSION} as helm-installer ARG GLOBAL_KUBE_VERSION ARG GLOBAL_HELM_VERSION ARG GLOBAL_HELM_DIFF_VERSION +ARG GLOBAL_SOPS_VERSION ENV KUBE_VERSION=$GLOBAL_KUBE_VERSION ENV HELM_VERSION=$GLOBAL_HELM_VERSION ENV HELM_DIFF_VERSION=$GLOBAL_HELM_DIFF_VERSION +ENV SOPS_VERSION=$GLOBAL_SOPS_VERSION RUN apk add --update --no-cache ca-certificates git openssh ruby curl tar gzip make bash +ADD https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux /usr/local/bin/sops +RUN chmod +x /usr/local/bin/sops + RUN curl --retry 5 -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl RUN chmod +x /usr/local/bin/kubectl @@ -25,7 +31,7 @@ RUN chmod +x /usr/local/bin/helm RUN helm plugin install https://github.com/hypnoglow/helm-s3.git RUN helm plugin install https://github.com/nouney/helm-gcs RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} -RUN helm plugin install https://github.com/futuresimple/helm-secrets +RUN helm plugin install https://github.com/jkroepke/helm-secrets RUN rm -r /tmp/helm-diff /tmp/helm-diff.tgz ### Go Builder & Tester ### diff --git a/Makefile b/Makefile index e8767a9f..e518c685 100644 --- a/Makefile +++ b/Makefile @@ -95,5 +95,5 @@ helmPlugins: ## Install helm plugins used by Helmsman @helm plugin install https://github.com/hypnoglow/helm-s3.git @helm plugin install https://github.com/nouney/helm-gcs @helm plugin install https://github.com/databus23/helm-diff - @helm plugin install https://github.com/futuresimple/helm-secrets + @helm plugin install https://github.com/jkroepke/helm-secrets .PHONY: helmPlugins diff --git a/docs/how_to/apps/secrets.md b/docs/how_to/apps/secrets.md index 01d91d8d..d5697de7 100644 --- a/docs/how_to/apps/secrets.md +++ b/docs/how_to/apps/secrets.md @@ -73,7 +73,7 @@ BAR: baz ## Passing secrets using helm secrets plugin -You can also use the [helm secrets plugin](https://github.com/futuresimple/helm-secrets) to pass your secrets. +You can also use the [helm secrets plugin](https://github.com/jkroepke/helm-secrets) to pass your secrets. ## Passing secrets using hiera eyaml diff --git a/scripts/setup.sh b/scripts/setup.sh index 9a753ced..e5f30a32 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -6,6 +6,9 @@ apk add --update --no-cache ca-certificates git openssh ruby curl tar gzip make curl --retry 5 -L https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl chmod +x /usr/local/bin/kubectl +curl --retry 5 -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux -o /usr/local/bin/sops +chmod +x /usr/local/bin/sops + curl --retry 5 -L https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar zxv -C /tmp mv /tmp/linux-amd64/helm /usr/local/bin/helm rm -rf /tmp/linux-amd64 @@ -15,6 +18,6 @@ mkdir -p ~/.helm/plugins helm plugin install https://github.com/hypnoglow/helm-s3.git helm plugin install https://github.com/nouney/helm-gcs helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION} -helm plugin install https://github.com/futuresimple/helm-secrets +helm plugin install https://github.com/jkroepke/helm-secrets rm -r /tmp/helm-diff /tmp/helm-diff.tgz gem install hiera-eyaml --no-doc