From 1ec851717a90f6f8a038c86207888cdd674ead73 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 28 Jul 2021 10:45:37 +0200
Subject: [PATCH] Revert "Update flux to 0.16.1"
This reverts commit 1978d270f49442836b5c24c3d152e00a610e1620.
See https://open.greenhost.net/openappstack/openappstack/-/issues/879
for details
---
Dockerfile | 2 +-
ansible/group_vars/all/oas.yml | 5 +----
install/flux-version-check.sh | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6db766e30..0424b80aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,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.16.1/flux_0.16.1_linux_amd64.tar.gz /tmp/
+ADD https://github.com/fluxcd/flux2/releases/download/v0.14.2/flux_0.14.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/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index 0d3e123a1..f253edee9 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -8,11 +8,9 @@ ansible_python_interpreter: "/usr/bin/env python3"
# Application versions
flux:
- # https://github.com/fluxcd/flux2/releases
- version: 0.16.1
+ version: 0.14.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/
@@ -25,7 +23,6 @@ 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/install/flux-version-check.sh b/install/flux-version-check.sh
index 91c66dbd4..ecc57f66a 100644
--- a/install/flux-version-check.sh
+++ b/install/flux-version-check.sh
@@ -1,4 +1,4 @@
-if [ "$(flux --version)" != "flux version 0.16.1" ]; then
- echo "The OpenAppStack installation only works with Flux version 0.16.1"
+if [ "$(flux --version)" != "flux version 0.14.2" ]; then
+ echo "The OpenAppStack installation only works with Flux version 0.14.2"
exit 1;
fi
--
GitLab