rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-04-27 10:20:48 +00:00
Code Issues Releases Wiki Activity

Rename types to match the wrongly capitalized CRD

Browse Source 
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.
This commit is contained in:
Darren Shepherd 2020-05-15 17:42:44 -07:00
parent 8b729a8f3a
commit dfbf460320
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/management.cattle.io/v3/globaldns_types.go
View File

@ -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"`

6
apis/management.cattle.io/v3/rke_types.go
View File

@ -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"`

18
apis/management.cattle.io/v3/schema/schema.go
View File

@ -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",