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

bump helm to 3.13.2 (#1130) 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2023-11-12 11:03:09 +08:00 committed by GitHub
parent b8a729d8c4
commit 26f89e7e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci.yaml vendored
View File

@ -71,20 +71,20 @@ jobs:
plugin-diff-version: 3.8.1 plugin-diff-version: 3.8.1
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: '' v1mode: ''
- helm-version: v3.13.1 - helm-version: v3.13.2
kustomize-version: v4.4.1 kustomize-version: v4.4.1
plugin-secrets-version: 3.15.0 plugin-secrets-version: 3.15.0
plugin-diff-version: 3.7.0 plugin-diff-version: 3.7.0
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: '' v1mode: ''
- helm-version: v3.13.1 - helm-version: v3.13.2
kustomize-version: v4.5.7 kustomize-version: v4.5.7
plugin-secrets-version: 4.0.0 plugin-secrets-version: 4.0.0
plugin-diff-version: 3.8.1 plugin-diff-version: 3.8.1
extra-helmfile-flags: '' extra-helmfile-flags: ''
v1mode: '' v1mode: ''
# Helmfile v1 # Helmfile v1
- helm-version: v3.13.1 - helm-version: v3.13.2
kustomize-version: v4.5.7 kustomize-version: v4.5.7
plugin-secrets-version: 4.0.0 plugin-secrets-version: 4.0.0
plugin-diff-version: 3.8.1 plugin-diff-version: 3.8.1
@ -92,7 +92,7 @@ jobs:
v1mode: 'true' v1mode: 'true'
# In case you need to test some optional helmfile features, # In case you need to test some optional helmfile features,
# enable it via extra-helmfile-flags below. # enable it via extra-helmfile-flags below.
- helm-version: v3.13.1 - helm-version: v3.13.2
kustomize-version: v4.5.7 kustomize-version: v4.5.7
plugin-secrets-version: 4.0.0 plugin-secrets-version: 4.0.0
plugin-diff-version: 3.8.1 plugin-diff-version: 3.8.1

6
Dockerfile
View File

@ -30,7 +30,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}"
ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ARG HELM_DATA_HOME="${HOME}/.local/share/helm"
ENV HELM_DATA_HOME="${HELM_DATA_HOME}" ENV HELM_DATA_HOME="${HELM_DATA_HOME}"
ARG HELM_VERSION="v3.13.1" ARG HELM_VERSION="v3.13.2"
ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_VERSION="${HELM_VERSION}"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz"
@ -38,8 +38,8 @@ RUN set -x && \
curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \
echo Verifying ${HELM_FILENAME}... && \ echo Verifying ${HELM_FILENAME}... && \
case ${TARGETPLATFORM} in \ case ${TARGETPLATFORM} in \
"linux/amd64") HELM_SHA256="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \
"linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \
esac && \ esac && \
echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \
echo Extracting ${HELM_FILENAME}... && \ echo Extracting ${HELM_FILENAME}... && \

6
Dockerfile.debian-stable-slim
View File

@ -35,7 +35,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}"
ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ARG HELM_DATA_HOME="${HOME}/.local/share/helm"
ENV HELM_DATA_HOME="${HELM_DATA_HOME}" ENV HELM_DATA_HOME="${HELM_DATA_HOME}"
ARG HELM_VERSION="v3.13.1" ARG HELM_VERSION="v3.13.2"
ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_VERSION="${HELM_VERSION}"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz"
@ -43,8 +43,8 @@ RUN set -x && \
curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \
echo Verifying ${HELM_FILENAME}... && \ echo Verifying ${HELM_FILENAME}... && \
case ${TARGETPLATFORM} in \ case ${TARGETPLATFORM} in \
"linux/amd64") HELM_SHA256="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \
"linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \
esac && \ esac && \
echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \
echo Extracting ${HELM_FILENAME}... && \ echo Extracting ${HELM_FILENAME}... && \

6
Dockerfile.ubuntu
View File

@ -35,7 +35,7 @@ ENV HELM_CONFIG_HOME="${HELM_CONFIG_HOME}"
ARG HELM_DATA_HOME="${HOME}/.local/share/helm" ARG HELM_DATA_HOME="${HOME}/.local/share/helm"
ENV HELM_DATA_HOME="${HELM_DATA_HOME}" ENV HELM_DATA_HOME="${HELM_DATA_HOME}"
ARG HELM_VERSION="v3.13.1" ARG HELM_VERSION="v3.13.2"
ENV HELM_VERSION="${HELM_VERSION}" ENV HELM_VERSION="${HELM_VERSION}"
ARG HELM_LOCATION="https://get.helm.sh" ARG HELM_LOCATION="https://get.helm.sh"
ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz"
@ -43,8 +43,8 @@ RUN set -x && \
curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \ curl --retry 5 --retry-connrefused -LO "${HELM_LOCATION}/${HELM_FILENAME}" && \
echo Verifying ${HELM_FILENAME}... && \ echo Verifying ${HELM_FILENAME}... && \
case ${TARGETPLATFORM} in \ case ${TARGETPLATFORM} in \
"linux/amd64") HELM_SHA256="98c363564d00afd0cc3088e8f830f2a0eeb5f28755b3d8c48df89866374a1ed0" ;; \ "linux/amd64") HELM_SHA256="55a8e6dce87a1e52c61e0ce7a89bf85b38725ba3e8deb51d4a08ade8a2c70b2d" ;; \
"linux/arm64") HELM_SHA256="8c4a0777218b266a7b977394aaf0e9cef30ed2df6e742d683e523d75508d6efe" ;; \ "linux/arm64") HELM_SHA256="f5654aaed63a0da72852776e1d3f851b2ea9529cb5696337202703c2e1ed2321" ;; \
esac && \ esac && \
echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \ echo "${HELM_SHA256} ${HELM_FILENAME}" | sha256sum -c && \
echo Extracting ${HELM_FILENAME}... && \ echo Extracting ${HELM_FILENAME}... && \

2
pkg/app/init.go
View File

@ -18,7 +18,7 @@ import (
const ( const (
HelmRequiredVersion = "v3.12.3" HelmRequiredVersion = "v3.12.3"
HelmRecommendedVersion = "v3.13.1" HelmRecommendedVersion = "v3.13.2"
HelmDiffRecommendedVersion = "v3.8.1" HelmDiffRecommendedVersion = "v3.8.1"
HelmSecretsRecommendedVersion = "v4.1.1" HelmSecretsRecommendedVersion = "v4.1.1"
HelmGitRecommendedVersion = "v0.12.0" HelmGitRecommendedVersion = "v0.12.0"

6
pkg/state/state_test.go
View File

@ -3156,7 +3156,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) {
}, },
}, },
}, },
helmVersion: "3.13.1", helmVersion: "3.13.2",
expected: []struct { expected: []struct {
qualifiedChartName string qualifiedChartName string
chartName string chartName string
@ -3177,7 +3177,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) {
}, },
}, },
}, },
helmVersion: "3.13.1", helmVersion: "3.13.2",
wantErr: true, wantErr: true,
}, },
{ {
@ -3212,7 +3212,7 @@ func TestGetOCIQualifiedChartName(t *testing.T) {
}, },
}, },
}, },
helmVersion: "3.13.1", helmVersion: "3.13.2",
expected: []struct { expected: []struct {
qualifiedChartName string qualifiedChartName string
chartName string chartName string