diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 1ba9af82..43b6d78c 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -8,7 +8,7 @@ type RancherKubernetesEngineConfig struct { // Network configuration used in the kubernetes cluster (flannel, calico) Network NetworkConfig `yaml:"network" json:"network,omitempty"` // Authentication configuration used in the cluster (default: x509) - Authentication AuthConfig `yaml:"auth" json:"auth,omitempty"` + Authentication AuthnConfig `yaml:"authentication" json:"authentication,omitempty"` // YAML manifest for user provided addons to be deployed on the cluster Addons string `yaml:"addons" json:"addons,omitempty"` // List of images used internally for proxy, cert downlaod and kubedns @@ -111,7 +111,7 @@ type NetworkConfig struct { Options map[string]string `yaml:"options" json:"options,omitempty"` } -type AuthConfig struct { +type AuthnConfig struct { // Authentication strategy that will be used in kubernetes cluster Strategy string `yaml:"strategy" json:"strategy,omitempty"` // Authentication options diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 74bcca2e..64ff990c 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -49,7 +49,7 @@ func (in *AmazonEC2Config) DeepCopy() *AmazonEC2Config { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *AuthConfig) DeepCopyInto(out *AuthConfig) { +func (in *AuthnConfig) DeepCopyInto(out *AuthnConfig) { *out = *in if in.Options != nil { in, out := &in.Options, &out.Options @@ -61,12 +61,12 @@ func (in *AuthConfig) DeepCopyInto(out *AuthConfig) { return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthConfig. -func (in *AuthConfig) DeepCopy() *AuthConfig { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthnConfig. +func (in *AuthnConfig) DeepCopy() *AuthnConfig { if in == nil { return nil } - out := new(AuthConfig) + out := new(AuthnConfig) in.DeepCopyInto(out) return out } diff --git a/client/management/v3/zz_generated_auth_config.go b/client/management/v3/zz_generated_auth_config.go deleted file mode 100644 index 15a85fb4..00000000 --- a/client/management/v3/zz_generated_auth_config.go +++ /dev/null @@ -1,12 +0,0 @@ -package client - -const ( - AuthConfigType = "authConfig" - AuthConfigFieldOptions = "options" - AuthConfigFieldStrategy = "strategy" -) - -type AuthConfig struct { - Options map[string]string `json:"options,omitempty"` - Strategy string `json:"strategy,omitempty"` -} diff --git a/client/management/v3/zz_generated_authn_config.go b/client/management/v3/zz_generated_authn_config.go new file mode 100644 index 00000000..0a2eeab3 --- /dev/null +++ b/client/management/v3/zz_generated_authn_config.go @@ -0,0 +1,12 @@ +package client + +const ( + AuthnConfigType = "authnConfig" + AuthnConfigFieldOptions = "options" + AuthnConfigFieldStrategy = "strategy" +) + +type AuthnConfig struct { + Options map[string]string `json:"options,omitempty"` + Strategy string `json:"strategy,omitempty"` +} diff --git a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index b88e8edc..8d05fd05 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -3,7 +3,7 @@ package client const ( RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" RancherKubernetesEngineConfigFieldAddons = "addons" - RancherKubernetesEngineConfigFieldAuthentication = "auth" + RancherKubernetesEngineConfigFieldAuthentication = "authentication" RancherKubernetesEngineConfigFieldAuthorization = "authorization" RancherKubernetesEngineConfigFieldNetwork = "network" RancherKubernetesEngineConfigFieldNodes = "nodes" @@ -14,7 +14,7 @@ const ( type RancherKubernetesEngineConfig struct { Addons string `json:"addons,omitempty"` - Authentication *AuthConfig `json:"auth,omitempty"` + Authentication *AuthnConfig `json:"authentication,omitempty"` Authorization *AuthzConfig `json:"authorization,omitempty"` Network *NetworkConfig `json:"network,omitempty"` Nodes []RKEConfigNode `json:"nodes,omitempty"`