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

build: update Helm to v3.18.2 and adjust related configurations (#2064) 

* build: update Helm to v3.18.2 and adjust related configurations

Signed-off-by: yxxhero <aiopsclub@163.com>

* fix tests

Signed-off-by: yxxhero <aiopsclub@163.com>

---------

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-06-04 21:33:00 +08:00 committed by GitHub
parent 6da4b1e4c5
commit 74985fc54c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,19 +69,19 @@ jobs:
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.1
extra-helmfile-flags: '' extra-helmfile-flags: ''
- helm-version: v3.18.1 - helm-version: v3.18.2
kustomize-version: v5.2.1 kustomize-version: v5.2.1
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.11.0 plugin-diff-version: 3.11.0
extra-helmfile-flags: '' extra-helmfile-flags: ''
- helm-version: v3.18.1 - helm-version: v3.18.2
kustomize-version: v5.4.3 kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.1
extra-helmfile-flags: '' extra-helmfile-flags: ''
# 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.18.1 - helm-version: v3.18.2
kustomize-version: v5.4.3 kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.1 plugin-diff-version: 3.12.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.18.1" ARG HELM_VERSION="v3.18.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="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \
"linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \
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.18.1" ARG HELM_VERSION="v3.18.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="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \
"linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \
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.18.1" ARG HELM_VERSION="v3.18.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="b1c7e8e261fd30f34c617282813ecafc63628fcd59a255a9fc51b1fe43394c05" ;; \ "linux/amd64") HELM_SHA256="c5deada86fe609deefdf40e9cbbe3da2f8cf3f6a4551a0ebe7886dc8fcf98bce" ;; \
"linux/arm64") HELM_SHA256="5ddc8fbd4b17857754a95be799543ceafa5aa9532b05f738ee590a76bb049988" ;; \ "linux/arm64") HELM_SHA256="03181a494a0916b370a100a5b2536104963b095be53fb23d1e29b2afb1c7de8d" ;; \
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.17.3" HelmRequiredVersion = "v3.17.3"
HelmRecommendedVersion = "v3.18.1" HelmRecommendedVersion = "v3.18.2"
HelmDiffRecommendedVersion = "v3.12.1" HelmDiffRecommendedVersion = "v3.12.1"
HelmSecretsRecommendedVersion = "v4.6.5" HelmSecretsRecommendedVersion = "v4.6.5"
HelmGitRecommendedVersion = "v1.3.0" HelmGitRecommendedVersion = "v1.3.0"