Skip to content

Commit 4093043

Browse files
committed
Fix KubeadmConfigTemplate joinConfiguration
1 parent ec4a325 commit 4093043

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

charts/capi-proxmox/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ keywords:
88
- bootstrapping
99
- kubernetes
1010
- proxmox
11-
version: 1.0.4
11+
version: 1.0.5
1212
appVersion: v1beta1
1313
home: https://github.com/ionos-cloud/cluster-api-provider-proxmox
1414
sources:

charts/capi-proxmox/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,6 @@ range iteration
100100
trunc 63 | trimSuffix "-" -}}
101101
{{- end -}}
102102

103-
{{- define "capi-proxmox.kubeadmConfigTemplateJoinConfig" -}}
103+
{{- define "capi-proxmox.kubeadmConfigTemplate" -}}
104104
{{- merge .Context.Values.kubeadmConfigTemplateDefaults .KubeadmConfigTemplate | toYaml }}
105105
{{- end -}}

charts/capi-proxmox/templates/kubeadm-config-template.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ spec:
1111
template:
1212
spec:
1313
{{- with (include "capi-proxmox.kubeadmConfigUsers" $object | fromYaml) }}
14-
users:
15-
{{- toYaml . | nindent 8 }}
14+
{{- toYaml . | nindent 6 }}
1615
{{- end }}
17-
{{- with
18-
(include "capi-proxmox.kubeadmConfigTemplateJoinConfig" $object |
19-
fromYaml) }}
16+
{{- with (
17+
get (
18+
fromYaml (include "capi-proxmox.kubeadmConfigTemplate" $object))
19+
"joinConfiguration" | default list ) }}
2020
joinConfiguration:
2121
{{- toYaml . | nindent 8 }}
2222
{{- end }}

0 commit comments

Comments
 (0)