diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go index 88a99425..2d9399da 100644 --- a/apis/management.cattle.io/v3/globaldns_types.go +++ b/apis/management.cattle.io/v3/globaldns_types.go @@ -52,20 +52,18 @@ type GlobalDNSProviderSpec struct { } type Route53ProviderConfig struct { - AccessKey string `json:"accessKey" norman:"notnullable,required,minLength=1"` - SecretKey string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"` - CredentialsPath string `json:"credentialsPath" norman:"default=/.aws"` - RoleArn string `json:"roleArn,omitempty"` - Region string `json:"region" norman:"default=us-east-1"` - ZoneType string `json:"zoneType" norman:"default=public"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty"` + AccessKey string `json:"accessKey" norman:"notnullable,required,minLength=1"` + SecretKey string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"` + CredentialsPath string `json:"credentialsPath" norman:"default=/.aws"` + RoleArn string `json:"roleArn,omitempty"` + Region string `json:"region" norman:"default=us-east-1"` + ZoneType string `json:"zoneType" norman:"default=public"` } type CloudflareProviderConfig struct { - APIKey string `json:"apiKey" norman:"notnullable,required,minLength=1,type=password"` - APIEmail string `json:"apiEmail" norman:"notnullable,required,minLength=1"` - ProxySetting *bool `json:"proxySetting" norman:"default=true"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty"` + APIKey string `json:"apiKey" norman:"notnullable,required,minLength=1,type=password"` + APIEmail string `json:"apiEmail" norman:"notnullable,required,minLength=1"` + ProxySetting *bool `json:"proxySetting" norman:"default=true"` } type UpdateGlobalDNSTargetsInput struct { @@ -73,7 +71,6 @@ type UpdateGlobalDNSTargetsInput struct { } type AlidnsProviderConfig struct { - AccessKey string `json:"accessKey" norman:"notnullable,required,minLength=1"` - SecretKey string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty"` + AccessKey string `json:"accessKey" norman:"notnullable,required,minLength=1"` + SecretKey string `json:"secretKey" norman:"notnullable,required,minLength=1,type=password"` } diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 22ce0cdb..0a893327 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -171,13 +171,6 @@ func (in *AlertStatus) DeepCopy() *AlertStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AlidnsProviderConfig) DeepCopyInto(out *AlidnsProviderConfig) { *out = *in - if in.AdditionalOptions != nil { - in, out := &in.AdditionalOptions, &out.AdditionalOptions - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } return } @@ -1274,13 +1267,6 @@ func (in *CloudflareProviderConfig) DeepCopyInto(out *CloudflareProviderConfig) *out = new(bool) **out = **in } - if in.AdditionalOptions != nil { - in, out := &in.AdditionalOptions, &out.AdditionalOptions - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } return } @@ -4034,7 +4020,7 @@ func (in *GlobalDNSProviderSpec) DeepCopyInto(out *GlobalDNSProviderSpec) { if in.Route53ProviderConfig != nil { in, out := &in.Route53ProviderConfig, &out.Route53ProviderConfig *out = new(Route53ProviderConfig) - (*in).DeepCopyInto(*out) + **out = **in } if in.CloudflareProviderConfig != nil { in, out := &in.CloudflareProviderConfig, &out.CloudflareProviderConfig @@ -4044,7 +4030,7 @@ func (in *GlobalDNSProviderSpec) DeepCopyInto(out *GlobalDNSProviderSpec) { if in.AlidnsProviderConfig != nil { in, out := &in.AlidnsProviderConfig, &out.AlidnsProviderConfig *out = new(AlidnsProviderConfig) - (*in).DeepCopyInto(*out) + **out = **in } if in.Members != nil { in, out := &in.Members, &out.Members @@ -9066,13 +9052,6 @@ func (in *RotateCertificates) DeepCopy() *RotateCertificates { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Route53ProviderConfig) DeepCopyInto(out *Route53ProviderConfig) { *out = *in - if in.AdditionalOptions != nil { - in, out := &in.AdditionalOptions, &out.AdditionalOptions - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } return } diff --git a/client/management/v3/zz_generated_alidns_provider_config.go b/client/management/v3/zz_generated_alidns_provider_config.go index a58df2ca..02b5c7ed 100644 --- a/client/management/v3/zz_generated_alidns_provider_config.go +++ b/client/management/v3/zz_generated_alidns_provider_config.go @@ -1,14 +1,12 @@ package client const ( - AlidnsProviderConfigType = "alidnsProviderConfig" - AlidnsProviderConfigFieldAccessKey = "accessKey" - AlidnsProviderConfigFieldAdditionalOptions = "additionalOptions" - AlidnsProviderConfigFieldSecretKey = "secretKey" + AlidnsProviderConfigType = "alidnsProviderConfig" + AlidnsProviderConfigFieldAccessKey = "accessKey" + AlidnsProviderConfigFieldSecretKey = "secretKey" ) type AlidnsProviderConfig struct { - AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty" yaml:"additionalOptions,omitempty"` - SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` + AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` + SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` } diff --git a/client/management/v3/zz_generated_cloudflare_provider_config.go b/client/management/v3/zz_generated_cloudflare_provider_config.go index 98ed9724..7e1087ef 100644 --- a/client/management/v3/zz_generated_cloudflare_provider_config.go +++ b/client/management/v3/zz_generated_cloudflare_provider_config.go @@ -1,16 +1,14 @@ package client const ( - CloudflareProviderConfigType = "cloudflareProviderConfig" - CloudflareProviderConfigFieldAPIEmail = "apiEmail" - CloudflareProviderConfigFieldAPIKey = "apiKey" - CloudflareProviderConfigFieldAdditionalOptions = "additionalOptions" - CloudflareProviderConfigFieldProxySetting = "proxySetting" + CloudflareProviderConfigType = "cloudflareProviderConfig" + CloudflareProviderConfigFieldAPIEmail = "apiEmail" + CloudflareProviderConfigFieldAPIKey = "apiKey" + CloudflareProviderConfigFieldProxySetting = "proxySetting" ) type CloudflareProviderConfig struct { - APIEmail string `json:"apiEmail,omitempty" yaml:"apiEmail,omitempty"` - APIKey string `json:"apiKey,omitempty" yaml:"apiKey,omitempty"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty" yaml:"additionalOptions,omitempty"` - ProxySetting *bool `json:"proxySetting,omitempty" yaml:"proxySetting,omitempty"` + APIEmail string `json:"apiEmail,omitempty" yaml:"apiEmail,omitempty"` + APIKey string `json:"apiKey,omitempty" yaml:"apiKey,omitempty"` + ProxySetting *bool `json:"proxySetting,omitempty" yaml:"proxySetting,omitempty"` } diff --git a/client/management/v3/zz_generated_route53provider_config.go b/client/management/v3/zz_generated_route53provider_config.go index 0932c3f5..fc082c5e 100644 --- a/client/management/v3/zz_generated_route53provider_config.go +++ b/client/management/v3/zz_generated_route53provider_config.go @@ -1,22 +1,20 @@ package client const ( - Route53ProviderConfigType = "route53ProviderConfig" - Route53ProviderConfigFieldAccessKey = "accessKey" - Route53ProviderConfigFieldAdditionalOptions = "additionalOptions" - Route53ProviderConfigFieldCredentialsPath = "credentialsPath" - Route53ProviderConfigFieldRegion = "region" - Route53ProviderConfigFieldRoleArn = "roleArn" - Route53ProviderConfigFieldSecretKey = "secretKey" - Route53ProviderConfigFieldZoneType = "zoneType" + Route53ProviderConfigType = "route53ProviderConfig" + Route53ProviderConfigFieldAccessKey = "accessKey" + Route53ProviderConfigFieldCredentialsPath = "credentialsPath" + Route53ProviderConfigFieldRegion = "region" + Route53ProviderConfigFieldRoleArn = "roleArn" + Route53ProviderConfigFieldSecretKey = "secretKey" + Route53ProviderConfigFieldZoneType = "zoneType" ) type Route53ProviderConfig struct { - AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` - AdditionalOptions map[string]string `json:"additionalOptions,omitempty" yaml:"additionalOptions,omitempty"` - CredentialsPath string `json:"credentialsPath,omitempty" yaml:"credentialsPath,omitempty"` - Region string `json:"region,omitempty" yaml:"region,omitempty"` - RoleArn string `json:"roleArn,omitempty" yaml:"roleArn,omitempty"` - SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` - ZoneType string `json:"zoneType,omitempty" yaml:"zoneType,omitempty"` + AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"` + CredentialsPath string `json:"credentialsPath,omitempty" yaml:"credentialsPath,omitempty"` + Region string `json:"region,omitempty" yaml:"region,omitempty"` + RoleArn string `json:"roleArn,omitempty" yaml:"roleArn,omitempty"` + SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"` + ZoneType string `json:"zoneType,omitempty" yaml:"zoneType,omitempty"` }