Skip to content

Commit 7ac0d9b

Browse files
committed
generate kubeversions from versions.yaml
Signed-off-by: IvanHunters <[email protected]>
1 parent f6cb69e commit 7ac0d9b

4 files changed

Lines changed: 14 additions & 7 deletions

File tree

‎packages/apps/kubernetes/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include ../../../scripts/package.mk
66

77
generate:
88
readme-generator -v values.yaml -s values.schema.json -r README.md
9-
yq -o json -i '.properties.version.enum = ["v1.28","v1.29","v1.30","v1.31","v1.32","v1.33"]' values.schema.json
9+
yq -o=json -i '.properties.version.enum = (load("files/versions.yaml") | keys)' values.schema.json
1010
yq -o json -i '.properties.addons.properties.ingressNginx.properties.exposeMethod.enum = ["Proxied","LoadBalancer"]' values.schema.json
1111
yq -o json -i '.properties.controlPlane.properties.apiServer.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
1212
yq -o json -i '.properties.controlPlane.properties.controllerManager.properties.resourcesPreset.enum = ["none","nano","micro","small","medium","large","xlarge","2xlarge"]' values.schema.json
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"v1.28": "v1.28.15"
2+
"v1.29": "v1.29.15"
3+
"v1.30": "v1.30.14"
4+
"v1.31": "v1.31.10"
5+
"v1.32": "v1.32.6"
6+
"v1.33": "v1.33.0"
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{{- define "kubernetes.versionMap" }}
2-
{{- $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` }}
3-
{{- if not (hasKey $versionMap .) }}
4-
{{- printf `Kubernetes version %s is not supported, allowed versions are %s` . (keys $versionMap) | fail }}
2+
{{- $ := . }}
3+
{{- $versionMap := $.Files.Get "files/versions.yaml" | fromYaml }}
4+
{{- if not (hasKey $versionMap $.Values.version) }}
5+
{{- printf `Kubernetes version %s is not supported, allowed versions are %s` $.Values.version (keys $versionMap) | fail }}
56
{{- end }}
6-
{{- index $versionMap . }}
7+
{{- index $versionMap $.Values.version }}
78
{{- end }}

‎packages/apps/kubernetes/templates/cluster.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ spec:
151151
labels:
152152
policy.cozystack.io/allow-to-etcd: "true"
153153
replicas: 2
154-
version: {{ include "kubernetes.versionMap" $.Values.version }}
154+
version: {{ include "kubernetes.versionMap" $ }}
155155
---
156156
apiVersion: cozystack.io/v1alpha1
157157
kind: WorkloadMonitor
@@ -290,7 +290,7 @@ spec:
290290
kind: KubevirtMachineTemplate
291291
name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
292292
namespace: {{ $.Release.Namespace }}
293-
version: {{ include "kubernetes.versionMap" $.Values.version }}
293+
version: {{ include "kubernetes.versionMap" $}}
294294
---
295295
apiVersion: cluster.x-k8s.io/v1beta1
296296
kind: MachineHealthCheck

0 commit comments

Comments
 (0)