1
0
mirror of https://github.com/rancher/types.git synced 2025-09-17 15:29:10 +00:00

Merge pull request #1184 from superseb/v24_ingresshostport

[release/v2.4] Ability to change network mode/ports for ingress
This commit is contained in:
Sebastiaan van Steenis
2020-10-22 19:14:46 +02:00
committed by GitHub
2 changed files with 12 additions and 0 deletions

View File

@@ -438,6 +438,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 {

View File

@@ -7,6 +7,9 @@ const (
IngressConfigFieldExtraEnvs = "extraEnvs"
IngressConfigFieldExtraVolumeMounts = "extraVolumeMounts"
IngressConfigFieldExtraVolumes = "extraVolumes"
IngressConfigFieldHTTPPort = "httpPort"
IngressConfigFieldHTTPSPort = "httpsPort"
IngressConfigFieldNetworkMode = "networkMode"
IngressConfigFieldNodeSelector = "nodeSelector"
IngressConfigFieldOptions = "options"
IngressConfigFieldProvider = "provider"
@@ -19,6 +22,9 @@ type IngressConfig struct {
ExtraEnvs []interface{} `json:"extraEnvs,omitempty" yaml:"extraEnvs,omitempty"`
ExtraVolumeMounts []interface{} `json:"extraVolumeMounts,omitempty" yaml:"extraVolumeMounts,omitempty"`
ExtraVolumes []interface{} `json:"extraVolumes,omitempty" yaml:"extraVolumes,omitempty"`
HTTPPort int64 `json:"httpPort,omitempty" yaml:"httpPort,omitempty"`
HTTPSPort int64 `json:"httpsPort,omitempty" yaml:"httpsPort,omitempty"`
NetworkMode string `json:"networkMode,omitempty" yaml:"networkMode,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"`