Skip to content

Commit 1d01378

Browse files
nihussmannmdroll
andauthored
K8s Version update 1.34.2 (#330)
Co-authored-by: Marco Droll <marco@droll.dev>
1 parent 069f1e2 commit 1d01378

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ RUN apk add curl grep
4242
# * also update in init-cluster.sh. vars.tf, Config.groovy and apply.sh
4343
# When upgrading to 1.26 we can verify the kubectl signature with cosign!
4444
# https://kubernetes.io/blog/2022/12/12/kubernetes-release-artifact-signing/
45-
ARG K8S_VERSION=1.29.8
46-
ARG KUBECTL_CHECKSUM=038454e0d79748aab41668f44ca6e4ac8affd1895a94f592b9739a0ae2a5f06a
45+
ARG K8S_VERSION=1.34.2
46+
ARG KUBECTL_CHECKSUM=9591f3d75e1581f3f7392e6ad119aab2f28ae7d6c6e083dc5d22469667f27253
4747
# When updating, also upgrade helm image in Config
48-
ARG HELM_VERSION=3.16.4
48+
ARG HELM_VERSION=4.0.2
4949
# bash curl unzip required for Jenkins downloader
5050
RUN apk add --no-cache \
5151
gnupg \

docs/k3d.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ k3d cluster create gitops-playground \
114114
# Mount port for ingress
115115
-p 80:80@server:0:direct \
116116
# Pin image for reproducibility
117-
--image=rancher/k3s:v1.29.8-k3s2 \
117+
--image=rancher/k3s:v1.34.2-k3s1 \
118118
# Disable built-in ingress controller, because we want to use the same one locally and in prod
119119
--k3s-arg=--disable=traefik@server:0 \
120120
# Allow node ports < 30000
@@ -139,4 +139,4 @@ A note on mounting the docker socket:
139139
In a real-life scenario, it would make sense to run Jenkins agents outside the cluster for security and load reasons,
140140
but in order to simplify the setup for this playground we use this slightly dirty workaround:
141141
Jenkins builds in agent pods that are able to spawn plain docker containers docker host that runs the containers.
142-
That's why we mount `/var/run/docker.sock` into the k3d container (see [init-cluster.sh](../scripts/init-cluster.sh))
142+
That's why we mount `/var/run/docker.sock` into the k3d container (see [init-cluster.sh](../scripts/init-cluster.sh))

scripts/init-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This variable is also read in Jenkinsfile
55
K3D_VERSION=5.7.4
66
# When updating please also adapt in Dockerfile, vars.tf and Config.groovy
7-
K8S_VERSION=1.29.8
7+
K8S_VERSION=1.34.2
88
K3S_VERSION="rancher/k3s:v${K8S_VERSION}-k3s1"
99

1010
set -o errexit

0 commit comments

Comments
 (0)