diff --git a/Dockerfile b/Dockerfile index 7194ded0cc2cab5dae1c9be7578ed98301873b62..5b5388d7611d2b97c2f6026580761dad6c9a6d5a 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.14.2/flux_0.14.2_linux_amd64.tar.gz /tmp/ +ADD https://github.com/fluxcd/flux2/releases/download/v0.17.2/flux_0.17.2_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/README.md b/README.md index 5ff2f585eb635d86b99f48ebddaa1318c4258d5e..42f751a771eb218fbfec277be28def8516eadf16 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,3 @@ a single-node kubernetes cluster. Please refer to https://docs.openappstack.net for further details, and to [the installation tutorial](docs/installation_instructions.md) for a step by step installation tutorial how to install your cluster. - diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml index f253edee956d989c248f6ae4833fdb0c598a8860..aeca86b6a14e9b07fdd615c13aba0c07b240af62 100644 --- a/ansible/group_vars/all/oas.yml +++ b/ansible/group_vars/all/oas.yml @@ -8,9 +8,11 @@ ansible_python_interpreter: "/usr/bin/env python3" # Application versions flux: - version: 0.14.2 + # https://github.com/fluxcd/flux2/releases + version: 0.17.2 k3s: + # https://github.com/k3s-io/k3s/releases version: 'v1.21.2+k3s1' # args to start the k3s server with # https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/ @@ -23,6 +25,7 @@ helm: # (https://open.greenhost.net/openappstack/openappstack/issues/338), so we # use a pinned version for now. # We use the official helm install script for now which has no checksum. + # https://github.com/helm/helm/releases version: 'v3.2.1' krew: diff --git a/docs/installation/install_oas.rst b/docs/installation/install_oas.rst index 9c83cb79aa6f3411b15e145059185cb21b2a1a83..4230d2701388a03bc0e096d82c1d6d8830ab0ec4 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.14.2`` `Download flux_0.14.2_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.14.2/flux_0.14.2_linux_amd64.tar.gz>`_ +- ``flux version 0.17.2`` `Download flux_0.17.2_linux_amd64.tar.gz <https://github.com/fluxcd/flux2/releases/download/v0.17.2/flux_0.17.2_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/flux2/infrastructure/sources/wordpress.yaml b/flux2/infrastructure/sources/wordpress.yaml index 8a9af6007501e5ff79d022257736891a088081c7..0057c5409055624f7feb3e52d7cb7d6194a56bbd 100644 --- a/flux2/infrastructure/sources/wordpress.yaml +++ b/flux2/infrastructure/sources/wordpress.yaml @@ -13,4 +13,4 @@ spec: # For all available options, see: # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef ref: - tag: 0.2.0 + tag: 0.2.2 diff --git a/install/flux-version-check.sh b/install/flux-version-check.sh index 38d7b22bb1066ae886f58c7c82af20d60fb29ea6..e88e635e78ba893b2495060744bb64b72dc88e55 100644 --- a/install/flux-version-check.sh +++ b/install/flux-version-check.sh @@ -1,6 +1,4 @@ -# See https://open.greenhost.net/openappstack/openappstack/-/issues/879 for -# context why OAS doesn't work with newer flux versions. -if [ "$(flux --version)" != "flux version 0.14.2" ]; then - echo "The OpenAppStack installation only works with Flux version 0.14.2" +if [ "$(flux --version)" != "flux version 0.17.2" ]; then + echo "The OpenAppStack installation only works with Flux version 0.17.2" exit 1; fi