Skip to content

Commit 254b4ff

Browse files
authored
fix: add kubernetes.kubelet.extra_args to join (#3059)
Signed-off-by: redscholar <[email protected]>
1 parent 83e0bda commit 254b4ff

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta3

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ nodeRegistration:
2424
kubeletExtraArgs:
2525
cgroup-driver: {{ .cri.cgroup_driver }}
2626
pod-infra-container-image: "{{ .kubernetes.sandbox_image.registry }}/{{ .kubernetes.sandbox_image.repository }}:{{ .kubernetes.sandbox_image.tag }}"
27+
{{- if .kubernetes.kubelet.extra_args | empty | not }}
28+
{{ .kubernetes.kubelet.extra_args | toYaml | indent 4}}
29+
{{- end }}
2730
{{- if .kubernetes.patches | empty | not }}
2831
patches:
2932
directory: /etc/kubernetes/patches/

builtin/core/roles/kubernetes/join-kubernetes/templates/kubeadm/kubeadm-join.v1beta4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ nodeRegistration:
2626
value: {{ .cri.cgroup_driver }}
2727
- name: pod-infra-container-image
2828
value: "{{ .kubernetes.sandbox_image.registry }}/{{ .kubernetes.sandbox_image.repository }}:{{ .kubernetes.sandbox_image.tag }}"
29+
{{- if .kubernetes.kubelet.extra_args | empty | not }}
30+
{{ mapToNamedStringArgs .kubernetes.kubelet.extra_args | toYaml | indent 4 }}
31+
{{- end }}
2932
{{- if .kubernetes.patches | empty | not }}
3033
patches:
3134
directory: /etc/kubernetes/patches/

0 commit comments

Comments
 (0)