mirror of
https://github.com/rancher/rke.git
synced 2025-09-15 22:49:13 +00:00
Updated cluster/addons.go to allow it to parse and send new http_port and https_ports to the ingress template
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:
committed by
Gaurav Mehta
parent
33c69c0108
commit
5a63de09bc
@@ -62,6 +62,9 @@ type ingressOptions struct {
|
||||
AlpineImage string
|
||||
IngressImage string
|
||||
IngressBackend string
|
||||
HTTPPort int
|
||||
HTTPSPort int
|
||||
NetworkMode string
|
||||
UpdateStrategy *appsv1.DaemonSetUpdateStrategy
|
||||
}
|
||||
|
||||
@@ -565,6 +568,9 @@ func (c *Cluster) deployIngress(ctx context.Context, data map[string]interface{}
|
||||
ExtraEnvs: c.Ingress.ExtraEnvs,
|
||||
ExtraVolumes: c.Ingress.ExtraVolumes,
|
||||
ExtraVolumeMounts: c.Ingress.ExtraVolumeMounts,
|
||||
HTTPPort: c.Ingress.HTTPPort,
|
||||
HTTPSPort: c.Ingress.HTTPSPort,
|
||||
NetworkMode: c.Ingress.NetworkMode,
|
||||
UpdateStrategy: &appsv1.DaemonSetUpdateStrategy{
|
||||
Type: c.Ingress.UpdateStrategy.Strategy,
|
||||
RollingUpdate: c.Ingress.UpdateStrategy.RollingUpdate,
|
||||
|
Reference in New Issue
Block a user