From 49f300e5850afbe6f1b5ca2709d1a285b78eb5fb Mon Sep 17 00:00:00 2001 From: Daishan Peng Date: Fri, 2 Mar 2018 12:56:05 -0700 Subject: [PATCH] generate changes --- .../v3/zz_generated_deepcopy.go | 14 ++++ .../management/v3/zz_generated_node_spec.go | 66 ++++++++++--------- 2 files changed, 49 insertions(+), 31 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 5498296c..19cb1e99 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -3388,6 +3388,20 @@ func (in *NodeSpec) DeepCopyInto(out *NodeSpec) { } } in.InternalNodeSpec.DeepCopyInto(&out.InternalNodeSpec) + if in.DesiredNodeLabels != nil { + in, out := &in.DesiredNodeLabels, &out.DesiredNodeLabels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.DesiredNodeAnnotations != nil { + in, out := &in.DesiredNodeAnnotations, &out.DesiredNodeAnnotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } diff --git a/client/management/v3/zz_generated_node_spec.go b/client/management/v3/zz_generated_node_spec.go index ed519319..da8e494b 100644 --- a/client/management/v3/zz_generated_node_spec.go +++ b/client/management/v3/zz_generated_node_spec.go @@ -1,38 +1,42 @@ package client const ( - NodeSpecType = "nodeSpec" - NodeSpecFieldClusterId = "clusterId" - NodeSpecFieldControlPlane = "controlPlane" - NodeSpecFieldCustomConfig = "customConfig" - NodeSpecFieldDescription = "description" - NodeSpecFieldDisplayName = "displayName" - NodeSpecFieldEtcd = "etcd" - NodeSpecFieldImported = "imported" - NodeSpecFieldNodePoolId = "nodePoolId" - NodeSpecFieldNodeTemplateId = "nodeTemplateId" - NodeSpecFieldPodCidr = "podCidr" - NodeSpecFieldProviderId = "providerId" - NodeSpecFieldRequestedHostname = "requestedHostname" - NodeSpecFieldTaints = "taints" - NodeSpecFieldUnschedulable = "unschedulable" - NodeSpecFieldWorker = "worker" + NodeSpecType = "nodeSpec" + NodeSpecFieldClusterId = "clusterId" + NodeSpecFieldControlPlane = "controlPlane" + NodeSpecFieldCustomConfig = "customConfig" + NodeSpecFieldDescription = "description" + NodeSpecFieldDesiredNodeAnnotations = "desiredNodeAnnotations" + NodeSpecFieldDesiredNodeLabels = "desiredNodeLabels" + NodeSpecFieldDisplayName = "displayName" + NodeSpecFieldEtcd = "etcd" + NodeSpecFieldImported = "imported" + NodeSpecFieldNodePoolId = "nodePoolId" + NodeSpecFieldNodeTemplateId = "nodeTemplateId" + NodeSpecFieldPodCidr = "podCidr" + NodeSpecFieldProviderId = "providerId" + NodeSpecFieldRequestedHostname = "requestedHostname" + NodeSpecFieldTaints = "taints" + NodeSpecFieldUnschedulable = "unschedulable" + NodeSpecFieldWorker = "worker" ) type NodeSpec struct { - ClusterId string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` - ControlPlane bool `json:"controlPlane,omitempty" yaml:"controlPlane,omitempty"` - CustomConfig *CustomConfig `json:"customConfig,omitempty" yaml:"customConfig,omitempty"` - Description string `json:"description,omitempty" yaml:"description,omitempty"` - DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - Etcd bool `json:"etcd,omitempty" yaml:"etcd,omitempty"` - Imported bool `json:"imported,omitempty" yaml:"imported,omitempty"` - NodePoolId string `json:"nodePoolId,omitempty" yaml:"nodePoolId,omitempty"` - NodeTemplateId string `json:"nodeTemplateId,omitempty" yaml:"nodeTemplateId,omitempty"` - PodCidr string `json:"podCidr,omitempty" yaml:"podCidr,omitempty"` - ProviderId string `json:"providerId,omitempty" yaml:"providerId,omitempty"` - RequestedHostname string `json:"requestedHostname,omitempty" yaml:"requestedHostname,omitempty"` - Taints []Taint `json:"taints,omitempty" yaml:"taints,omitempty"` - Unschedulable bool `json:"unschedulable,omitempty" yaml:"unschedulable,omitempty"` - Worker bool `json:"worker,omitempty" yaml:"worker,omitempty"` + ClusterId string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` + ControlPlane bool `json:"controlPlane,omitempty" yaml:"controlPlane,omitempty"` + CustomConfig *CustomConfig `json:"customConfig,omitempty" yaml:"customConfig,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + DesiredNodeAnnotations map[string]string `json:"desiredNodeAnnotations,omitempty" yaml:"desiredNodeAnnotations,omitempty"` + DesiredNodeLabels map[string]string `json:"desiredNodeLabels,omitempty" yaml:"desiredNodeLabels,omitempty"` + DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + Etcd bool `json:"etcd,omitempty" yaml:"etcd,omitempty"` + Imported bool `json:"imported,omitempty" yaml:"imported,omitempty"` + NodePoolId string `json:"nodePoolId,omitempty" yaml:"nodePoolId,omitempty"` + NodeTemplateId string `json:"nodeTemplateId,omitempty" yaml:"nodeTemplateId,omitempty"` + PodCidr string `json:"podCidr,omitempty" yaml:"podCidr,omitempty"` + ProviderId string `json:"providerId,omitempty" yaml:"providerId,omitempty"` + RequestedHostname string `json:"requestedHostname,omitempty" yaml:"requestedHostname,omitempty"` + Taints []Taint `json:"taints,omitempty" yaml:"taints,omitempty"` + Unschedulable bool `json:"unschedulable,omitempty" yaml:"unschedulable,omitempty"` + Worker bool `json:"worker,omitempty" yaml:"worker,omitempty"` }