Update presets

aenix-io · May 3, 2024 · 7570872 · 7570872
1 parent 5130f96
commit 7570872
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/charts/cozystack/templates/_helpers.tpl b/charts/cozystack/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-{{- define "talos.common.config" }}
+{{- define "talos.config" }}
 machine:
   type: {{ .MachineType }}
   kubelet:

diff --git a/charts/cozystack/templates/controlplane.yaml b/charts/cozystack/templates/controlplane.yaml
@@ -1,2 +1,2 @@
 {{- $_ := set . "MachineType" "controlplane" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
diff --git a/charts/cozystack/templates/worker.yaml b/charts/cozystack/templates/worker.yaml
@@ -1,2 +1,2 @@
 {{- $_ := set . "MachineType" "worker" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml
@@ -12,7 +12,7 @@ templateOptions:
   fileValues: []
   jsonValues: []
   literalValues: []
-  talosVersion: "v1.6"
+  talosVersion: ""
   withSecrets: "secrets.yaml"
   kubernetesVersion: ""
   full: false

diff --git a/charts/generic/templates/_helpers.tpl b/charts/generic/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-{{- define "talos.common.config" }}
+{{- define "talos.config" }}
 machine:
   type: {{ .MachineType }}
   kubelet:

diff --git a/charts/generic/templates/controlplane.yaml b/charts/generic/templates/controlplane.yaml
@@ -1,2 +1,2 @@
 {{- $_ := set . "MachineType" "controlplane" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
diff --git a/charts/generic/templates/worker.yaml b/charts/generic/templates/worker.yaml
@@ -1,2 +1,2 @@
 {{- $_ := set . "MachineType" "worker" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
diff --git a/pkg/generated/presets.go b/pkg/generated/presets.go
@@ -28,7 +28,7 @@ upgradeOptions:
   stage: false
   force: false
 `,
-	"cozystack/templates/_helpers.tpl": `{{- define "talos.common.config" }}
+	"cozystack/templates/_helpers.tpl": `{{- define "talos.config" }}
 machine:
   type: {{ .MachineType }}
   kubelet:
@@ -107,10 +107,10 @@ cluster:
 {{- end }}
 `,
 	"cozystack/templates/controlplane.yaml": `{{- $_ := set . "MachineType" "controlplane" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
 `,
 	"cozystack/templates/worker.yaml": `{{- $_ := set . "MachineType" "worker" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
 `,
 	"cozystack/values.yaml": `endpoint: "https://192.168.100.10:6443"
 floatingIP: 192.168.100.10
@@ -136,7 +136,7 @@ templateOptions:
   fileValues: []
   jsonValues: []
   literalValues: []
-  talosVersion: "v1.6"
+  talosVersion: ""
   withSecrets: "secrets.yaml"
   kubernetesVersion: ""
   full: false
@@ -149,7 +149,7 @@ upgradeOptions:
   stage: false
   force: false
 `,
-	"generic/templates/_helpers.tpl": `{{- define "talos.common.config" }}
+	"generic/templates/_helpers.tpl": `{{- define "talos.config" }}
 machine:
   type: {{ .MachineType }}
   kubelet:
@@ -192,10 +192,10 @@ cluster:
 {{- end }}
 `,
 	"generic/templates/controlplane.yaml": `{{- $_ := set . "MachineType" "controlplane" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
 `,
 	"generic/templates/worker.yaml": `{{- $_ := set . "MachineType" "worker" -}}
-{{- include "talos.common.config" . }}
+{{- include "talos.config" . }}
 `,
 	"generic/values.yaml": `endpoint: "https://192.168.100.10:6443"
 podSubnets: