Skip to content

Commit 6b98487

Browse files
committed
[kubernetes] Update tenant Kubernetes to v1.32
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 0fc3fdc commit 6b98487

4 files changed

Lines changed: 14 additions & 10 deletions

File tree

‎packages/apps/kubernetes/Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UBUNTU_CONTAINER_DISK_TAG = v1.30.1
1+
KUBERNETES_VERSION = v1.32
22
KUBERNETES_PKG_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml)
33

44
include ../../../scripts/common-envs.mk
@@ -12,8 +12,9 @@ image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-
1212
image-ubuntu-container-disk:
1313
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/ubuntu-container-disk \
1414
--provenance false \
15-
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(UBUNTU_CONTAINER_DISK_TAG)) \
16-
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(UBUNTU_CONTAINER_DISK_TAG)-$(TAG)) \
15+
--build-arg KUBERNETES_VERSION=${KUBERNETES_VERSION} \
16+
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)) \
17+
--tag $(REGISTRY)/ubuntu-container-disk:$(call settag,$(KUBERNETES_VERSION)-$(TAG)) \
1718
--cache-from type=registry,ref=$(REGISTRY)/ubuntu-container-disk:latest \
1819
--cache-to type=inline \
1920
--metadata-file images/ubuntu-container-disk.json \

‎packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM ubuntu:22.04 as guestfish
1+
FROM ubuntu:24.04 as guestfish
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update \
55
&& apt-get -y install \
66
libguestfs-tools \
77
linux-image-generic \
8+
wget \
89
make \
910
bash-completion \
1011
&& apt-get clean
@@ -13,7 +14,9 @@ WORKDIR /build
1314

1415
FROM guestfish as builder
1516

16-
RUN wget -O image.img https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
17+
RUN wget -O image.img https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
18+
19+
ARG KUBERNETES_VERSION
1720

1821
RUN qemu-img resize image.img 5G \
1922
&& eval "$(guestfish --listen --network)" \
@@ -24,10 +27,10 @@ RUN qemu-img resize image.img 5G \
2427
&& guestfish --remote command "resize2fs /dev/sda1" \
2528
# docker repo
2629
&& guestfish --remote sh "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" \
27-
&& guestfish --remote sh 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list' \
30+
&& guestfish --remote sh 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | tee /etc/apt/sources.list.d/docker.list' \
2831
# kubernetes repo
29-
&& guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
30-
&& guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \
32+
&& guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
33+
&& guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \
3134
# install containerd
3235
&& guestfish --remote command "apt-get update -y" \
3336
&& guestfish --remote command "apt-get install -y containerd.io" \

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ spec:
283283
kind: KubevirtMachineTemplate
284284
name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
285285
namespace: {{ $.Release.Namespace }}
286-
version: v1.30.1
286+
version: v1.32.3
287287
---
288288
apiVersion: cluster.x-k8s.io/v1beta1
289289
kind: MachineHealthCheck

‎packages/apps/kubernetes/templates/helmreleases/delete.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
effect: "NoSchedule"
2121
containers:
2222
- name: kubectl
23-
image: docker.io/clastix/kubectl:v1.30.1
23+
image: docker.io/clastix/kubectl:latest
2424
command:
2525
- /bin/sh
2626
- -c

0 commit comments

Comments
 (0)