From 2950ae267d2fb70d23b0b1d8c2f8411f7d07027b Mon Sep 17 00:00:00 2001 From: rmweir Date: Mon, 30 Sep 2019 16:43:55 -0700 Subject: [PATCH] Update generated code --- .../v3/zz_generated_deepcopy.go | 77 ++++++++++++------- .../management/v3/zz_generated_map_delta.go | 12 +++ .../v3/zz_generated_metadata_update.go | 12 +++ .../management/v3/zz_generated_node_spec.go | 42 +++++----- 4 files changed, 91 insertions(+), 52 deletions(-) create mode 100644 client/management/v3/zz_generated_map_delta.go create mode 100644 client/management/v3/zz_generated_metadata_update.go diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index a87871d8..674edd66 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -4157,6 +4157,36 @@ func (in *LoggingTargets) DeepCopy() *LoggingTargets { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MapDelta) DeepCopyInto(out *MapDelta) { + *out = *in + if in.Add != nil { + in, out := &in.Add, &out.Add + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.Delete != nil { + in, out := &in.Delete, &out.Delete + *out = make(map[string]bool, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MapDelta. +func (in *MapDelta) DeepCopy() *MapDelta { + if in == nil { + return nil + } + out := new(MapDelta) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in MapStringInterface) DeepCopyInto(out *MapStringInterface) { { @@ -4199,6 +4229,24 @@ func (in *MetadataOpenstackOpts) DeepCopy() *MetadataOpenstackOpts { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MetadataUpdate) DeepCopyInto(out *MetadataUpdate) { + *out = *in + in.Labels.DeepCopyInto(&out.Labels) + in.Annotations.DeepCopyInto(&out.Annotations) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MetadataUpdate. +func (in *MetadataUpdate) DeepCopy() *MetadataUpdate { + if in == nil { + return nil + } + out := new(MetadataUpdate) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MetricNamesOutput) DeepCopyInto(out *MetricNamesOutput) { *out = *in @@ -5089,39 +5137,12 @@ func (in *NodeSpec) DeepCopyInto(out *NodeSpec) { (*in).DeepCopyInto(*out) } 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 - } - } - if in.CurrentNodeLabels != nil { - in, out := &in.CurrentNodeLabels, &out.CurrentNodeLabels - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - if in.CurrentNodeAnnotations != nil { - in, out := &in.CurrentNodeAnnotations, &out.CurrentNodeAnnotations - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } if in.NodeDrainInput != nil { in, out := &in.NodeDrainInput, &out.NodeDrainInput *out = new(NodeDrainInput) **out = **in } + in.MetadataUpdate.DeepCopyInto(&out.MetadataUpdate) return } diff --git a/client/management/v3/zz_generated_map_delta.go b/client/management/v3/zz_generated_map_delta.go new file mode 100644 index 00000000..b6861818 --- /dev/null +++ b/client/management/v3/zz_generated_map_delta.go @@ -0,0 +1,12 @@ +package client + +const ( + MapDeltaType = "mapDelta" + MapDeltaFieldAdd = "add" + MapDeltaFieldDelete = "delete" +) + +type MapDelta struct { + Add map[string]string `json:"add,omitempty" yaml:"add,omitempty"` + Delete map[string]bool `json:"delete,omitempty" yaml:"delete,omitempty"` +} diff --git a/client/management/v3/zz_generated_metadata_update.go b/client/management/v3/zz_generated_metadata_update.go new file mode 100644 index 00000000..1d1f5b29 --- /dev/null +++ b/client/management/v3/zz_generated_metadata_update.go @@ -0,0 +1,12 @@ +package client + +const ( + MetadataUpdateType = "metadataUpdate" + MetadataUpdateFieldAnnotations = "annotations" + MetadataUpdateFieldLabels = "labels" +) + +type MetadataUpdate struct { + Annotations *MapDelta `json:"annotations,omitempty" yaml:"annotations,omitempty"` + Labels *MapDelta `json:"labels,omitempty" yaml:"labels,omitempty"` +} diff --git a/client/management/v3/zz_generated_node_spec.go b/client/management/v3/zz_generated_node_spec.go index 269128cd..2387893f 100644 --- a/client/management/v3/zz_generated_node_spec.go +++ b/client/management/v3/zz_generated_node_spec.go @@ -3,16 +3,13 @@ package client const ( NodeSpecType = "nodeSpec" NodeSpecFieldControlPlane = "controlPlane" - NodeSpecFieldCurrentNodeAnnotations = "currentNodeAnnotations" - NodeSpecFieldCurrentNodeLabels = "currentNodeLabels" NodeSpecFieldCustomConfig = "customConfig" NodeSpecFieldDescription = "description" - NodeSpecFieldDesiredNodeAnnotations = "desiredNodeAnnotations" - NodeSpecFieldDesiredNodeLabels = "desiredNodeLabels" NodeSpecFieldDesiredNodeUnschedulable = "desiredNodeUnschedulable" NodeSpecFieldDisplayName = "displayName" NodeSpecFieldEtcd = "etcd" NodeSpecFieldImported = "imported" + NodeSpecFieldMetadataUpdate = "metadataUpdate" NodeSpecFieldNodeDrainInput = "nodeDrainInput" NodeSpecFieldNodePoolID = "nodePoolId" NodeSpecFieldNodeTemplateID = "nodeTemplateId" @@ -25,24 +22,21 @@ const ( ) type NodeSpec struct { - ControlPlane bool `json:"controlPlane,omitempty" yaml:"controlPlane,omitempty"` - CurrentNodeAnnotations map[string]string `json:"currentNodeAnnotations,omitempty" yaml:"currentNodeAnnotations,omitempty"` - CurrentNodeLabels map[string]string `json:"currentNodeLabels,omitempty" yaml:"currentNodeLabels,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"` - DesiredNodeUnschedulable string `json:"desiredNodeUnschedulable,omitempty" yaml:"desiredNodeUnschedulable,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"` - NodeDrainInput *NodeDrainInput `json:"nodeDrainInput,omitempty" yaml:"nodeDrainInput,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"` + ControlPlane bool `json:"controlPlane,omitempty" yaml:"controlPlane,omitempty"` + CustomConfig *CustomConfig `json:"customConfig,omitempty" yaml:"customConfig,omitempty"` + Description string `json:"description,omitempty" yaml:"description,omitempty"` + DesiredNodeUnschedulable string `json:"desiredNodeUnschedulable,omitempty" yaml:"desiredNodeUnschedulable,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"` + MetadataUpdate *MetadataUpdate `json:"metadataUpdate,omitempty" yaml:"metadataUpdate,omitempty"` + NodeDrainInput *NodeDrainInput `json:"nodeDrainInput,omitempty" yaml:"nodeDrainInput,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"` }