From dad27d745a35ee87b89f32b8dffbdf27ed9a13fd Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Mon, 24 Apr 2017 10:21:29 +0800 Subject: [PATCH] remove deprecated NodeLegacyHostIP Kubernetes-commit: 7d00e5cfb66d4501879125f4d3c732f9bb726d0c --- pkg/api/types.go | 14 +++++--------- pkg/api/v1/types.go | 12 +++++------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 52e6dae8..d9d5c7a0 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -2918,16 +2918,12 @@ type NodeCondition struct { type NodeAddressType string -// These are valid address types of node. NodeLegacyHostIP is used to transit -// from out-dated HostIP field to NodeAddress. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + 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 47e751e0..b5d3fec7 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -3363,13 +3363,11 @@ type NodeAddressType string // These are valid address type of node. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + NodeHostName NodeAddressType = "Hostname" + NodeExternalIP NodeAddressType = "ExternalIP" + NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) // NodeAddress contains information for the node's address.