From 5aa41a5ded071b180e2d4395e744d7c038256d73 Mon Sep 17 00:00:00 2001 From: AlexCK-STFC <210735915+AlexCK-STFC@users.noreply.github.com> Date: Tue, 30 Jun 2026 20:27:20 +0100 Subject: [PATCH 1/2] CHORE: Bump capi images - Add 1.35 and 1.36 - Bump minors for 1.33 and 1.34 (others are fine) - Bump submodule - Bump ansible core --- cluster-api/versions/v1_33.json | 4 ++-- cluster-api/versions/v1_34.json | 4 ++-- cluster-api/versions/v1_35.json | 5 +++++ cluster-api/versions/v1_36.json | 5 +++++ k8s-image-builder | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 cluster-api/versions/v1_35.json create mode 100644 cluster-api/versions/v1_36.json diff --git a/cluster-api/versions/v1_33.json b/cluster-api/versions/v1_33.json index 5e13a949..c6bc9b45 100644 --- a/cluster-api/versions/v1_33.json +++ b/cluster-api/versions/v1_33.json @@ -1,5 +1,5 @@ { "kubernetes_series": "v1.33", - "kubernetes_semver": "v1.33.12", - "kubernetes_deb_version": "1.33.12-1.1" + "kubernetes_semver": "v1.33.13", + "kubernetes_deb_version": "1.33.13-1.1" } diff --git a/cluster-api/versions/v1_34.json b/cluster-api/versions/v1_34.json index 644dcf3a..fd55a6f2 100644 --- a/cluster-api/versions/v1_34.json +++ b/cluster-api/versions/v1_34.json @@ -1,5 +1,5 @@ { "kubernetes_series": "v1.34", - "kubernetes_semver": "v1.34.8", - "kubernetes_deb_version": "1.34.8-1.1" + "kubernetes_semver": "v1.34.9", + "kubernetes_deb_version": "1.34.9-1.1" } diff --git a/cluster-api/versions/v1_35.json b/cluster-api/versions/v1_35.json new file mode 100644 index 00000000..70333c32 --- /dev/null +++ b/cluster-api/versions/v1_35.json @@ -0,0 +1,5 @@ +{ + "kubernetes_series": "v1.35", + "kubernetes_semver": "v1.35.6", + "kubernetes_deb_version": "1.35.6-1.1" +} diff --git a/cluster-api/versions/v1_36.json b/cluster-api/versions/v1_36.json new file mode 100644 index 00000000..bf652606 --- /dev/null +++ b/cluster-api/versions/v1_36.json @@ -0,0 +1,5 @@ +{ + "kubernetes_series": "v1.36", + "kubernetes_semver": "v1.36.2", + "kubernetes_deb_version": "1.36.2-2.1" +} diff --git a/k8s-image-builder b/k8s-image-builder index fd68cd55..b059f2e4 160000 --- a/k8s-image-builder +++ b/k8s-image-builder @@ -1 +1 @@ -Subproject commit fd68cd55491928f70643efb671a5076c874b5c06 +Subproject commit b059f2e4a2c170580212b3193babec65945cc865 From 71c7c8ef4d131163c9759782cb596b340ea5831b Mon Sep 17 00:00:00 2001 From: AlexCK-STFC <210735915+AlexCK-STFC@users.noreply.github.com> Date: Mon, 17 Aug 2026 13:28:32 +0100 Subject: [PATCH 2/2] PR: Remove 1.31 and 1.36 --- cluster-api/versions/v1_31.json | 5 ----- cluster-api/versions/v1_36.json | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 cluster-api/versions/v1_31.json delete mode 100644 cluster-api/versions/v1_36.json diff --git a/cluster-api/versions/v1_31.json b/cluster-api/versions/v1_31.json deleted file mode 100644 index df64c4a4..00000000 --- a/cluster-api/versions/v1_31.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "kubernetes_series": "v1.31", - "kubernetes_semver": "v1.31.14", - "kubernetes_deb_version": "1.31.14-1.1" -} diff --git a/cluster-api/versions/v1_36.json b/cluster-api/versions/v1_36.json deleted file mode 100644 index bf652606..00000000 --- a/cluster-api/versions/v1_36.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "kubernetes_series": "v1.36", - "kubernetes_semver": "v1.36.2", - "kubernetes_deb_version": "1.36.2-2.1" -}