rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-02 00:11:48 +00:00
Code Issues Releases Wiki Activity

Merge pull request #368 from rawmind0/master

Browse Source 
Renamed ExtraArguments to ExtraArgs at IngressConfig rke types
This commit is contained in:
Alena Prokharchyk 2018-04-16 13:45:50 -07:00 committed by GitHub
commit 85220a542b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ type IngressConfig struct {
// NodeSelector key pair
NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
// Ingress controller extra arguments
ExtraArguments []string `yaml:"extra_arguments" json:"extraArguments,omitempty"`
ExtraArgs []string `yaml:"extra_args" json:"extraArgs,omitempty"`
}
type RKEPlan struct {

4
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@ -3216,8 +3216,8 @@ func (in *IngressConfig) DeepCopyInto(out *IngressConfig) {
(*out)[key] = val
}
}
if in.ExtraArguments != nil {
in, out := &in.ExtraArguments, &out.ExtraArguments
if in.ExtraArgs != nil {
in, out := &in.ExtraArgs, &out.ExtraArgs
*out = make([]string, len(*in))
copy(*out, *in)
}

18
client/management/v3/zz_generated_ingress_config.go
View File

@ -1,16 +1,16 @@
package client
const (
IngressConfigType = "ingressConfig"
IngressConfigFieldExtraArguments = "extraArguments"
IngressConfigFieldNodeSelector = "nodeSelector"
IngressConfigFieldOptions = "options"
IngressConfigFieldProvider = "provider"
IngressConfigType = "ingressConfig"
IngressConfigFieldExtraArgs = "extraArgs"
IngressConfigFieldNodeSelector = "nodeSelector"
IngressConfigFieldOptions = "options"
IngressConfigFieldProvider = "provider"
)
type IngressConfig struct {
ExtraArguments []string `json:"extraArguments,omitempty" yaml:"extraArguments,omitempty"`
NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
Options map[string]string `json:"options,omitempty" yaml:"options,omitempty"`
Provider string `json:"provider,omitempty" yaml:"provider,omitempty"`
ExtraArgs []string `json:"extraArgs,omitempty" yaml:"extraArgs,omitempty"`
NodeSelector map[string]string `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
Options map[string]string `json:"options,omitempty" yaml:"options,omitempty"`
Provider string `json:"provider,omitempty" yaml:"provider,omitempty"`
}