diff --git a/.gitlab/issue_templates/update_all_components.md b/.gitlab/issue_templates/update_all_components.md index 14d1b3c7385fc769d38fa8654cb0ae3e4654f6a7..f1c1f8ac97edd9dc66f6a8847cf5e7f689ac8099 100644 --- a/.gitlab/issue_templates/update_all_components.md +++ b/.gitlab/issue_templates/update_all_components.md @@ -3,13 +3,12 @@ To update all applications, check the following files: * `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/oas.yml`, `flux.version`; `docs/installation/install_oas.rst` and `install/flux-version-check.sh`) + * [ ] flux (Make sure the version is the same as in `ansible/group_vars/all/oas.yml`, `docs/installation/install_oas.rst` and `install/flux-version-check.sh`) * [ ] Mitogen version in `ansible/plugins` (https://github.com/mitogen-hq/mitogen/releases) In `ansible/group_vars/all/oas.yml`: * [ ] k3s -* [ ] flux Our custom charts: diff --git a/Dockerfile b/Dockerfile index 49f06ac8f597180b5f4a87360458ae89ab4d58fd..a335ff0dae4b03dfa8b9fcb715f5822cc6298642 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.19.0/flux_0.19.0_linux_amd64.tar.gz /tmp/ +ADD https://github.com/fluxcd/flux2/releases/download/v0.20.1/flux_0.20.1_linux_amd64.tar.gz /tmp/ # Download kubectl until it's packaged in alpine > 3.14 ADD https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl /usr/local/bin/ COPY ./test/pytest/le-staging-bundle.pem /usr/local/share/ca-certificates/le-staging-bundle.pem diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml index 20c0ce9db71409351e2e3440ec24bdda15c13766..efd5e0abaf8e80013009353ec66133c8862d8d57 100644 --- a/ansible/group_vars/all/oas.yml +++ b/ansible/group_vars/all/oas.yml @@ -9,7 +9,7 @@ ansible_python_interpreter: "/usr/bin/env python3" # Application versions flux: # https://github.com/fluxcd/flux2/releases - version: 0.19.0 + version: 0.20.1 k3s: # https://github.com/k3s-io/k3s/releases diff --git a/docs/installation/install_oas.rst b/docs/installation/install_oas.rst index 4bf4bc49a14157284e3ac85e24146db8fbc78156..82e7742e9e56b15310fe3cb4d2df9fe3404b40c4 100644 --- a/docs/installation/install_oas.rst +++ b/docs/installation/install_oas.rst @@ -53,7 +53,7 @@ Prerequisites ------------- - ``kubectl`` (`installation instructions <https://kubernetes.io/docs/tasks/tools/#kubectl>`__) -- ``flux version 0.19.0`` `Download flux_0.19.0_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.19.0/flux_0.19.0_linux_amd64.tar.gz>`_ +- ``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>`_ Copy the file ``install/.flux.env.example`` to your cluster dir ``clusters/oas.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 781928bd226b7f6b7a2feabb19f51db431c1bb65..2cbb2ed49c9d25cdee17108b32a611fb9f9ba7c4 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.19.0" ]; then - echo "The OpenAppStack installation only works with Flux version 0.19.0" +if [ "$(flux --version)" != "flux version 0.20.1" ]; then + echo "The OpenAppStack installation only works with Flux version 0.20.1" exit 1 fi