From 711984f3d87ba3f0a75bcef47e96561c01d1793d Mon Sep 17 00:00:00 2001
From: Dax McDonald <dax@rancher.com>
Date: Fri, 28 Feb 2020 17:55:48 -0700
Subject: [PATCH] Update k3s types to make version a string

---
 apis/management.cattle.io/v3/k3s_types.go            |  8 +++-----
 .../management.cattle.io/v3/zz_generated_deepcopy.go |  7 +------
 client/management/v3/zz_generated_k3s_config.go      | 12 +++++-------
 .../v3/zz_generated_k3s_upgrade_strategy.go          | 12 ++++++++++++
 4 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 client/management/v3/zz_generated_k3s_upgrade_strategy.go

diff --git a/apis/management.cattle.io/v3/k3s_types.go b/apis/management.cattle.io/v3/k3s_types.go
index 4b7e21d8..c1094ce0 100644
--- a/apis/management.cattle.io/v3/k3s_types.go
+++ b/apis/management.cattle.io/v3/k3s_types.go
@@ -1,12 +1,10 @@
 package v3
 
-import "k8s.io/apimachinery/pkg/version"
-
 //K3sConfig provides desired configuration for k3s clusters
 type K3sConfig struct {
-	// k3s Kubernetes version
-	Version *version.Info `yaml:"kubernetes_version" json:"kubernetesVersion,omitempty"`
-	K3sUpgradeStrategy
+	// k3s Kubernetes version, unset the value indicates an unmanaged cluster
+	Version            string `yaml:"kubernetes_version" json:"kubernetesVersion,omitempty"`
+	K3sUpgradeStrategy `yaml:"k3s_upgrade_strategy,omitempty" json:"k3supgradeStrategy,omitempty"`
 }
 
 //K3sUpgradeStrategy provides configuration to the downstream system-upgrade-controller
diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
index bd408e49..97860976 100644
--- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go
+++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go
@@ -2227,7 +2227,7 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 	if in.K3sConfig != nil {
 		in, out := &in.K3sConfig, &out.K3sConfig
 		*out = new(K3sConfig)
-		(*in).DeepCopyInto(*out)
+		**out = **in
 	}
 	if in.ImportedConfig != nil {
 		in, out := &in.ImportedConfig, &out.ImportedConfig
@@ -4524,11 +4524,6 @@ func (in *IngressConfig) DeepCopy() *IngressConfig {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *K3sConfig) DeepCopyInto(out *K3sConfig) {
 	*out = *in
-	if in.Version != nil {
-		in, out := &in.Version, &out.Version
-		*out = new(version.Info)
-		**out = **in
-	}
 	out.K3sUpgradeStrategy = in.K3sUpgradeStrategy
 	return
 }
diff --git a/client/management/v3/zz_generated_k3s_config.go b/client/management/v3/zz_generated_k3s_config.go
index 0ef4056b..26c279f9 100644
--- a/client/management/v3/zz_generated_k3s_config.go
+++ b/client/management/v3/zz_generated_k3s_config.go
@@ -1,14 +1,12 @@
 package client
 
 const (
-	K3sConfigType                   = "k3sConfig"
-	K3sConfigFieldServerConcurrency = "serverConcurrency"
-	K3sConfigFieldVersion           = "kubernetesVersion"
-	K3sConfigFieldWorkerConcurrency = "workerConcurrency"
+	K3sConfigType                    = "k3sConfig"
+	K3sConfigFieldK3sUpgradeStrategy = "k3supgradeStrategy"
+	K3sConfigFieldVersion            = "kubernetesVersion"
 )
 
 type K3sConfig struct {
-	ServerConcurrency int64 `json:"serverConcurrency,omitempty" yaml:"serverConcurrency,omitempty"`
-	Version           *Info `json:"kubernetesVersion,omitempty" yaml:"kubernetesVersion,omitempty"`
-	WorkerConcurrency int64 `json:"workerConcurrency,omitempty" yaml:"workerConcurrency,omitempty"`
+	K3sUpgradeStrategy *K3sUpgradeStrategy `json:"k3supgradeStrategy,omitempty" yaml:"k3supgradeStrategy,omitempty"`
+	Version            string              `json:"kubernetesVersion,omitempty" yaml:"kubernetesVersion,omitempty"`
 }
diff --git a/client/management/v3/zz_generated_k3s_upgrade_strategy.go b/client/management/v3/zz_generated_k3s_upgrade_strategy.go
new file mode 100644
index 00000000..bb20d9b3
--- /dev/null
+++ b/client/management/v3/zz_generated_k3s_upgrade_strategy.go
@@ -0,0 +1,12 @@
+package client
+
+const (
+	K3sUpgradeStrategyType                   = "k3sUpgradeStrategy"
+	K3sUpgradeStrategyFieldServerConcurrency = "serverConcurrency"
+	K3sUpgradeStrategyFieldWorkerConcurrency = "workerConcurrency"
+)
+
+type K3sUpgradeStrategy struct {
+	ServerConcurrency int64 `json:"serverConcurrency,omitempty" yaml:"serverConcurrency,omitempty"`
+	WorkerConcurrency int64 `json:"workerConcurrency,omitempty" yaml:"workerConcurrency,omitempty"`
+}