From 08cdd5f2bf6b4d13c6313f33cadfef9e8ceacd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Tue, 8 Jun 2021 15:24:29 -0400 Subject: [PATCH 1/4] feat: use the official metallb chart --- cluster/base/flux-system/charts/helm/metallb-charts.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 cluster/base/flux-system/charts/helm/metallb-charts.yaml diff --git a/cluster/base/flux-system/charts/helm/metallb-charts.yaml b/cluster/base/flux-system/charts/helm/metallb-charts.yaml new file mode 100644 index 00000000..82ac8bea --- /dev/null +++ b/cluster/base/flux-system/charts/helm/metallb-charts.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: metallb + namespace: flux-system +spec: + interval: 1h0m0s + url: https://metallb.github.io/metallb From 21e96470d5c1d0bc2893fb2a8b4c53a8b7d73b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Tue, 8 Jun 2021 15:26:16 -0400 Subject: [PATCH 2/4] switch to metallb chart --- cluster/core/metallb-system/helm-release.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/cluster/core/metallb-system/helm-release.yaml b/cluster/core/metallb-system/helm-release.yaml index 4ebcd675..d271dbf6 100644 --- a/cluster/core/metallb-system/helm-release.yaml +++ b/cluster/core/metallb-system/helm-release.yaml @@ -8,22 +8,14 @@ spec: interval: 5m chart: spec: - # renovate: registryUrl=https://charts.bitnami.com/bitnami + # renovate: registryUrl=https://metallb.github.io/metallb chart: metallb - version: 2.3.7 + version: 0.10.0 sourceRef: kind: HelmRepository - name: bitnami-charts + name: metallb-charts namespace: flux-system values: - controller: - image: - repository: metallb/controller - tag: v0.9.6 - speaker: - image: - repository: metallb/speaker - tag: v0.9.6 configInline: address-pools: - name: default From 39a3530a7753df17cb1c40cd223b636c9d37bd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Tue, 8 Jun 2021 15:27:08 -0400 Subject: [PATCH 3/4] Update metallb-charts.yaml --- cluster/base/flux-system/charts/helm/metallb-charts.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/base/flux-system/charts/helm/metallb-charts.yaml b/cluster/base/flux-system/charts/helm/metallb-charts.yaml index 82ac8bea..d584b4cd 100644 --- a/cluster/base/flux-system/charts/helm/metallb-charts.yaml +++ b/cluster/base/flux-system/charts/helm/metallb-charts.yaml @@ -5,5 +5,6 @@ metadata: name: metallb namespace: flux-system spec: - interval: 1h0m0s + interval: 30m url: https://metallb.github.io/metallb + timout: 2m From a2860d03ad4e3b871cbf859cb40bf1bf13681eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=97=AA=D1=94=CE=BD=CE=B9=CE=B7=20=E1=97=B7=CF=85=D0=BD?= =?UTF-8?q?=CA=9F?= Date: Tue, 8 Jun 2021 15:27:14 -0400 Subject: [PATCH 4/4] Update metallb-charts.yaml --- cluster/base/flux-system/charts/helm/metallb-charts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/base/flux-system/charts/helm/metallb-charts.yaml b/cluster/base/flux-system/charts/helm/metallb-charts.yaml index d584b4cd..e2fed554 100644 --- a/cluster/base/flux-system/charts/helm/metallb-charts.yaml +++ b/cluster/base/flux-system/charts/helm/metallb-charts.yaml @@ -7,4 +7,4 @@ metadata: spec: interval: 30m url: https://metallb.github.io/metallb - timout: 2m + timeout: 2m