Skip to content

K
k3s
Commit a242aeef authored by Mike Danese's avatar Mike Danese
Browse files
Options

rename ExternaID to something that is obviously deprecated

parent f4275311
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
pkg/apis/core/types.go
View file @ a242aeef
...@@ -3228,10 +3228,6 @@ type NodeSpec struct { ...@@ -3228,10 +3228,6 @@ type NodeSpec struct {
// +optional // +optional
PodCIDR string PodCIDR string
// External ID of the node assigned by some machine database (e.g. a cloud provider)
// +optional
ExternalID string
// ID of the node assigned by the cloud provider // ID of the node assigned by the cloud provider
// Note: format is "<ProviderName>://<ProviderSpecificNodeID>" // Note: format is "<ProviderName>://<ProviderSpecificNodeID>"
// +optional // +optional
...@@ -3249,6 +3245,11 @@ type NodeSpec struct { ...@@ -3249,6 +3245,11 @@ type NodeSpec struct {
// The DynamicKubeletConfig feature gate must be enabled for the Kubelet to use this field // The DynamicKubeletConfig feature gate must be enabled for the Kubelet to use this field
// +optional // +optional
ConfigSource *NodeConfigSource ConfigSource *NodeConfigSource
// Deprecated. Not all kubelets will set this field. Remove field after 1.13.
// see: https://issues.k8s.io/61966
// +optional
DoNotUse_ExternalID string
} }
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
......
staging/src/k8s.io/api/core/v1/types.go
View file @ a242aeef
...@@ -3612,10 +3612,6 @@ type NodeSpec struct { ...@@ -3612,10 +3612,6 @@ type NodeSpec struct {
// PodCIDR represents the pod IP range assigned to the node. // PodCIDR represents the pod IP range assigned to the node.
// +optional // +optional
PodCIDR string `json:"podCIDR,omitempty" protobuf:"bytes,1,opt,name=podCIDR"` PodCIDR string `json:"podCIDR,omitempty" protobuf:"bytes,1,opt,name=podCIDR"`
// External ID of the node assigned by some machine database (e.g. a cloud provider).
// Deprecated.
// +optional
ExternalID string `json:"externalID,omitempty" protobuf:"bytes,2,opt,name=externalID"`
// ID of the node assigned by the cloud provider in the format: <ProviderName>://<ProviderSpecificNodeID> // ID of the node assigned by the cloud provider in the format: <ProviderName>://<ProviderSpecificNodeID>
// +optional // +optional
ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"` ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"`
...@@ -3630,6 +3626,11 @@ type NodeSpec struct { ...@@ -3630,6 +3626,11 @@ type NodeSpec struct {
// The DynamicKubeletConfig feature gate must be enabled for the Kubelet to use this field // The DynamicKubeletConfig feature gate must be enabled for the Kubelet to use this field
// +optional // +optional
ConfigSource *NodeConfigSource `json:"configSource,omitempty" protobuf:"bytes,6,opt,name=configSource"` ConfigSource *NodeConfigSource `json:"configSource,omitempty" protobuf:"bytes,6,opt,name=configSource"`
// Deprecated. Not all kubelets will set this field. Remove field after 1.13.
// see: https://issues.k8s.io/61966
// +optional
DoNotUse_ExternalID string `json:"externalID,omitempty" protobuf:"bytes,2,opt,name=externalID"`
} }
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment