From e3ff6b2ba195d4165207bbb681ef25b9fa7299bf Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena@rancher.com>
Date: Mon, 2 Apr 2018 11:42:46 -0700
Subject: [PATCH] Move cloud/networkProviders from cluster to *provider

---
 apis/management.cattle.io/v3/rke_types.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go
index d16a0d6e..e8daa3a1 100644
--- a/apis/management.cattle.io/v3/rke_types.go
+++ b/apis/management.cattle.io/v3/rke_types.go
@@ -33,16 +33,6 @@ type RancherKubernetesEngineConfig struct {
 	ClusterName string `yaml:"cluster_name" json:"clusterName,omitempty"`
 	// Cloud Provider options
 	CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"`
-	// AWSCloudProvicer
-	AWSCloudProvider AWSCloudProvider `yaml:",omitempty" json:"awsCloudProvider,omitempty"`
-	// AzureCloudProvicer
-	AzureCloudProvider AzureCloudProvider `yaml:",omitempty" json:"azureCloudProvider,omitempty"`
-	// CalicoNetworkProvider
-	CalicoNetworkProvider CalicoNetworkProvider `yaml:",omitempty" json:"calicoNetworkProvider,omitempty"`
-	// CanalNetworkProvider
-	CanalNetworkProvider CanalNetworkProvider `yaml:",omitempty" json:"canalNetworkProvider,omitempty"`
-	// FlannelNetworkProvider
-	FlannelNetworkProvider FlannelNetworkProvider `yaml:",omitempty" json:"flannelNetworkProvider,omitempty"`
 }
 
 type PrivateRegistry struct {
@@ -227,6 +217,12 @@ type NetworkConfig struct {
 	Plugin string `yaml:"plugin" json:"plugin,omitempty"`
 	// Plugin options to configure network properties
 	Options map[string]string `yaml:"options" json:"options,omitempty"`
+	// CalicoNetworkProvider
+	CalicoNetworkProvider *CalicoNetworkProvider `yaml:",omitempty" json:"calicoNetworkProvider,omitempty"`
+	// CanalNetworkProvider
+	CanalNetworkProvider *CanalNetworkProvider `yaml:",omitempty" json:"canalNetworkProvider,omitempty"`
+	// FlannelNetworkProvider
+	FlannelNetworkProvider *FlannelNetworkProvider `yaml:",omitempty" json:"flannelNetworkProvider,omitempty"`
 }
 
 type AuthnConfig struct {
@@ -316,6 +312,10 @@ type CloudProvider struct {
 	Name string `yaml:"name" json:"name,omitempty"`
 	// Configuration Options of Cloud Provider
 	CloudConfig map[string]string `yaml:"cloud_config" json:"cloudConfig,omitempty"`
+	// AWSCloudProvicer
+	AWSCloudProvider *AWSCloudProvider `yaml:",omitempty" json:"awsCloudProvider,omitempty"`
+	// AzureCloudProvicer
+	AzureCloudProvider *AzureCloudProvider `yaml:",omitempty" json:"azureCloudProvider,omitempty"`
 }
 
 type AzureCloudProvider struct {