diff --git a/templates/arbiter/01-arbiter-kubelet/_base/units/kubelet.service.yaml b/templates/arbiter/01-arbiter-kubelet/_base/units/kubelet.service.yaml index cbc2dbd9dc..969b655efc 100644 --- a/templates/arbiter/01-arbiter-kubelet/_base/units/kubelet.service.yaml +++ b/templates/arbiter/01-arbiter-kubelet/_base/units/kubelet.service.yaml @@ -11,10 +11,12 @@ contents: | Type=notify ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter -{{- if eq .IPFamilies "IPv6"}} +{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }} Environment="KUBELET_NODE_IP=::" + Environment="KUBELET_NODE_IPS=::" {{- else}} Environment="KUBELET_NODE_IP=0.0.0.0" + Environment="KUBELET_NODE_IPS=0.0.0.0" {{- end}} EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml index 8763e8dd74..0b101eacc6 100644 --- a/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml +++ b/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml @@ -11,10 +11,12 @@ contents: | Type=notify ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter -{{- if eq .IPFamilies "IPv6"}} +{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }} Environment="KUBELET_NODE_IP=::" + Environment="KUBELET_NODE_IPS=::" {{- else}} Environment="KUBELET_NODE_IP=0.0.0.0" + Environment="KUBELET_NODE_IPS=0.0.0.0" {{- end}} EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml index d499a1c25c..590f25a2b9 100644 --- a/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml +++ b/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml @@ -12,10 +12,12 @@ contents: | ExecStartPre=/bin/mkdir --parents /etc/kubernetes/manifests ExecStartPre=/bin/mkdir --parents /etc/openshift/kubelet.conf.d ExecStartPre=-/usr/sbin/restorecon -ri /var/lib/kubelet/pod-resources /usr/local/bin/kubenswrapper /usr/bin/kubensenter -{{- if eq .IPFamilies "IPv6"}} +{{- if or (eq .IPFamilies "IPv6") (eq .IPFamilies "DualStackIPv6Primary") }} Environment="KUBELET_NODE_IP=::" + Environment="KUBELET_NODE_IPS=::" {{- else}} Environment="KUBELET_NODE_IP=0.0.0.0" + Environment="KUBELET_NODE_IPS=0.0.0.0" {{- end}} EnvironmentFile=/etc/os-release EnvironmentFile=-/etc/kubernetes/kubelet-workaround