From ff977e5c7cc8c3b173a6fa8a2f31998381abf546 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 22 Nov 2016 11:26:44 -0500 Subject: [PATCH] Add internal/external DNS node address types --- cmd/kube-apiserver/app/options/options.go | 8 ++++++++ pkg/api/types.go | 2 ++ pkg/api/v1/types.go | 2 ++ 3 files changed, 12 insertions(+) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 78cca364a67..67d88524475 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -79,9 +79,17 @@ func NewServerRunOptions() *ServerRunOptions { Port: ports.KubeletPort, ReadOnlyPort: ports.KubeletReadOnlyPort, PreferredAddressTypes: []string{ + // --override-hostname string(api.NodeHostName), + + // internal, preferring DNS if reported + string(api.NodeInternalDNS), string(api.NodeInternalIP), + + // external, preferring DNS if reported + string(api.NodeExternalDNS), string(api.NodeExternalIP), + string(api.NodeLegacyHostIP), }, EnableHttps: true, diff --git a/pkg/api/types.go b/pkg/api/types.go index 2e0ac770777..15788af90be 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -2718,6 +2718,8 @@ const ( NodeHostName NodeAddressType = "Hostname" NodeExternalIP NodeAddressType = "ExternalIP" NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) type NodeAddress struct { diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index be90da724b6..071160cd87c 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -3142,6 +3142,8 @@ const ( NodeHostName NodeAddressType = "Hostname" NodeExternalIP NodeAddressType = "ExternalIP" NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) // NodeAddress contains information for the node's address.