From 13a005d23ddb339ff3bc6716a67df3c99bc2f28a Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 18 Jan 2024 06:27:58 -0500 Subject: [PATCH] feat: k3s use 127.0.0.1:6444 for Cilium k8sServiceHost:k8sServicePort Signed-off-by: Devin Buhl --- .../playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 | 4 ++-- .../apps/kube-system/cilium/app/helmrelease.yaml.j2 | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 index cf0ad430..8346ffed 100644 --- a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 +++ b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 @@ -37,8 +37,8 @@ spec: ipv6: enabled: true #% endif %# - k8sServiceHost: "{{ kube_api_addr }}" - k8sServicePort: 6443 + k8sServiceHost: 127.0.0.1 + k8sServicePort: 6444 kubeProxyReplacement: true kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 l2announcements: diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 index 7f249913..fa5e8a82 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 @@ -90,8 +90,13 @@ spec: ipv6: enabled: true #% endif %# + #% if bootstrap_distribution == "k3s" %# + k8sServiceHost: 127.0.0.1 + k8sServicePort: 6444 + #% else %# k8sServiceHost: "${KUBE_API_ADDR}" k8sServicePort: 6443 + #% endif %# kubeProxyReplacement: true kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256 l2announcements: