rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 15:06:23 +00:00
Code Issues Releases Wiki Activity

Updated cluster/addons.go to allow it to parse and send new http_port and https_ports to the ingress template

Browse Source 
Fixed up yaml import package

Updated rke ingress addon to support a new field hostNetwork. Users can use this now to run ingress controller on overlay network only

Ported additional ingress types changes into types/rke_types

Fixed linting errors related to variable names in addons.go and rke_types

Changed types for hostNetwork and http/https ports

Added validation to check http/https ports are different

Changed rke_types for additional spec in ingressConfig. Changed validation and default logic accordingly
This commit is contained in:
Gaurav Mehta
2020-02-13 16:27:12 +11:00
committed by Gaurav Mehta
parent 33c69c0108
commit 5a63de09bc
5 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
types/rke_types.go
View File

@@ -415,6 +415,12 @@ type IngressConfig struct {
ExtraVolumeMounts []ExtraVolumeMount `yaml:"extra_volume_mounts" json:"extraVolumeMounts,omitempty" norman:"type=array[json]"`
// nginx daemonset upgrade strategy
UpdateStrategy *DaemonSetUpdateStrategy `yaml:"update_strategy" json:"updateStrategy,omitempty"`
// Http port for ingress controller daemonset
HTTPPort int `yaml:"http_port" json:"httpPort,omitempty"`
// Https port for ingress controller daemonset
HTTPSPort int `yaml:"https_port" json:"httpsPort,omitempty"`
// NetworkMode selector for ingress controller pods. Default is HostNetwork
NetworkMode string `yaml:"network_mode" json:"networkMode,omitempty"`
}
type ExtraEnv struct {