diff --git a/Dockerfile b/Dockerfile index 996172b268561acf365ff2a8109680b074a5dc12..92c921fe52bab3ef84e037d77cd4edcaeda3b592 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 ab4522a1938c772e66600acf2cf6d403e80de981..b0eef244aef165f8549202ac289d46f153dd6fd8 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 4ec26aed3772467ebadd019546e0821fd7037ba1..4aceb8919de2d29930c7e2890b0b30ab0995e7d1 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 7aab9da5b707787086d60f9824265c33d1133127..ef3479f78511960d535c303cf1ec8b58979f2b7a 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