public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

deps: update dockerfile dependencies (#421) 

* deps: helm 3.10.0

Signed-off-by: Rui Chen <rui@chenrui.dev>
This commit is contained in:
Rui Chen 2022-10-12 08:41:26 -04:00 committed by GitHub
parent 97ce31d7c8
commit ffce09a35f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/Makefile vendored
View File

@ -1,5 +1,5 @@
HELM_VERSION ?= v3.7.2 HELM_VERSION ?= v3.7.2
KUSTOMIZE_VERSION ?= v3.8.8 KUSTOMIZE_VERSION ?= v4.5.7
K8S_VERSION ?= v1.13.12 K8S_VERSION ?= v1.13.12
MINIKUBE_VERSION ?= v0.30.0 MINIKUBE_VERSION ?= v0.30.0
SOPS_VERSION ?= v3.6.1 SOPS_VERSION ?= v3.6.1
@ -41,7 +41,7 @@ minikube/destroy:
.EXPORT_ALL_VARIABLES: minikube/destroy .EXPORT_ALL_VARIABLES: minikube/destroy
minikube: minikube:
curl -sSLo ${tmp}/kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl curl -sSLo ${tmp}/kubectl https://dl.k8s.io/release/${K8S_VERSION}/bin/linux/amd64/kubectl
chmod +x ${tmp}/kubectl && sudo mv ${tmp}/kubectl /usr/local/bin/ chmod +x ${tmp}/kubectl && sudo mv ${tmp}/kubectl /usr/local/bin/
curl -sSLo ${tmp}/minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64 curl -sSLo ${tmp}/minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64
chmod +x ${tmp}/minikube && sudo mv ${tmp}/minikube /usr/local/bin/ chmod +x ${tmp}/minikube && sudo mv ${tmp}/minikube /usr/local/bin/

24
Dockerfile
View File

@ -17,8 +17,8 @@ LABEL org.opencontainers.image.source https://github.com/helmfile/helmfile
RUN apk add --no-cache ca-certificates git bash curl jq openssh-client RUN apk add --no-cache ca-certificates git bash curl jq openssh-client
ARG HELM_VERSION="v3.9.0" ARG HELM_VERSION="v3.10.0"
ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
@ -33,18 +33,18 @@ RUN set -x && \
# using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/ # using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/
# for now but in a future version of alpine (in the testing version at the time of writing) # for now but in a future version of alpine (in the testing version at the time of writing)
# we should be able to install using apk add. # we should be able to install using apk add.
# the sha256 sum can be found at https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256 # the sha256 sum can be found at https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256
# maybe a good idea to automate in the future? # maybe a good idea to automate in the future?
ENV KUBECTL_VERSION="v1.21.4" ENV KUBECTL_VERSION="v1.25.2"
ENV KUBECTL_SHA256="9410572396fb31e49d088f9816beaebad7420c7686697578691be1651d3bf85a" ENV KUBECTL_SHA256="8639f2b9c33d38910d706171ce3d25be9b19fc139d0e3d4627f38ce84f9040eb"
RUN set -x && \ RUN set -x && \
curl --retry 5 --retry-connrefused -LO "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \ curl --retry 5 --retry-connrefused -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
sha256sum kubectl | grep ${KUBECTL_SHA256} && \ sha256sum kubectl | grep ${KUBECTL_SHA256} && \
chmod +x kubectl && \ chmod +x kubectl && \
mv kubectl /usr/local/bin/kubectl mv kubectl /usr/local/bin/kubectl
ENV KUSTOMIZE_VERSION="v3.8.8" ENV KUSTOMIZE_VERSION="v4.5.7"
ENV KUSTOMIZE_SHA256="175938206f23956ec18dac3da0816ea5b5b485a8493a839da278faac82e3c303" ENV KUSTOMIZE_SHA256="701e3c4bfa14e4c520d481fdf7131f902531bfc002cb5062dcf31263a09c70c9"
RUN set -x && \ RUN set -x && \
curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \ curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \ sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \
@ -66,10 +66,10 @@ RUN set -x && \
mv age/age-keygen /usr/local/bin/age-keygen && \ mv age/age-keygen /usr/local/bin/age-keygen && \
rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.5.0 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.6.0 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.1.1 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.14.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0 helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.12.0
# Allow users other than root to use helm plugins located in root home # Allow users other than root to use helm plugins located in root home
RUN chmod 751 /root RUN chmod 751 /root

24
Dockerfile.debian-stable-slim
View File

@ -21,8 +21,8 @@ RUN apt update -qq && \
git bash curl jq wget openssh-client && \ git bash curl jq wget openssh-client && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG HELM_VERSION="v3.9.0" ARG HELM_VERSION="v3.10.0"
ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
@ -37,18 +37,18 @@ RUN set -x && \
# using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/ # using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/
# for now but in a future version of alpine (in the testing version at the time of writing) # for now but in a future version of alpine (in the testing version at the time of writing)
# we should be able to install using apk add. # we should be able to install using apk add.
# the sha256 sum can be found at https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256 # the sha256 sum can be found at https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256
# maybe a good idea to automate in the future? # maybe a good idea to automate in the future?
ENV KUBECTL_VERSION="v1.21.4" ENV KUBECTL_VERSION="v1.25.2"
ENV KUBECTL_SHA256="9410572396fb31e49d088f9816beaebad7420c7686697578691be1651d3bf85a" ENV KUBECTL_SHA256="8639f2b9c33d38910d706171ce3d25be9b19fc139d0e3d4627f38ce84f9040eb"
RUN set -x && \ RUN set -x && \
wget "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \ wget "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
sha256sum kubectl | grep ${KUBECTL_SHA256} && \ sha256sum kubectl | grep ${KUBECTL_SHA256} && \
chmod +x kubectl && \ chmod +x kubectl && \
mv kubectl /usr/local/bin/kubectl mv kubectl /usr/local/bin/kubectl
ENV KUSTOMIZE_VERSION="v3.8.8" ENV KUSTOMIZE_VERSION="v4.5.7"
ENV KUSTOMIZE_SHA256="175938206f23956ec18dac3da0816ea5b5b485a8493a839da278faac82e3c303" ENV KUSTOMIZE_SHA256="701e3c4bfa14e4c520d481fdf7131f902531bfc002cb5062dcf31263a09c70c9"
RUN set -x && \ RUN set -x && \
curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \ curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \ sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \
@ -70,10 +70,10 @@ RUN set -x && \
mv age/age-keygen /usr/local/bin/age-keygen && \ mv age/age-keygen /usr/local/bin/age-keygen && \
rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.5.0 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.6.0 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.1.1 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.14.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0 helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.12.0
# Allow users other than root to use helm plugins located in root home # Allow users other than root to use helm plugins located in root home
RUN chmod 751 /root RUN chmod 751 /root

24
Dockerfile.ubuntu
View File

@ -21,8 +21,8 @@ RUN apt-get update && \
git bash curl jq wget openssh-client && \ git bash curl jq wget openssh-client && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
ARG HELM_VERSION="v3.9.0" ARG HELM_VERSION="v3.10.0"
ARG HELM_SHA256="1484ffb0c7a608d8069470f48b88d729e88c41a1b6602f145231e8ea7b43b50a" ARG HELM_SHA256="bf56beb418bb529b5e0d6d43d56654c5a03f89c98400b409d1013a33d9586474"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
@ -37,18 +37,18 @@ RUN set -x && \
# using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/ # using the install documentation found at https://kubernetes.io/docs/tasks/tools/install-kubectl/
# for now but in a future version of alpine (in the testing version at the time of writing) # for now but in a future version of alpine (in the testing version at the time of writing)
# we should be able to install using apk add. # we should be able to install using apk add.
# the sha256 sum can be found at https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256 # the sha256 sum can be found at https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256
# maybe a good idea to automate in the future? # maybe a good idea to automate in the future?
ENV KUBECTL_VERSION="v1.21.4" ENV KUBECTL_VERSION="v1.25.2"
ENV KUBECTL_SHA256="9410572396fb31e49d088f9816beaebad7420c7686697578691be1651d3bf85a" ENV KUBECTL_SHA256="8639f2b9c33d38910d706171ce3d25be9b19fc139d0e3d4627f38ce84f9040eb"
RUN set -x && \ RUN set -x && \
curl --retry 5 --retry-connrefused -LO "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \ curl --retry 5 --retry-connrefused -LO "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
sha256sum kubectl | grep ${KUBECTL_SHA256} && \ sha256sum kubectl | grep ${KUBECTL_SHA256} && \
chmod +x kubectl && \ chmod +x kubectl && \
mv kubectl /usr/local/bin/kubectl mv kubectl /usr/local/bin/kubectl
ENV KUSTOMIZE_VERSION="v3.8.8" ENV KUSTOMIZE_VERSION="v4.5.7"
ENV KUSTOMIZE_SHA256="175938206f23956ec18dac3da0816ea5b5b485a8493a839da278faac82e3c303" ENV KUSTOMIZE_SHA256="701e3c4bfa14e4c520d481fdf7131f902531bfc002cb5062dcf31263a09c70c9"
RUN set -x && \ RUN set -x && \
curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \ curl --retry 5 --retry-connrefused -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz && \
sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \ sha256sum kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | grep ${KUSTOMIZE_SHA256} && \
@ -70,10 +70,10 @@ RUN set -x && \
mv age/age-keygen /usr/local/bin/age-keygen && \ mv age/age-keygen /usr/local/bin/age-keygen && \
rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age rm -rf age-${AGE_VERSION}-linux-amd64.tar.gz age
RUN helm plugin install https://github.com/databus23/helm-diff --version v3.5.0 && \ RUN helm plugin install https://github.com/databus23/helm-diff --version v3.6.0 && \
helm plugin install https://github.com/jkroepke/helm-secrets --version v3.5.0 && \ helm plugin install https://github.com/jkroepke/helm-secrets --version v4.1.1 && \
helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.10.0 && \ helm plugin install https://github.com/hypnoglow/helm-s3.git --version v0.14.0 && \
helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.10.0 helm plugin install https://github.com/aslafy-z/helm-git.git --version v0.12.0
# Allow users other than root to use helm plugins located in root home # Allow users other than root to use helm plugins located in root home
RUN chmod 751 /root RUN chmod 751 /root

2
pkg/helmexec/exec_test.go
View File

@ -728,7 +728,7 @@ exec: helm --kube-context dev chart pull chart --untar --untardir /tmp/dir
{ {
name: "more then v3.7.0", name: "more then v3.7.0",
helmBin: "helm", helmBin: "helm",
helmVersion: "v3.9.0", helmVersion: "v3.10.0",
chartName: "repo/helm-charts:0.14.0", chartName: "repo/helm-charts:0.14.0",
chartPath: "path1", chartPath: "path1",
chartFlags: []string{"--untardir", "/tmp/dir"}, chartFlags: []string{"--untardir", "/tmp/dir"},