diff --git a/.gitlab/issue_templates/update_all_components.md b/.gitlab/issue_templates/update_all_components.md index 03df28802216ebb482b418654b2be215d65cf248..2dcba982f4b10c6a7e186ba3703b0c42a66d8026 100644 --- a/.gitlab/issue_templates/update_all_components.md +++ b/.gitlab/issue_templates/update_all_components.md @@ -1,9 +1,10 @@ To update all applications, check the following files: +* [ ] flux: I.e. `sed -i 's/0.20.1/0.24.0/g' Dockerfile install/flux-version-check.sh docs/installation/install_stackspin.rst ansible/group_vars/all/stackspin.yml` + * `Dockerfile`: * [ ] All apk app versions * [ ] All non-apk app versions in `Dockerfile`, especially: - * [ ] flux (Make sure the version is the same as in `ansible/group_vars/all/stackspin.yml`, `docs/installation/install_stackspin.rst` and `install/flux-version-check.sh`) * [ ] Mitogen version in `ansible/plugins` (https://github.com/mitogen-hq/mitogen/releases) In `ansible/group_vars/all/stackspin.yml`: diff --git a/Dockerfile b/Dockerfile index 872f769bf6b229c85e6306ca21833d0f38e1b1c9..996172b268561acf365ff2a8109680b074a5dc12 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.20.1/flux_0.20.1_linux_amd64.tar.gz /tmp/ +ADD https://github.com/fluxcd/flux2/releases/download/v0.24.0/flux_0.24.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 db0c81d3c68f70228c2ebfc40e9fad5b7b280bef..ab4522a1938c772e66600acf2cf6d403e80de981 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.20.1 + version: 0.24.0 k3s: # https://github.com/k3s-io/k3s/releases diff --git a/docs/installation/install_stackspin.rst b/docs/installation/install_stackspin.rst index 57fd71eafb98524d946310bbb3b31f3546b0ded7..4ec26aed3772467ebadd019546e0821fd7037ba1 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.20.1`` `Download flux_0.20.1_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.20.1/flux_0.20.1_linux_amd64.tar.gz>`_ +- ``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>`_ 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 88cd01b6065614640e09b8a4a6c1fd3e3ffef33e..7aab9da5b707787086d60f9824265c33d1133127 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.20.1" ]; then - echo "The Stackspin installation only works with Flux version 0.20.1" +if [ "$(flux --version)" != "flux version 0.24.0" ]; then + echo "The Stackspin installation only works with Flux version 0.24.0" exit 1 fi