From 4cbc8a2c33a081d13d60a23e98cbb49380ffdb25 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Mon, 8 Jul 2024 22:51:50 +0200 Subject: [PATCH] Upgrade tenant Kubernetes v1.30.1 (#206) Signed-off-by: Andrei Kvapil Signed-off-by: Andrei Kvapil --- packages/apps/kubernetes/Chart.yaml | 4 ++-- packages/apps/kubernetes/Makefile | 2 +- .../kubernetes/images/ubuntu-container-disk.json | 16 +++------------- .../kubernetes/images/ubuntu-container-disk.tag | 2 +- .../images/ubuntu-container-disk/Dockerfile | 4 ++-- packages/apps/kubernetes/templates/cluster.yaml | 4 ++-- .../templates/helmreleases/delete.yaml | 2 +- packages/apps/versions_map | 3 ++- 8 files changed, 14 insertions(+), 23 deletions(-) diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index fd023735..cd846685 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,10 +16,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.6.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.19.4" +appVersion: "1.30.1" diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile index e8781a00..69f5486e 100644 --- a/packages/apps/kubernetes/Makefile +++ b/packages/apps/kubernetes/Makefile @@ -1,4 +1,4 @@ -UBUNTU_CONTAINER_DISK_TAG = v1.29.1 +UBUNTU_CONTAINER_DISK_TAG = v1.30.1 include ../../../scripts/common-envs.mk diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.json b/packages/apps/kubernetes/images/ubuntu-container-disk.json index 05b67523..0877c0ee 100644 --- a/packages/apps/kubernetes/images/ubuntu-container-disk.json +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.json @@ -32,17 +32,7 @@ } } }, - "buildx.build.ref": "priceless_leavitt/priceless_leavitt0/yscjdwk0a8zfgvypn9gfzoeqj", - "containerimage.config.digest": "sha256:62f92e19bf0610f85515bef28db8465650a25346472f52360736ad3a49ce7529", - "containerimage.descriptor": { - "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:f1176049da8651f438b2035c5a2cb6fd253ae868c4640e56785c91364069e0d8", - "size": 506, - "platform": { - "architecture": "amd64", - "os": "linux" - } - }, - "containerimage.digest": "sha256:f1176049da8651f438b2035c5a2cb6fd253ae868c4640e56785c91364069e0d8", - "image.name": "ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.29.1,ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.29.1-v0.8.0" + "buildx.build.ref": "amd64/amd64/ue2wioxbkuzsgxhir5c3qgwoh", + "containerimage.config.digest": "sha256:363589eb47379eb7548f047aae24045278f14db0b2026022b6bec33a04370f15", + "containerimage.digest": "sha256:f242fd77903f5f5a94ed157e98b0c4532e5ba91734d9653eaf26cfe4b23b017b" } \ No newline at end of file diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk.tag b/packages/apps/kubernetes/images/ubuntu-container-disk.tag index c2389748..19963a6b 100644 --- a/packages/apps/kubernetes/images/ubuntu-container-disk.tag +++ b/packages/apps/kubernetes/images/ubuntu-container-disk.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/ubuntu-container-disk:v1.29.1 +ghcr.io/aenix-io/cozystack/ubuntu-container-disk:latest diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile b/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile index a30d70f7..eb08ef10 100644 --- a/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile +++ b/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile @@ -26,8 +26,8 @@ RUN qemu-img resize image.img 5G \ && guestfish --remote sh "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" \ && 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' \ # kubernetes repo - && guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \ - && guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \ + && 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" \ + && 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" \ # install containerd && guestfish --remote command "apt-get update -y" \ && guestfish --remote command "apt-get install -y containerd.io" \ diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index d890c178..0ce5d542 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -109,7 +109,7 @@ spec: className: "{{ $ingress }}" deployment: replicas: 2 - version: 1.29.4 + version: 1.30.1 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 kind: KubevirtCluster @@ -201,7 +201,7 @@ spec: kind: KubevirtMachineTemplate name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }} namespace: default - version: v1.29.4 + version: v1.30.1 {{- end }} --- {{- /* diff --git a/packages/apps/kubernetes/templates/helmreleases/delete.yaml b/packages/apps/kubernetes/templates/helmreleases/delete.yaml index 21925476..30cd5586 100644 --- a/packages/apps/kubernetes/templates/helmreleases/delete.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/delete.yaml @@ -20,7 +20,7 @@ spec: effect: "NoSchedule" containers: - name: kubectl - image: docker.io/clastix/kubectl:v1.29.1 + image: docker.io/clastix/kubectl:v1.30.1 command: - /bin/sh - -c diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 423cca3e..5b3f99fb 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -10,7 +10,8 @@ kubernetes 0.1.0 f642698 kubernetes 0.2.0 7cd7de73 kubernetes 0.3.0 7caccec1 kubernetes 0.4.0 6cae6ce8 -kubernetes 0.5.0 HEAD +kubernetes 0.5.0 6bd2d455 +kubernetes 0.6.0 HEAD mysql 0.1.0 f642698 mysql 0.2.0 8b975ff0 mysql 0.3.0 HEAD