Skip to content
Snippets Groups Projects
Commit 062eb886 authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch '879-flux-upgrade-leads-to-mutiple-failed-helmreleases' into 'master'

Resolve "Flux upgrade leads to mutiple failed helmreleases"

Closes #879

See merge request openappstack/openappstack!487
parents 877ae47d 932c4f1e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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.
......@@ -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:
......
......@@ -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
......
......@@ -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
# 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment