From b9564d4119a0f1dc4f786c0fe4e8f31446ebc9c5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 23 May 2024 21:21:54 +0000 Subject: [PATCH] feat: add HAProxy to network module --- charts/kubezero-network/Chart.yaml | 4 ++++ charts/kubezero-network/README.md | 9 ++++++--- charts/kubezero-network/values.yaml | 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/charts/kubezero-network/Chart.yaml b/charts/kubezero-network/Chart.yaml index 9d1c2e12..38fe10a7 100644 --- a/charts/kubezero-network/Chart.yaml +++ b/charts/kubezero-network/Chart.yaml @@ -26,4 +26,8 @@ dependencies: version: 0.14.5 repository: https://metallb.github.io/metallb condition: metallb.enabled + - name: haproxy + version: 1.22.0 + repository: https://haproxytech.github.io/helm-charts + condition: haproxy.enabled kubeVersion: ">= 1.26.0" diff --git a/charts/kubezero-network/README.md b/charts/kubezero-network/README.md index 1e5fbb6a..3febb26b 100644 --- a/charts/kubezero-network/README.md +++ b/charts/kubezero-network/README.md @@ -1,6 +1,6 @@ # kubezero-network -![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things network @@ -19,8 +19,9 @@ Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://helm.cilium.io/ | cilium | 1.15.3 | -| https://metallb.github.io/metallb | metallb | 0.14.4 | +| https://haproxytech.github.io/helm-charts | haproxy | 1.22.0 | +| https://helm.cilium.io/ | cilium | 1.15.5 | +| https://metallb.github.io/metallb | metallb | 0.14.5 | ## Values @@ -50,6 +51,8 @@ Kubernetes: `>= 1.26.0` | cilium.operator.replicas | int | `1` | | | cilium.operator.tolerations[0].effect | string | `"NoSchedule"` | | | cilium.operator.tolerations[0].key | string | `"node-role.kubernetes.io/control-plane"` | | +| cilium.operator.tolerations[1].effect | string | `"NoSchedule"` | | +| cilium.operator.tolerations[1].key | string | `"node.cilium.io/agent-not-ready"` | | | cilium.prometheus.enabled | bool | `false` | | | cilium.prometheus.port | int | `9091` | | | cilium.prometheus.serviceMonitor.enabled | bool | `false` | | diff --git a/charts/kubezero-network/values.yaml b/charts/kubezero-network/values.yaml index 38892c34..5e7a36ce 100644 --- a/charts/kubezero-network/values.yaml +++ b/charts/kubezero-network/values.yaml @@ -109,3 +109,6 @@ cilium: group: cert-manager.io kind: ClusterIssuer name: kubezero-local-ca-issuer + +haproxy: + enabled: false