From 916c8a0c024f8dcbcf9667729cb62e3e92eb3b31 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 23 May 2024 23:10:26 +0100
Subject: [PATCH] feat: first pieces of HAproxy support

---
 admin/libhelm.sh                       | 2 ++
 charts/kubezero-network/README.md      | 1 +
 charts/kubezero-network/values.yaml    | 1 +
 charts/kubezero/templates/network.yaml | 7 ++++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/admin/libhelm.sh b/admin/libhelm.sh
index 68f95261..7509d3f6 100644
--- a/admin/libhelm.sh
+++ b/admin/libhelm.sh
@@ -3,6 +3,8 @@
 # Simulate well-known CRDs being available
 API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1 -a policy/v1/PodDisruptionBudget"
 
+export HELM_SECRETS_BACKEND="vals"
+
 #VERSION="latest"
 VERSION="v1.28"
 
diff --git a/charts/kubezero-network/README.md b/charts/kubezero-network/README.md
index 3febb26b..33fb26a8 100644
--- a/charts/kubezero-network/README.md
+++ b/charts/kubezero-network/README.md
@@ -60,6 +60,7 @@ Kubernetes: `>= 1.26.0`
 | cilium.resources.requests.cpu | string | `"10m"` |  |
 | cilium.resources.requests.memory | string | `"256Mi"` |  |
 | cilium.tunnelProtocol | string | `"geneve"` |  |
+| haproxy.enabled | bool | `false` |  |
 | metallb.controller.nodeSelector."node-role.kubernetes.io/control-plane" | string | `""` |  |
 | metallb.controller.tolerations[0].effect | string | `"NoSchedule"` |  |
 | metallb.controller.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` |  |
diff --git a/charts/kubezero-network/values.yaml b/charts/kubezero-network/values.yaml
index 5e7a36ce..7ee731fb 100644
--- a/charts/kubezero-network/values.yaml
+++ b/charts/kubezero-network/values.yaml
@@ -71,6 +71,7 @@ cilium:
       enabled: false
     hostRoot: "/sys/fs/cgroup"
 
+  routingMode: tunnel
   tunnelProtocol: geneve
 
   prometheus:
diff --git a/charts/kubezero/templates/network.yaml b/charts/kubezero/templates/network.yaml
index 47ac8558..b4777061 100644
--- a/charts/kubezero/templates/network.yaml
+++ b/charts/kubezero/templates/network.yaml
@@ -31,11 +31,16 @@ cilium:
       serviceMonitor:
         enabled: {{ .Values.metrics.enabled }}
 
-{{- with index .Values "network" "metallb" }}
+{{- with .Values.network.metallb }}
 metallb:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 
+{{- with .Values.network.haproxy }}
+haproxy:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
 {{- end }}