From f999bb990d4a261e01ea71ba98bc9e30341ffb17 Mon Sep 17 00:00:00 2001
From: Daishan Peng <daishan@rancher.com>
Date: Mon, 22 Jan 2018 17:42:56 -0700
Subject: [PATCH] generated changes

---
 apis/management.cattle.io/v3/zz_generated_deepcopy.go      | 7 +++++++
 client/management/v3/zz_generated_machine.go               | 2 ++
 client/management/v3/zz_generated_machine_status.go        | 2 ++
 .../project/v3/zz_generated_deployment_parallel_config.go  | 4 ++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
index 2294add1..dfacbac5 100644
--- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go
+++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
@@ -2204,6 +2204,13 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) {
 			(*out)[key] = val
 		}
 	}
+	if in.NodeTaints != nil {
+		in, out := &in.NodeTaints, &out.NodeTaints
+		*out = make([]v1.Taint, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	return
 }
 
diff --git a/client/management/v3/zz_generated_machine.go b/client/management/v3/zz_generated_machine.go
index 2e6b5a64..d6d9f8ab 100644
--- a/client/management/v3/zz_generated_machine.go
+++ b/client/management/v3/zz_generated_machine.go
@@ -25,6 +25,7 @@ const (
 	MachineFieldNodeAnnotations      = "nodeAnnotations"
 	MachineFieldNodeLabels           = "nodeLabels"
 	MachineFieldNodeName             = "nodeName"
+	MachineFieldNodeTaints           = "nodeTaints"
 	MachineFieldOwnerReferences      = "ownerReferences"
 	MachineFieldPodCidr              = "podCidr"
 	MachineFieldProviderId           = "providerId"
@@ -65,6 +66,7 @@ type Machine struct {
 	NodeAnnotations      map[string]string         `json:"nodeAnnotations,omitempty"`
 	NodeLabels           map[string]string         `json:"nodeLabels,omitempty"`
 	NodeName             string                    `json:"nodeName,omitempty"`
+	NodeTaints           []Taint                   `json:"nodeTaints,omitempty"`
 	OwnerReferences      []OwnerReference          `json:"ownerReferences,omitempty"`
 	PodCidr              string                    `json:"podCidr,omitempty"`
 	ProviderId           string                    `json:"providerId,omitempty"`
diff --git a/client/management/v3/zz_generated_machine_status.go b/client/management/v3/zz_generated_machine_status.go
index 9de1b982..1c327728 100644
--- a/client/management/v3/zz_generated_machine_status.go
+++ b/client/management/v3/zz_generated_machine_status.go
@@ -12,6 +12,7 @@ const (
 	MachineStatusFieldNodeAnnotations = "nodeAnnotations"
 	MachineStatusFieldNodeLabels      = "nodeLabels"
 	MachineStatusFieldNodeName        = "nodeName"
+	MachineStatusFieldNodeTaints      = "nodeTaints"
 	MachineStatusFieldRequested       = "requested"
 	MachineStatusFieldSSHUser         = "sshUser"
 	MachineStatusFieldVolumesAttached = "volumesAttached"
@@ -29,6 +30,7 @@ type MachineStatus struct {
 	NodeAnnotations map[string]string         `json:"nodeAnnotations,omitempty"`
 	NodeLabels      map[string]string         `json:"nodeLabels,omitempty"`
 	NodeName        string                    `json:"nodeName,omitempty"`
+	NodeTaints      []Taint                   `json:"nodeTaints,omitempty"`
 	Requested       map[string]string         `json:"requested,omitempty"`
 	SSHUser         string                    `json:"sshUser,omitempty"`
 	VolumesAttached map[string]AttachedVolume `json:"volumesAttached,omitempty"`
diff --git a/client/project/v3/zz_generated_deployment_parallel_config.go b/client/project/v3/zz_generated_deployment_parallel_config.go
index 2150b97c..af111446 100644
--- a/client/project/v3/zz_generated_deployment_parallel_config.go
+++ b/client/project/v3/zz_generated_deployment_parallel_config.go
@@ -3,12 +3,12 @@ package client
 const (
 	DeploymentParallelConfigType                         = "deploymentParallelConfig"
 	DeploymentParallelConfigFieldMinReadySeconds         = "minReadySeconds"
-	DeploymentParallelConfigFieldProgressDeadlineSeconds = "progressDeadlineSeconds"
+	DeploymentParallelConfigFieldProgressDeadlineSeconds = "processDeadlineSeconds"
 	DeploymentParallelConfigFieldStartFirst              = "startFirst"
 )
 
 type DeploymentParallelConfig struct {
 	MinReadySeconds         *int64 `json:"minReadySeconds,omitempty"`
-	ProgressDeadlineSeconds *int64 `json:"progressDeadlineSeconds,omitempty"`
+	ProgressDeadlineSeconds *int64 `json:"processDeadlineSeconds,omitempty"`
 	StartFirst              *bool  `json:"startFirst,omitempty"`
 }