From f9a859e95c380cc4434d61a2e40e3f6fcba8e989 Mon Sep 17 00:00:00 2001 From: Ruakij Date: Sun, 19 Mar 2023 13:56:26 +0100 Subject: [PATCH] Add ingress-option --- kubernetes/defaults/main.yml | 2 ++ kubernetes/templates/k3s/server/config.yaml.jinja2 | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kubernetes/defaults/main.yml b/kubernetes/defaults/main.yml index 378fb96..414e0ea 100644 --- a/kubernetes/defaults/main.yml +++ b/kubernetes/defaults/main.yml @@ -19,3 +19,5 @@ kubernetes: # One of [flannel, calico] network_plugin: calico + # One of [traefik-ingress] + ingress_controller: traefik-ingress diff --git a/kubernetes/templates/k3s/server/config.yaml.jinja2 b/kubernetes/templates/k3s/server/config.yaml.jinja2 index a6c05a6..3dd95aa 100644 --- a/kubernetes/templates/k3s/server/config.yaml.jinja2 +++ b/kubernetes/templates/k3s/server/config.yaml.jinja2 @@ -24,5 +24,7 @@ disable-network-policy: true flannel-backend: none {% endif %} -# FIXME: Workaround for bug in Kubernetes 1.24/1.25 ignoring node IPv6 addresses -kubelet-arg: "--node-ip=0.0.0.0" +# Ingress-plugin +{% if kubernetes.ingress_controller != "traefik-ingress" %} +disable: traefik +{% endif %}