diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile index 08d55d9e..7d61cb37 100644 --- a/packages/apps/kubernetes/Makefile +++ b/packages/apps/kubernetes/Makefile @@ -6,7 +6,7 @@ include ../../../scripts/package.mk generate: readme-generator -v values.yaml -s values.schema.json -r README.md - yq -o json -i '.properties.version.enum = ["v1.28","v1.29","v1.30","v1.31","v1.32","v1.33"]' values.schema.json + yq -o=json -i '.properties.version.enum = (load("files/versions.yaml") | keys)' values.schema.json yq -o json -i '.properties.addons.properties.ingressNginx.properties.exposeMethod.enum = ["Proxied","LoadBalancer"]' values.schema.json yq -o json -i '.properties.controlPlane.properties.apiServer.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json yq -o json -i '.properties.controlPlane.properties.controllerManager.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json diff --git a/packages/apps/kubernetes/files/versions.yaml b/packages/apps/kubernetes/files/versions.yaml new file mode 100644 index 00000000..f9236751 --- /dev/null +++ b/packages/apps/kubernetes/files/versions.yaml @@ -0,0 +1,6 @@ +"v1.28": "v1.28.15" +"v1.29": "v1.29.15" +"v1.30": "v1.30.14" +"v1.31": "v1.31.10" +"v1.32": "v1.32.6" +"v1.33": "v1.33.0" diff --git a/packages/apps/kubernetes/templates/_versions.tpl b/packages/apps/kubernetes/templates/_versions.tpl index 67ef3f8b..8e66d2cd 100644 --- a/packages/apps/kubernetes/templates/_versions.tpl +++ b/packages/apps/kubernetes/templates/_versions.tpl @@ -1,7 +1,8 @@ {{- define "kubernetes.versionMap" }} -{{- $versionMap := dict `v1.28` `v1.28.15` `v1.29` `v1.29.15` `v1.30` `v1.30.14` `v1.31` `v1.31.10` `v1.32` `v1.32.6` `v1.33` `v1.33.2` }} -{{- if not (hasKey $versionMap .) }} -{{- printf `Kubernetes version %s is not supported, allowed versions are %s` . (keys $versionMap) | fail }} +{{- $ := . }} +{{- $versionMap := $.Files.Get "files/versions.yaml" | fromYaml }} +{{- if not (hasKey $versionMap $.Values.version) }} +{{- printf `Kubernetes version %s is not supported, allowed versions are %s` $.Values.version (keys $versionMap) | fail }} {{- end }} -{{- index $versionMap . }} +{{- index $versionMap $.Values.version }} {{- end }} diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index 890a985b..7a87660e 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -151,7 +151,7 @@ spec: labels: policy.cozystack.io/allow-to-etcd: "true" replicas: 2 - version: {{ include "kubernetes.versionMap" $.Values.version }} + version: {{ include "kubernetes.versionMap" $ }} --- apiVersion: cozystack.io/v1alpha1 kind: WorkloadMonitor @@ -290,7 +290,7 @@ spec: kind: KubevirtMachineTemplate name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }} namespace: {{ $.Release.Namespace }} - version: {{ include "kubernetes.versionMap" $.Values.version }} + version: {{ include "kubernetes.versionMap" $}} --- apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineHealthCheck