Merge pull request #24401 from danwinship/kubelet-ipv6-node-ip

UPSTREAM: 85850: Allow "kubelet --node-ip ::" to mean prefer IPv6
openshift · Jan 16, 2020 · 954dea8 · 954dea8
2 parents 575d106 + af1ca54
commit 954dea8
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 12 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters_test.go