From 212ec3c265259ba8add865129588dad9163a0cbf Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 4 Oct 2021 16:33:23 +0200
Subject: [PATCH] remove helm-stable repo, add wikimedia repo, switch
eventrouter-release to wikimedia repo
---
.gitlab-ci.yml | 3 +--
flux2/apps/monitoring/eventrouter-release.yaml | 4 ++--
flux2/infrastructure/sources/kustomization.yaml | 2 +-
.../sources/{helm-stable.yaml => wikimedia.yaml} | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
rename flux2/infrastructure/sources/{helm-stable.yaml => wikimedia.yaml} (60%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35a952cb3..428e148be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ include:
- flux2/apps/monitoring/*.yaml
- flux2/cluster/optional/monitoring/*.yaml
- flux2/infrastructure/sources/grafana.yaml
- - flux2/infrastructure/sources/helm-stable.yaml
+ - flux2/infrastructure/sources/wikimedia.yaml
- flux2/infrastructure/sources/prometheus-community.yaml
- install/install-app.sh
- test/taiko/*
@@ -129,7 +129,6 @@ include:
- changes:
- flux2/apps/$RESOURCE/*.yaml
- flux2/cluster/optional/$RESOURCE/*.yaml
- - flux2/infrastructure/sources/helm-stable.yaml
- install/install-app.sh
- test/taiko/*
- if: '$TRIGGER_JOBS =~ /enable-rocketchat/'
diff --git a/flux2/apps/monitoring/eventrouter-release.yaml b/flux2/apps/monitoring/eventrouter-release.yaml
index f238a4aef..3bc80fb59 100644
--- a/flux2/apps/monitoring/eventrouter-release.yaml
+++ b/flux2/apps/monitoring/eventrouter-release.yaml
@@ -11,10 +11,10 @@ spec:
# https://github.com/helm/charts/tree/master/stable/eventrouter
# In transitionto bitnami chart repo (https://github.com/bitnami/charts/pull/4698)
chart: eventrouter
- version: 0.3.2
+ version: 0.3.6
sourceRef:
kind: HelmRepository
- name: helm-stable
+ name: wikimedia
namespace: flux-system
interval: 1h
valuesFrom:
diff --git a/flux2/infrastructure/sources/kustomization.yaml b/flux2/infrastructure/sources/kustomization.yaml
index 6ffb569ad..7e832c9b1 100644
--- a/flux2/infrastructure/sources/kustomization.yaml
+++ b/flux2/infrastructure/sources/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: flux-system
resources:
- bitnami.yaml
- grafana.yaml
- - helm-stable.yaml
- ingress-nginx.yaml
- jetstack.yaml
- local-path-provisioner.yaml
@@ -15,4 +14,5 @@ resources:
- single-sign-on.yaml
- vmware-tanzu.yaml
- wekan.yaml
+ - wikimedia.yaml
- wordpress.yaml
diff --git a/flux2/infrastructure/sources/helm-stable.yaml b/flux2/infrastructure/sources/wikimedia.yaml
similarity index 60%
rename from flux2/infrastructure/sources/helm-stable.yaml
rename to flux2/infrastructure/sources/wikimedia.yaml
index aa6f80a82..c1d536c2a 100644
--- a/flux2/infrastructure/sources/helm-stable.yaml
+++ b/flux2/infrastructure/sources/wikimedia.yaml
@@ -2,7 +2,7 @@
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
- name: helm-stable
+ name: wikimedia
spec:
interval: 1h
- url: https://charts.helm.sh/stable
+ url: https://helm-charts.wikimedia.org/stable/
--
GitLab