1
0
mirror of https://github.com/rancher/types.git synced 2025-09-01 21:32:10 +00:00

Merge pull request #1174 from luthermonson/wins

win_ Params for RKE
This commit is contained in:
Luther Monson
2020-07-23 15:40:53 -07:00
committed by GitHub
11 changed files with 125 additions and 49 deletions

View File

@@ -46,6 +46,8 @@ type RancherKubernetesEngineConfig struct {
CloudProvider CloudProvider `yaml:"cloud_provider" json:"cloudProvider,omitempty"`
// kubernetes directory path
PrefixPath string `yaml:"prefix_path" json:"prefixPath,omitempty"`
// kubernetes directory path for windows
WindowsPrefixPath string `yaml:"win_prefix_path" json:"winPrefixPath,omitempty"`
// Timeout in seconds for status check on addon deployment jobs
AddonJobTimeout int `yaml:"addon_job_timeout" json:"addonJobTimeout,omitempty" norman:"default=30"`
// Bastion/Jump Host configuration
@@ -363,6 +365,14 @@ type BaseService struct {
ExtraBinds []string `yaml:"extra_binds" json:"extraBinds,omitempty"`
// this is to provide extra env variable to the docker container running kubernetes service
ExtraEnv []string `yaml:"extra_env" json:"extraEnv,omitempty"`
// Windows nodes only of the same as the above
// Extra arguments that are added to the services
WindowsExtraArgs map[string]string `yaml:"win_extra_args" json:"winExtraArgs,omitempty"`
// Extra binds added to the nodes
WindowsExtraBinds []string `yaml:"win_extra_binds" json:"winExtraBinds,omitempty"`
// this is to provide extra env variable to the docker container running kubernetes service
WindowsExtraEnv []string `yaml:"win_extra_env" json:"winExtraEnv,omitempty"`
}
type NetworkConfig struct {

View File

@@ -521,6 +521,23 @@ func (in *BaseService) DeepCopyInto(out *BaseService) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.WindowsExtraArgs != nil {
in, out := &in.WindowsExtraArgs, &out.WindowsExtraArgs
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
if in.WindowsExtraBinds != nil {
in, out := &in.WindowsExtraBinds, &out.WindowsExtraBinds
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.WindowsExtraEnv != nil {
in, out := &in.WindowsExtraEnv, &out.WindowsExtraEnv
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}