From b0a442020d49ddd4f30b1c653d63f97c19039fc7 Mon Sep 17 00:00:00 2001
From: kinarashah <kinara@rancher.com>
Date: Tue, 4 Feb 2020 15:33:21 -0800
Subject: [PATCH] fields for rke worker node upgrade

---
 apis/management.cattle.io/v3/cluster_types.go |  2 ++
 apis/management.cattle.io/v3/machine_types.go | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go
index 51b03b62..f9e72d69 100644
--- a/apis/management.cattle.io/v3/cluster_types.go
+++ b/apis/management.cattle.io/v3/cluster_types.go
@@ -41,6 +41,7 @@ const (
 	ClusterConditionEtcd           condition.Cond = "etcd"
 	ClusterConditionProvisioned    condition.Cond = "Provisioned"
 	ClusterConditionUpdated        condition.Cond = "Updated"
+	ClusterConditionUpgraded       condition.Cond = "Upgraded"
 	ClusterConditionWaiting        condition.Cond = "Waiting"
 	ClusterConditionRemoved        condition.Cond = "Removed"
 	// ClusterConditionNoDiskPressure true when all cluster nodes have sufficient disk
@@ -151,6 +152,7 @@ type ClusterStatus struct {
 	AppliedEnableNetworkPolicy           bool                        `json:"appliedEnableNetworkPolicy" norman:"nocreate,noupdate,default=false"`
 	Capabilities                         Capabilities                `json:"capabilities,omitempty"`
 	MonitoringStatus                     *MonitoringStatus           `json:"monitoringStatus,omitempty" norman:"nocreate,noupdate"`
+	NodeVersion                          int                         `json:"nodeVersion,omitempty"`
 	IstioEnabled                         bool                        `json:"istioEnabled,omitempty" norman:"nocreate,noupdate,default=false"`
 	CertificatesExpiration               map[string]CertExpiration   `json:"certificatesExpiration,omitempty"`
 	ScheduledClusterScanStatus           *ScheduledClusterScanStatus `json:"scheduledClusterScanStatus,omitempty"`
diff --git a/apis/management.cattle.io/v3/machine_types.go b/apis/management.cattle.io/v3/machine_types.go
index d9ea52fd..fca7033d 100644
--- a/apis/management.cattle.io/v3/machine_types.go
+++ b/apis/management.cattle.io/v3/machine_types.go
@@ -91,6 +91,8 @@ type NodeStatus struct {
 	NodeLabels         map[string]string `json:"nodeLabels,omitempty"`
 	NodeTaints         []v1.Taint        `json:"nodeTaints,omitempty"`
 	DockerInfo         *DockerInfo       `json:"dockerInfo,omitempty"`
+	NodePlan           *NodePlan         `json:"nodePlan,omitempty"`
+	AppliedNodeVersion int               `json:"appliedNodeVersion,omitempty"`
 }
 
 type DockerInfo struct {
@@ -123,6 +125,7 @@ var (
 	NodeConditionConfigSaved condition.Cond = "Saved"
 	NodeConditionReady       condition.Cond = "Ready"
 	NodeConditionDrained     condition.Cond = "Drained"
+	NodeConditionUpgraded    condition.Cond = "Upgraded"
 )
 
 type NodeCondition struct {
@@ -225,6 +228,13 @@ type NodeSpec struct {
 	MetadataUpdate           MetadataUpdate  `json:"metadataUpdate,omitempty"`
 }
 
+type NodePlan struct {
+	Plan    *RKEConfigNodePlan `json:"plan,omitempty"`
+	Version int                `json:"version,omitempty"`
+	// current default in rancher-agent is 2m (120s)
+	AgentCheckInterval int `json:"agentCheckInterval,omitempty" norman:"min=1,max=1800,default=120"`
+}
+
 type NodeCommonParams struct {
 	AuthCertificateAuthority string            `json:"authCertificateAuthority,omitempty"`
 	AuthKey                  string            `json:"authKey,omitempty"`