1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 23:16:22 +00:00
This commit is contained in:
Luther Monson
2020-08-20 14:08:21 -07:00
parent de19c42611
commit 65f31dfcdc
3 changed files with 14 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@@ -6063,12 +6063,12 @@
{
"maxChannelServerVersion": "v2.4.99",
"minChannelServerVersion": "v2.4.0-rc1",
"version": "v1.17.9+k3s1"
"version": "v1.17.11+k3s1"
},
{
"maxChannelServerVersion": "v2.4.99",
"minChannelServerVersion": "v2.4.5-rc1",
"version": "v1.18.6+k3s1"
"version": "v1.18.8+k3s1"
}
]
},

View File

@@ -45,6 +45,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
@@ -338,6 +340,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 {