Skip to content

Commit a113f54

Browse files
committed
CORS-4208: set default KUBELET_NODE_IPS for dualstack nodes
This updates the master and worker kubelet service templates to set the defaults KUBELET_NODE_IPS. - DualStack: default to "0.0.0.0" - DualStackIPv6Primary: default to "::"
1 parent a43523e commit a113f54

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

templates/arbiter/01-arbiter-kubelet/_base/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ contents: |
1111
Type=notify
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter
14-
{{- if eq .IPFamilies "IPv6"}}
14+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1515
Environment="KUBELET_NODE_IP=::"
16+
Environment="KUBELET_NODE_IPS=::"
1617
{{- else}}
1718
Environment="KUBELET_NODE_IP=0.0.0.0"
19+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1820
{{- end}}
1921
EnvironmentFile=/etc/os-release
2022
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

templates/arbiter/01-arbiter-kubelet/on-prem/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ contents: |
1111
Type=notify
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=-/usr/sbin/restorecon /usr/local/bin/kubenswrapper /usr/bin/kubensenter
14-
{{- if eq .IPFamilies "IPv6"}}
14+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1515
Environment="KUBELET_NODE_IP=::"
16+
Environment="KUBELET_NODE_IPS=::"
1617
{{- else}}
1718
Environment="KUBELET_NODE_IP=0.0.0.0"
19+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1820
{{- end}}
1921
EnvironmentFile=/etc/os-release
2022
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

templates/master/01-master-kubelet/_base/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ contents: |
1111
Type=notify
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter
14-
{{- if eq .IPFamilies "IPv6"}}
14+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1515
Environment="KUBELET_NODE_IP=::"
16+
Environment="KUBELET_NODE_IPS=::"
1617
{{- else}}
1718
Environment="KUBELET_NODE_IP=0.0.0.0"
19+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1820
{{- end}}
1921
EnvironmentFile=/etc/os-release
2022
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

templates/master/01-master-kubelet/on-prem/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ contents: |
1111
Type=notify
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter
14-
{{- if eq .IPFamilies "IPv6"}}
14+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1515
Environment="KUBELET_NODE_IP=::"
16+
Environment="KUBELET_NODE_IPS=::"
1617
{{- else}}
1718
Environment="KUBELET_NODE_IP=0.0.0.0"
19+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1820
{{- end}}
1921
EnvironmentFile=/etc/os-release
2022
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ contents: |
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=/bin/mkdir --parents /etc/openshift/kubelet.conf.d
1414
ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter
15-
{{- if eq .IPFamilies "IPv6"}}
15+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1616
Environment="KUBELET_NODE_IP=::"
17+
Environment="KUBELET_NODE_IPS=::"
1718
{{- else}}
1819
Environment="KUBELET_NODE_IP=0.0.0.0"
20+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1921
{{- end}}
2022
EnvironmentFile=/etc/os-release
2123
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

templates/worker/01-worker-kubelet/on-prem/units/kubelet.service.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ contents: |
1212
ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests
1313
ExecStartPre=/bin/mkdir --parents /etc/openshift/kubelet.conf.d
1414
ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter
15-
{{- if eq .IPFamilies "IPv6"}}
15+
{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }}
1616
Environment="KUBELET_NODE_IP=::"
17+
Environment="KUBELET_NODE_IPS=::"
1718
{{- else}}
1819
Environment="KUBELET_NODE_IP=0.0.0.0"
20+
Environment="KUBELET_NODE_IPS=0.0.0.0"
1921
{{- end}}
2022
EnvironmentFile=/etc/os-release
2123
EnvironmentFile=-/etc/kubernetes/kubelet-workaround

0 commit comments

Comments
 (0)