From 43e84c878e3259a4a017b4e95ce766ec68869680 Mon Sep 17 00:00:00 2001 From: Arie Peterson <arie@greenhost.nl> Date: Thu, 21 Oct 2021 16:59:15 +0200 Subject: [PATCH] Update flux to 0.19.0 TRIGGER_JOBS=enable-monitoring,enable-nextcloud,enable-rocketchat,enable-single-sign-on,enable-wekan,enable-wordpress --- Dockerfile | 2 +- ansible/group_vars/all/oas.yml | 2 +- docs/installation/install_oas.rst | 2 +- install/flux-version-check.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0c91e9fe..49f06ac8f 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.18.3/flux_0.18.3_linux_amd64.tar.gz /tmp/ +ADD https://github.com/fluxcd/flux2/releases/download/v0.19.0/flux_0.19.0_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 aa115f78d..6e95968e1 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.18.3 + version: 0.19.0 k3s: # https://github.com/k3s-io/k3s/releases diff --git a/docs/installation/install_oas.rst b/docs/installation/install_oas.rst index 4ce865809..4bf4bc49a 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.18.3`` `Download flux_0.18.3_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.18.3/flux_0.18.3_linux_amd64.tar.gz>`_ +- ``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>`_ 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 779c14507..781928bd2 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.18.3" ]; then - echo "The OpenAppStack installation only works with Flux version 0.18.3" +if [ "$(flux --version)" != "flux version 0.19.0" ]; then + echo "The OpenAppStack installation only works with Flux version 0.19.0" exit 1 fi -- GitLab