1
0
mirror of https://github.com/rancher/types.git synced 2025-07-31 20:55:00 +00:00

Revert "Revert "Adds options to global DNS [types-2.4]""

This commit is contained in:
Caleb Bron 2020-11-23 21:12:14 -07:00 committed by GitHub
parent c663f1105b
commit a647a415b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 38 deletions

View File

@ -52,18 +52,20 @@ 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"`
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"`
}
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"`
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"`
}
type UpdateGlobalDNSTargetsInput struct {
@ -71,6 +73,7 @@ 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"`
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"`
}

View File

@ -171,6 +171,13 @@ 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
}
@ -1267,6 +1274,13 @@ 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
}
@ -4020,7 +4034,7 @@ func (in *GlobalDNSProviderSpec) DeepCopyInto(out *GlobalDNSProviderSpec) {
if in.Route53ProviderConfig != nil {
in, out := &in.Route53ProviderConfig, &out.Route53ProviderConfig
*out = new(Route53ProviderConfig)
**out = **in
(*in).DeepCopyInto(*out)
}
if in.CloudflareProviderConfig != nil {
in, out := &in.CloudflareProviderConfig, &out.CloudflareProviderConfig
@ -4030,7 +4044,7 @@ func (in *GlobalDNSProviderSpec) DeepCopyInto(out *GlobalDNSProviderSpec) {
if in.AlidnsProviderConfig != nil {
in, out := &in.AlidnsProviderConfig, &out.AlidnsProviderConfig
*out = new(AlidnsProviderConfig)
**out = **in
(*in).DeepCopyInto(*out)
}
if in.Members != nil {
in, out := &in.Members, &out.Members
@ -9052,6 +9066,13 @@ 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
}

View File

@ -1,12 +1,14 @@
package client
const (
AlidnsProviderConfigType = "alidnsProviderConfig"
AlidnsProviderConfigFieldAccessKey = "accessKey"
AlidnsProviderConfigFieldSecretKey = "secretKey"
AlidnsProviderConfigType = "alidnsProviderConfig"
AlidnsProviderConfigFieldAccessKey = "accessKey"
AlidnsProviderConfigFieldAdditionalOptions = "additionalOptions"
AlidnsProviderConfigFieldSecretKey = "secretKey"
)
type AlidnsProviderConfig struct {
AccessKey string `json:"accessKey,omitempty" yaml:"accessKey,omitempty"`
SecretKey string `json:"secretKey,omitempty" yaml:"secretKey,omitempty"`
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"`
}

View File

@ -1,14 +1,16 @@
package client
const (
CloudflareProviderConfigType = "cloudflareProviderConfig"
CloudflareProviderConfigFieldAPIEmail = "apiEmail"
CloudflareProviderConfigFieldAPIKey = "apiKey"
CloudflareProviderConfigFieldProxySetting = "proxySetting"
CloudflareProviderConfigType = "cloudflareProviderConfig"
CloudflareProviderConfigFieldAPIEmail = "apiEmail"
CloudflareProviderConfigFieldAPIKey = "apiKey"
CloudflareProviderConfigFieldAdditionalOptions = "additionalOptions"
CloudflareProviderConfigFieldProxySetting = "proxySetting"
)
type CloudflareProviderConfig struct {
APIEmail string `json:"apiEmail,omitempty" yaml:"apiEmail,omitempty"`
APIKey string `json:"apiKey,omitempty" yaml:"apiKey,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"`
AdditionalOptions map[string]string `json:"additionalOptions,omitempty" yaml:"additionalOptions,omitempty"`
ProxySetting *bool `json:"proxySetting,omitempty" yaml:"proxySetting,omitempty"`
}

View File

@ -1,20 +1,22 @@
package client
const (
Route53ProviderConfigType = "route53ProviderConfig"
Route53ProviderConfigFieldAccessKey = "accessKey"
Route53ProviderConfigFieldCredentialsPath = "credentialsPath"
Route53ProviderConfigFieldRegion = "region"
Route53ProviderConfigFieldRoleArn = "roleArn"
Route53ProviderConfigFieldSecretKey = "secretKey"
Route53ProviderConfigFieldZoneType = "zoneType"
Route53ProviderConfigType = "route53ProviderConfig"
Route53ProviderConfigFieldAccessKey = "accessKey"
Route53ProviderConfigFieldAdditionalOptions = "additionalOptions"
Route53ProviderConfigFieldCredentialsPath = "credentialsPath"
Route53ProviderConfigFieldRegion = "region"
Route53ProviderConfigFieldRoleArn = "roleArn"
Route53ProviderConfigFieldSecretKey = "secretKey"
Route53ProviderConfigFieldZoneType = "zoneType"
)
type Route53ProviderConfig struct {
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"`
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"`
}