From 235a2fcf479ca9a73ca471359b990e163ea5e3d8 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Mon, 19 Feb 2024 20:13:55 +0100 Subject: [PATCH] Workaround: The declarative way to flush redis for our dashboard (#24) --- packages/core/platform/templates/helmreleases.yaml | 14 ++++++++++++++ scripts/installer.sh | 5 ----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/core/platform/templates/helmreleases.yaml b/packages/core/platform/templates/helmreleases.yaml index 7e706841..4fa96550 100644 --- a/packages/core/platform/templates/helmreleases.yaml +++ b/packages/core/platform/templates/helmreleases.yaml @@ -646,6 +646,20 @@ spec: namespace: cozy-cilium - name: kubeovn namespace: cozy-kubeovn + {{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1beta2" }} + {{- with (lookup "source.toolkit.fluxcd.io/v1beta2" "HelmRepository" "cozy-public" "").items }} + values: + kubeapps: + redis: + master: + podAnnotations: + {{- range $index, $repo := . }} + {{- with (($repo.status).artifact).revision }} + repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} --- apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease diff --git a/scripts/installer.sh b/scripts/installer.sh index cd9edd54..ea9b1275 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -35,11 +35,6 @@ kubectl annotate helmrepositories.source.toolkit.fluxcd.io -A -l cozystack.io/re # Install platform chart make -C packages/core/platform apply -# Flush kubeapps cache -if kubectl wait --for=condition=ready -n cozy-dashboard pod/dashboard-redis-master-0 --timeout=1s; then - kubectl exec -ti -n cozy-dashboard dashboard-redis-master-0 -- sh -c 'redis-cli -a "$REDIS_PASSWORD" flushdb' -fi - # Reconcile platform chart trap 'exit' INT TERM while true; do