diff --git a/cluster.yml b/cluster.yml index 5feb1545..19514476 100644 --- a/cluster.yml +++ b/cluster.yml @@ -81,7 +81,7 @@ services: network: plugin: flannel options: - + authentication: strategy: x509 @@ -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 diff --git a/cluster/addons.go b/cluster/addons.go index cda00a6a..de4cdc7c 100644 --- a/cluster/addons.go +++ b/cluster/addons.go @@ -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,