From dfbf46032015c96d6cad5e0a0c1ee1d99fad0d8f Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Fri, 15 May 2020 17:42:44 -0700
Subject: [PATCH] Rename types to match the wrongly capitalized CRD

The CRDs for these types got created with the wrong capitalization for
the kind.  GlobalDNS was created as GlobalDns.  In order to make the
codename match the CRD we've renamed them to the wrong capitalization.
---
 .../management.cattle.io/v3/globaldns_types.go |  2 +-
 apis/management.cattle.io/v3/rke_types.go      |  6 +++---
 apis/management.cattle.io/v3/schema/schema.go  | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go
index 2d9399da..6d2c6c5d 100644
--- a/apis/management.cattle.io/v3/globaldns_types.go
+++ b/apis/management.cattle.io/v3/globaldns_types.go
@@ -5,7 +5,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type GlobalDNS struct {
+type GlobalDns struct {
 	types.Namespaced
 
 	metav1.TypeMeta `json:",inline"`
diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go
index 7eab0294..09148adf 100644
--- a/apis/management.cattle.io/v3/rke_types.go
+++ b/apis/management.cattle.io/v3/rke_types.go
@@ -203,7 +203,7 @@ type RKEConfigNode struct {
 	Taints []RKETaint `yaml:"taints" json:"taints,omitempty"`
 }
 
-type RKEK8sSystemImage struct {
+type RkeK8sSystemImage struct {
 	types.Namespaced
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -211,7 +211,7 @@ type RKEK8sSystemImage struct {
 	SystemImages RKESystemImages `yaml:"system_images" json:"systemImages,omitempty"`
 }
 
-type RKEK8sServiceOption struct {
+type RkeK8sServiceOption struct {
 	types.Namespaced
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -219,7 +219,7 @@ type RKEK8sServiceOption struct {
 	ServiceOptions KubernetesServicesOptions `yaml:"service_options" json:"serviceOptions,omitempty"`
 }
 
-type RKEAddon struct {
+type RkeAddon struct {
 	types.Namespaced
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go
index d2756964..b2ab8d69 100644
--- a/apis/management.cattle.io/v3/schema/schema.go
+++ b/apis/management.cattle.io/v3/schema/schema.go
@@ -103,12 +103,12 @@ func mgmtSecretTypes(schemas *types.Schemas) *types.Schemas {
 
 func driverMetadataTypes(schemas *types.Schemas) *types.Schemas {
 	return schemas.
-		AddMapperForType(&Version, v3.RKEK8sSystemImage{}, m.Drop{Field: "namespaceId"}).
-		AddMapperForType(&Version, v3.RKEK8sServiceOption{}, m.Drop{Field: "namespaceId"}).
-		AddMapperForType(&Version, v3.RKEAddon{}, m.Drop{Field: "namespaceId"}).
-		MustImport(&Version, v3.RKEK8sSystemImage{}).
-		MustImport(&Version, v3.RKEK8sServiceOption{}).
-		MustImport(&Version, v3.RKEAddon{})
+		AddMapperForType(&Version, v3.RkeK8sSystemImage{}, m.Drop{Field: "namespaceId"}).
+		AddMapperForType(&Version, v3.RkeK8sServiceOption{}, m.Drop{Field: "namespaceId"}).
+		AddMapperForType(&Version, v3.RkeAddon{}, m.Drop{Field: "namespaceId"}).
+		MustImport(&Version, v3.RkeK8sSystemImage{}).
+		MustImport(&Version, v3.RkeK8sServiceOption{}).
+		MustImport(&Version, v3.RkeAddon{})
 }
 
 func driverMetadataCisTypes(schemas *types.Schemas) *types.Schemas {
@@ -797,15 +797,15 @@ func multiClusterAppTypes(schemas *types.Schemas) *types.Schemas {
 
 func globalDNSTypes(schemas *types.Schemas) *types.Schemas {
 	return schemas.
-		TypeName("globalDns", v3.GlobalDNS{}).
+		TypeName("globalDns", v3.GlobalDns{}).
 		TypeName("globalDnsProvider", v3.GlobalDNSProvider{}).
 		TypeName("globalDnsSpec", v3.GlobalDNSSpec{}).
 		TypeName("globalDnsStatus", v3.GlobalDNSStatus{}).
 		TypeName("globalDnsProviderSpec", v3.GlobalDNSProviderSpec{}).
 		MustImport(&Version, v3.UpdateGlobalDNSTargetsInput{}).
-		AddMapperForType(&Version, v3.GlobalDNS{}, m.Drop{Field: "namespaceId"}).
+		AddMapperForType(&Version, v3.GlobalDns{}, m.Drop{Field: "namespaceId"}).
 		AddMapperForType(&Version, v3.GlobalDNSProvider{}, m.Drop{Field: "namespaceId"}).
-		MustImportAndCustomize(&Version, v3.GlobalDNS{}, func(schema *types.Schema) {
+		MustImportAndCustomize(&Version, v3.GlobalDns{}, func(schema *types.Schema) {
 			schema.ResourceActions = map[string]types.Action{
 				"addProjects": {
 					Input: "updateGlobalDNSTargetsInput",