diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 index 0b7e519d..b15d445a 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/kubelet-csr-approver/app/helmrelease.yaml.j2 @@ -24,5 +24,7 @@ spec: uninstall: keepHistory: false values: - providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker | default([])) | map(attribute='name') | join('|') }#)$ + #% filter indent(width=4, first=True) %# + #% include 'partials/kubelet-csr-approver-values.partial.yaml.j2' %# + #% endfilter %# #% endif %# diff --git a/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2 index b23df682..7df9b942 100644 --- a/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2 +++ b/bootstrap/templates/kubernetes/talos/kubelet-csr-approver/kustomization.yaml.j2 @@ -10,8 +10,9 @@ helmCharts: releaseName: kubelet-csr-approver namespace: kube-system valuesInline: - providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker | default([])) | map(attribute='name') | join('|') }#)$ - bypassDnsResolution: true + #% filter indent(width=6, first=True) %# + #% include 'partials/kubelet-csr-approver-values.partial.yaml.j2' %# + #% endfilter %# commonAnnotations: meta.helm.sh/release-name: kubelet-csr-approver meta.helm.sh/release-namespace: kube-system diff --git a/bootstrap/templates/partials/kubelet-csr-approver-values.partial.yaml.j2 b/bootstrap/templates/partials/kubelet-csr-approver-values.partial.yaml.j2 new file mode 100644 index 00000000..3ffb34e3 --- /dev/null +++ b/bootstrap/templates/partials/kubelet-csr-approver-values.partial.yaml.j2 @@ -0,0 +1,2 @@ +providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker | default([])) | map(attribute='name') | join('|') }#)$ +bypassDnsResolution: true