From 14e03b23f02aaf3050510e5b1ead85c9e1faa5a8 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 11 Jul 2023 14:58:04 -0400 Subject: [PATCH] fix: fiddle with cilium l2announcement values Signed-off-by: Devin Buhl --- README.md | 1 - .../templates/custom-cilium-helmchart.yaml.j2 | 6 +++--- .../apps/kube-system/cilium/app/helmrelease.yaml.j2 | 6 +++--- template/vars/config.sample.yaml | 10 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 76d55408..8ce97090 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,6 @@ With that out of the way please continue on if you are still interested... Download [Debian 12](https://cdimage.debian.org/debian-cd/current/amd64/iso-dvd/) (for raspi/arm64 use the [tested images](https://raspi.debian.net/tested-images/)) - #### AMD64 There is a decent guide [here](https://www.linuxtechi.com/how-to-install-debian-12-step-by-step/) on how to get Debian installed. diff --git a/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 b/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 index c2910f41..ee8579fa 100644 --- a/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 +++ b/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2 @@ -38,9 +38,9 @@ spec: # https://github.com/cilium/cilium/issues/26586 l2announcements: enabled: true - leaseDuration: 30s - leaseRenewDeadline: 10s - leaseRetryPeriod: 4s + leaseDuration: 120s + leaseRenewDeadline: 60s + leaseRetryPeriod: 1s loadBalancer: algorithm: maglev mode: dsr diff --git a/template/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 b/template/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 index a88d01a3..d1c5a538 100644 --- a/template/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 +++ b/template/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 @@ -81,9 +81,9 @@ spec: # https://github.com/cilium/cilium/issues/26586 l2announcements: enabled: true - leaseDuration: 30s - leaseRenewDeadline: 10s - leaseRetryPeriod: 4s + leaseDuration: 120s + leaseRenewDeadline: 60s + leaseRetryPeriod: 1s loadBalancer: algorithm: maglev mode: dsr diff --git a/template/vars/config.sample.yaml b/template/vars/config.sample.yaml index 6b89b622..16affec4 100644 --- a/template/vars/config.sample.yaml +++ b/template/vars/config.sample.yaml @@ -30,12 +30,12 @@ bootstrap_cloudflare_tunnel_id: # CIDR your nodes are on (e.g. 192.168.1.0/24) bootstrap_node_cidr: -# Load balancer IP for k8s_gateway, choose an available IP in your nodes network that is not being used -bootstrap_k8s_gateway_addr: -# Load balancer IP for ingress-nginx, choose an available IP in your nodes network that is not being used -bootstrap_ingress_nginx_addr: -# IP address to use with kube-vip, choose an available IP in your nodes network that is not being used +# The IP address to use with kube-vip, choose an available IP in your nodes network that is not being used bootstrap_kube_vip_addr: +# The Load balancer IP for k8s_gateway, choose an available IP in your nodes network that is not being used +bootstrap_k8s_gateway_addr: +# The Load balancer IP for ingress-nginx, choose an available IP in your nodes network that is not being used +bootstrap_ingress_nginx_addr: # Choose your cluster and service cidrs, leave these unchanged unless you know what you are doing bootstrap_cluster_cidr: 10.42.0.0/16 bootstrap_service_cidr: 10.43.0.0/16