Skip to content

Commit c24cc9e

Browse files
authored
Merge pull request #248 from cloudogu/feature/update-helm
Updated helm to v3.16.3
2 parents 2f12020 + aa91259 commit c24cc9e

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.trivyignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Right now there is no fix in helm, and it is likely not exploitable via our image,
2+
# so ignore issue for some time to be able to continue development
3+
# https://github.com/helm/helm/blob/v3.16.3/go.mod#L36
4+
# https://github.com/helm/helm/commit/194d989b235cf6f5821f068ce5ba81c55eb6be2f
5+
# The mean time between the last 10 helm releases is about three weeks. Lets hope for the best.
6+
CVE-2024-45337 exp:2025-01-15

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ RUN apk add curl grep
4747
# https://kubernetes.io/blog/2022/12/12/kubernetes-release-artifact-signing/
4848
ARG K8S_VERSION=1.29.8
4949
ARG KUBECTL_CHECKSUM=038454e0d79748aab41668f44ca6e4ac8affd1895a94f592b9739a0ae2a5f06a
50-
# When updating, also upgrade helm image in ApplicationConfigurator
51-
ARG HELM_VERSION=3.15.4
50+
# When updating, also upgrade helm image in Config
51+
ARG HELM_VERSION=3.16.3
5252
# bash curl unzip required for Jenkins downloader
5353
RUN apk add --no-cache \
5454
gnupg \

src/main/groovy/com/cloudogu/gitops/config/Config.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import static picocli.CommandLine.ScopeType
4747
class Config {
4848

4949
// When updating please also update in Dockerfile
50-
public static final String HELM_IMAGE = "ghcr.io/cloudogu/helm:3.15.4-1"
50+
public static final String HELM_IMAGE = "ghcr.io/cloudogu/helm:3.16.3-1"
5151
// When updating please also adapt in Dockerfile, vars.tf and init-cluster.sh
5252
public static final String K8S_VERSION = "1.29"
5353
public static final String DEFAULT_ADMIN_USER = 'admin'

0 commit comments

Comments
 (0)