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
teutonet · Feb 23, 2024 · 362defb · 362defb
1 parent 28f6c3a
commit 362defb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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"