From fa4988950b910996180691b2026e1e337b581bb4 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 30 Nov 2021 11:15:31 +0100
Subject: [PATCH] Downgrade to flux 0.22.0

We need helm 3.7 because some charts we use make use of a helm 3.7 feature
(subchart values).
See https://open.greenhost.net/stackspin/stackspin/-/issues/1048 for more
details.

Closes: #1048
---
 Dockerfile                              | 2 +-
 ansible/group_vars/all/stackspin.yml    | 2 +-
 docs/installation/install_stackspin.rst | 2 +-
 install/flux-version-check.sh           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 996172b26..92c921fe5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ENV TAIKO_SKIP_CHROMIUM_DOWNLOAD=true
 ENV TAIKO_BROWSER_PATH=/usr/bin/chromium-browser
 ENV TAIKO_BROWSER_ARGS=--no-sandbox,--start-maximized,--disable-dev-shm-usage,--ignore-certificate-errors
 
-ADD https://github.com/fluxcd/flux2/releases/download/v0.24.0/flux_0.24.0_linux_amd64.tar.gz /tmp/
+ADD https://github.com/fluxcd/flux2/releases/download/v0.22.0/flux_0.22.0_linux_amd64.tar.gz /tmp/
 COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem
 COPY ./requirements.txt /requirements.txt
 RUN \
diff --git a/ansible/group_vars/all/stackspin.yml b/ansible/group_vars/all/stackspin.yml
index ab4522a19..b0eef244a 100644
--- a/ansible/group_vars/all/stackspin.yml
+++ b/ansible/group_vars/all/stackspin.yml
@@ -9,7 +9,7 @@ ansible_python_interpreter: "/usr/bin/env python3"
 # Application versions
 flux:
   # https://github.com/fluxcd/flux2/releases
-  version: 0.24.0
+  version: 0.22.0
 
 k3s:
   # https://github.com/k3s-io/k3s/releases
diff --git a/docs/installation/install_stackspin.rst b/docs/installation/install_stackspin.rst
index 4ec26aed3..4aceb8919 100644
--- a/docs/installation/install_stackspin.rst
+++ b/docs/installation/install_stackspin.rst
@@ -53,7 +53,7 @@ Prerequisites
 -------------
 
 - ``kubectl`` (`installation instructions <https://kubernetes.io/docs/tasks/tools/#kubectl>`__)
-- ``flux version 0.24.0`` `Download flux_0.24.0_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.24.0/flux_0.24.0_linux_amd64.tar.gz>`_
+- ``flux version 0.22.0`` `Download flux_0.22.0_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.22.0/flux_0.22.0_linux_amd64.tar.gz>`_
 
 Copy the file ``install/.flux.env.example`` to your cluster dir
 ``clusters/stackspin.example.org/.flux.env``. This file contains the last bit of
diff --git a/install/flux-version-check.sh b/install/flux-version-check.sh
index 7aab9da5b..ef3479f78 100644
--- a/install/flux-version-check.sh
+++ b/install/flux-version-check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$(flux --version)" != "flux version 0.24.0" ]; then
-  echo "The Stackspin installation only works with Flux version 0.24.0"
+if [ "$(flux --version)" != "flux version 0.22.0" ]; then
+  echo "The Stackspin installation only works with Flux version 0.22.0"
   exit 1
 fi
-- 
GitLab