From ff78d28af924b5f7ca6fa74d1a33e6fa619be8fe Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Mon, 26 Feb 2018 16:15:12 -0700
Subject: [PATCH] AddonDeploy condition and some more constants

---
 apis/management.cattle.io/v3/cluster_types.go | 2 ++
 apis/management.cattle.io/v3/k8s_defaults.go  | 4 ++++
 status/status.go                              | 7 ++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go
index 28f3eab1..29d94f11 100644
--- a/apis/management.cattle.io/v3/cluster_types.go
+++ b/apis/management.cattle.io/v3/cluster_types.go
@@ -25,8 +25,10 @@ const (
 	ClusterConditionconditionDefautlProjectCreated condition.Cond = "DefaultProjectCreated"
 	// ClusterConditionDefaultNamespaceAssigned true when cluster's default namespace has been initially assigned
 	ClusterConditionDefaultNamespaceAssigned condition.Cond = "DefaultNamespaceAssigned"
+	ClusterConditionAddonDeploy              condition.Cond = "AddonDeploy"
 
 	ClusterDriverImported = "imported"
+	ClusterDriverLocal    = "local"
 	ClusterDriverRKE      = "rancherKubernetesEngine"
 )
 
diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go
index b4805a95..36233920 100644
--- a/apis/management.cattle.io/v3/k8s_defaults.go
+++ b/apis/management.cattle.io/v3/k8s_defaults.go
@@ -1,5 +1,9 @@
 package v3
 
+const (
+	K8sV1_8 = "v1.8.7-rancher1-1"
+)
+
 var (
 	K8sVersionToRKESystemImages = map[string]RKESystemImages{
 		"v1.8.7-rancher1-1": v187SystemImages,
diff --git a/status/status.go b/status/status.go
index 76393133..e4a5a076 100644
--- a/status/status.go
+++ b/status/status.go
@@ -20,15 +20,17 @@ type condition struct {
 // Unknown == transitioning
 var transitioningMap = map[string]string{
 	"Active":                      "activating",
+	"AddonDeploy":                 "deploying",
 	"AgentInstalled":              "installing",
 	"Available":                   "activating",
 	"BackingNamespaceCreated":     "configuring",
 	"ConfigOK":                    "configuring",
-	"CreatorMadeOwner":            "configuring",
 	"Created":                     "creating",
+	"CreatorMadeOwner":            "configuring",
 	"DefaultNamespaceAssigned":    "configuring",
-	"DefaultProjectCreated":       "configuring",
 	"DefaultNetworkPolicyCreated": "configuring",
+	"DefaultProjectCreated":       "configuring",
+	"DockerProvisioned":           "provisioning",
 	"Downloaded":                  "downloading",
 	"Inactive":                    "deactivating",
 	"Initialized":                 "initializing",
@@ -36,7 +38,6 @@ var transitioningMap = map[string]string{
 	"Pending":                     "pending",
 	"PodScheduled":                "scheduling",
 	"Progressing":                 "updating",
-	"DockerProvisioned":           "provisioning",
 	"Provisioned":                 "provisioning",
 	"Registered":                  "registering",
 	"Removed":                     "removing",