1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-19 18:30:38 +00:00

Nit fixes for ingress

This commit is contained in:
moelsayed
2018-02-28 01:58:43 +02:00
parent bf41e6834c
commit 473fe2c259
2 changed files with 24 additions and 3 deletions

View File

@@ -134,3 +134,24 @@ private_registries:
- url: registry.com
user: Username
password: password
# Currently only nginx ingress provider is supported.
# To disable ingress controller, set `provider: none`
# To enable ingress on specific nodes, use the node_selector, eg:
# nodes:
# - address: example.com
# user: ubuntu
# role:
# - role
# hostname_override: node3
# internal_address: 192.168.1.6
# labels:
# app: ingress
#
# ingress:
# provider: nginx
# node_selector:
# app: ingress
ingress:
provider: nginx

View File

@@ -127,11 +127,11 @@ func (c *Cluster) ApplySystemAddonExcuteJob(addonJob string) error {
}
func (c *Cluster) deployIngress(ctx context.Context) error {
log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Provider)
if c.Ingress.Provider == "none" {
log.Infof(ctx, "[ingress] ingress controller is not defined")
log.Infof(ctx, "[ingress] ingress controller is not defined, skipping ingress controller")
return nil
}
log.Infof(ctx, "[ingress] Setting up %s ingress controller", c.Ingress.Provider)
ingressConfig := ingressOptions{
RBACConfig: c.Authorization.Mode,
Options: c.Ingress.Options,