From 48bc34cad187f7b2e21156aff56631aed16bf97d Mon Sep 17 00:00:00 2001 From: togashidm Date: Thu, 5 Mar 2026 22:38:22 +0000 Subject: [PATCH 1/4] ver: bump default templates v0.0.11 --- default-cluster-templates/baseline-k3s.json | 4 ++-- default-cluster-templates/privileged-k3s.json | 4 ++-- default-cluster-templates/restricted-k3s.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/default-cluster-templates/baseline-k3s.json b/default-cluster-templates/baseline-k3s.json index 4a5809e1..7dabfcdd 100644 --- a/default-cluster-templates/baseline-k3s.json +++ b/default-cluster-templates/baseline-k3s.json @@ -1,7 +1,7 @@ { "name": "baseline-k3s", - "version": "v0.0.10", - "kubernetesVersion": "v1.33.5+k3s1", + "version": "v0.0.11", + "kubernetesVersion": "v1.33.9+k3s1", "description": "Baseline Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", diff --git a/default-cluster-templates/privileged-k3s.json b/default-cluster-templates/privileged-k3s.json index 718f3941..fc0602a0 100644 --- a/default-cluster-templates/privileged-k3s.json +++ b/default-cluster-templates/privileged-k3s.json @@ -1,7 +1,7 @@ { "name": "privileged-k3s", - "version": "v0.0.10", - "kubernetesVersion": "v1.33.5+k3s1", + "version": "v0.0.11", + "kubernetesVersion": "v1.33.9+k3s1", "description": "Privileged Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", diff --git a/default-cluster-templates/restricted-k3s.json b/default-cluster-templates/restricted-k3s.json index 67c949ee..abce1147 100644 --- a/default-cluster-templates/restricted-k3s.json +++ b/default-cluster-templates/restricted-k3s.json @@ -1,7 +1,7 @@ { "name": "restricted-k3s", - "version": "v0.0.10", - "kubernetesVersion": "v1.33.5+k3s1", + "version": "v0.0.11", + "kubernetesVersion": "v1.33.9+k3s1", "description": "Restricted Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", From c6a7252b43e722af564c9261fc9a180e6bea3567 Mon Sep 17 00:00:00 2001 From: togashidm Date: Mon, 30 Mar 2026 09:41:02 +0000 Subject: [PATCH 2/4] chore: adjust suite test to bumped template --- test/service/service_suite_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/service/service_suite_test.go b/test/service/service_suite_test.go index 94701eb5..14d992f7 100644 --- a/test/service/service_suite_test.go +++ b/test/service/service_suite_test.go @@ -693,8 +693,8 @@ users: Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"200\",method=\"GET\",path=\"/v2/clusters\"}")) Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"200\",method=\"GET\",path=\"/v2/clusters/test-cluster\"}")) Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/clusters/test-cluster\"}")) - Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.10\"}")) - Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"409\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.10\"}")) + Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"204\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.11\"}")) + Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_codes_counter{code=\"409\",method=\"DELETE\",path=\"/v2/templates/baseline-k3s/v0.0.11\"}")) Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.005\"}")) Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.01\"}")) Expect(string(body)).To(ContainSubstring("cluster_manager_http_response_time_seconds_histogram_bucket{le=\"0.025\"}")) From 8aaa6db14ec0eb70b8ebe11dc37f5d2b74f692ce Mon Sep 17 00:00:00 2001 From: togashidm Date: Mon, 30 Mar 2026 09:48:26 +0000 Subject: [PATCH 3/4] chore: adjust k3s version in templates --- default-cluster-templates/baseline-k3s.json | 4 ++-- default-cluster-templates/privileged-k3s.json | 4 ++-- default-cluster-templates/restricted-k3s.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/default-cluster-templates/baseline-k3s.json b/default-cluster-templates/baseline-k3s.json index 7dabfcdd..622593fe 100644 --- a/default-cluster-templates/baseline-k3s.json +++ b/default-cluster-templates/baseline-k3s.json @@ -1,7 +1,7 @@ { "name": "baseline-k3s", "version": "v0.0.11", - "kubernetesVersion": "v1.33.9+k3s1", + "kubernetesVersion": "v1.33.10+k3s1", "description": "Baseline Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", @@ -79,7 +79,7 @@ "servicelb" ] }, - "version": "v1.33.5+k3s1" + "version": "v1.33.10+k3s1" } } } diff --git a/default-cluster-templates/privileged-k3s.json b/default-cluster-templates/privileged-k3s.json index fc0602a0..6e404a22 100644 --- a/default-cluster-templates/privileged-k3s.json +++ b/default-cluster-templates/privileged-k3s.json @@ -1,7 +1,7 @@ { "name": "privileged-k3s", "version": "v0.0.11", - "kubernetesVersion": "v1.33.9+k3s1", + "kubernetesVersion": "v1.33.10+k3s1", "description": "Privileged Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", @@ -79,7 +79,7 @@ "servicelb" ] }, - "version": "v1.33.5+k3s1" + "version": "v1.33.10+k3s1" } } } diff --git a/default-cluster-templates/restricted-k3s.json b/default-cluster-templates/restricted-k3s.json index abce1147..370277c2 100644 --- a/default-cluster-templates/restricted-k3s.json +++ b/default-cluster-templates/restricted-k3s.json @@ -1,7 +1,7 @@ { "name": "restricted-k3s", "version": "v0.0.11", - "kubernetesVersion": "v1.33.9+k3s1", + "kubernetesVersion": "v1.33.10+k3s1", "description": "Restricted Cluster Template for k3s", "controlplaneprovidertype": "k3s", "infraprovidertype": "intel", @@ -79,7 +79,7 @@ "servicelb" ] }, - "version": "v1.33.5+k3s1" + "version": "v1.33.10+k3s1" } } } From 663786121013e1922788460c03ab396c78b07f35 Mon Sep 17 00:00:00 2001 From: togashidm Date: Mon, 30 Mar 2026 09:50:42 +0000 Subject: [PATCH 4/4] chore: bump to cm v2.2.9 --- VERSION | 2 +- deployment/charts/cluster-manager/Chart.yaml | 8 ++++---- deployment/charts/cluster-template-crd/Chart.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index bf16b9bf..a6333e40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.9-dev +2.2.9 diff --git a/deployment/charts/cluster-manager/Chart.yaml b/deployment/charts/cluster-manager/Chart.yaml index 0b48fee5..bbc8ba33 100644 --- a/deployment/charts/cluster-manager/Chart.yaml +++ b/deployment/charts/cluster-manager/Chart.yaml @@ -16,8 +16,8 @@ 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: 2.2.9-dev -appVersion: 2.2.9-dev +version: 2.2.9 +appVersion: 2.2.9 annotations: - revision: 4b3b2dee8f880a59348297741d4249e63c8ce4e5 - created: "2025-11-26T21:31:43Z" + revision: 48bc34cad187f7b2e21156aff56631aed16bf97d + created: "2026-03-30T09:38:45Z" diff --git a/deployment/charts/cluster-template-crd/Chart.yaml b/deployment/charts/cluster-template-crd/Chart.yaml index 052d0f70..f393b123 100644 --- a/deployment/charts/cluster-template-crd/Chart.yaml +++ b/deployment/charts/cluster-template-crd/Chart.yaml @@ -6,8 +6,8 @@ apiVersion: v2 name: cluster-template-crd description: A Helm chart for the ClusterTemplate CRD type: application -version: 2.2.9-dev -appVersion: 2.2.9-dev +version: 2.2.9 +appVersion: 2.2.9 annotations: - revision: 4b3b2dee8f880a59348297741d4249e63c8ce4e5 - created: "2025-11-26T21:31:43Z" + revision: 48bc34cad187f7b2e21156aff56631aed16bf97d + created: "2026-03-30T09:38:45Z"