From a2bec9db38dc74f1970ae508bfcdb4f3c3ff057d Mon Sep 17 00:00:00 2001 From: gitlawr Date: Sun, 24 Feb 2019 20:41:35 +0800 Subject: [PATCH] Move RootDomain field from provider configs to generic spec --- apis/management.cattle.io/v3/globaldns_types.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/apis/management.cattle.io/v3/globaldns_types.go b/apis/management.cattle.io/v3/globaldns_types.go index 337650ad..fdfe6057 100644 --- a/apis/management.cattle.io/v3/globaldns_types.go +++ b/apis/management.cattle.io/v3/globaldns_types.go @@ -48,18 +48,17 @@ type GlobalDNSProviderSpec struct { CloudflareProviderConfig *CloudflareProviderConfig `json:"cloudflareProviderConfig,omitempty"` AlidnsProviderConfig *AlidnsProviderConfig `json:"alidnsProviderConfig,omitempty"` Members []Member `json:"members,omitempty"` + RootDomain string `json:"rootDomain"` } type Route53ProviderConfig struct { - RootDomain string `json:"rootDomain" norman:"required"` - 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"` } type CloudflareProviderConfig struct { - RootDomain string `json:"rootDomain" norman:"required"` - APIKey string `json:"apiKey" norman:"notnullable,required,minLength=1,type=password"` - APIEmail string `json:"apiEmail" norman:"notnullable,required,minLength=1"` + APIKey string `json:"apiKey" norman:"notnullable,required,minLength=1,type=password"` + APIEmail string `json:"apiEmail" norman:"notnullable,required,minLength=1"` } type UpdateGlobalDNSTargetsInput struct { @@ -68,9 +67,8 @@ type UpdateGlobalDNSTargetsInput struct { } type AlidnsProviderConfig struct { - RootDomain string `json:"rootDomain" norman:"required"` - 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"` } type GlobalDNSSystemImages struct {