From 362defb562cff87ebadb0c479694947f19758d91 Mon Sep 17 00:00:00 2001
From: Chris Werner Rau <cwr@teuto.net>
Date: Fri, 23 Feb 2024 16:08:05 +0100
Subject: [PATCH] chore(t8s-cluster): disallow versions above 28 Also remove
 the "health check", as the OSISM images don't output to the console and the
 check was broken anyways

---
 .../management-cluster/clusterClass/_helpers.tpl          | 2 +-
 charts/t8s-cluster/values.schema.json                     | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/t8s-cluster/templates/management-cluster/clusterClass/_helpers.tpl b/charts/t8s-cluster/templates/management-cluster/clusterClass/_helpers.tpl
index a7ae061517..8a81b58ab9 100644
--- a/charts/t8s-cluster/templates/management-cluster/clusterClass/_helpers.tpl
+++ b/charts/t8s-cluster/templates/management-cluster/clusterClass/_helpers.tpl
@@ -28,7 +28,7 @@ openstack
 
 {{- define "t8s-cluster.clusterClass.postKubeadmCommands" -}}
   {{- $commands := list -}}
-  {{- $commands = append $commands "bash -xc 'if systemctl -q is-failed kubelet; then journalctl -u kubelet; else echo kubelet startup successful; fi | tee -a /dev/console'" }}
+  {{- $commands = append $commands "bash -xc 'if ! systemctl -q is-active kubelet; then journalctl -u kubelet; else echo kubelet startup successful; fi | tee -a /dev/console'" }}
   {{- $commands | toYaml }}
 {{- end -}}
 
diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json
index b392d94bb3..8e9f12b75f 100644
--- a/charts/t8s-cluster/values.schema.json
+++ b/charts/t8s-cluster/values.schema.json
@@ -146,10 +146,14 @@
       "type": "object",
       "properties": {
         "major": {
-          "type": "integer"
+          "type": "integer",
+          "const": 1
         },
         "minor": {
-          "type": "integer"
+          "type": "integer",
+          "description": "The minor version of the k8s cluster. Must be below 29, as CAPO does not support 1.29 yet.",
+          "minimum": 25,
+          "maximum": 28
         },
         "patch": {
           "type": "integer"