From 551f1ce79e2e7fab9b9d51354febbff83b9136a2 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Tue, 17 Aug 2021 00:25:47 +0200
Subject: [PATCH] Remove flux install from ansible
Fixes: #927
---
.gitlab-ci.yml | 1 +
ansible/roles/setup-kubernetes/tasks/flux.yml | 10 ----------
install/flux-version-check.sh | 2 ++
install/install-openappstack.sh | 3 ++-
4 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05f2d01da..5c39702de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,6 +327,7 @@ setup-openappstack:
- sed "s/1.2.3.4/$IP_ADDRESS/; s/example.org/$FQDN/; s/acme_staging=false/acme_staging=true/; s/acme-v02/acme-staging-v02/; /^\s*#.*$/d; /^\s*$/d" install/.flux.env.example >> ${CLUSTER_DIR}/.flux.env
# Deploy secret/oas-cluster-variables
- cp install/kustomization.yaml ${CLUSTER_DIR}
+ - kubectl create namespace flux-system
- kubectl apply -k ${CLUSTER_DIR}
- bash ./install/install-openappstack.sh
# TODO: Should also be removed or made up-to-date
diff --git a/ansible/roles/setup-kubernetes/tasks/flux.yml b/ansible/roles/setup-kubernetes/tasks/flux.yml
index efac7af5c..e76e0ca2b 100644
--- a/ansible/roles/setup-kubernetes/tasks/flux.yml
+++ b/ansible/roles/setup-kubernetes/tasks/flux.yml
@@ -32,13 +32,3 @@
dest: /usr/local/bin/
remote_src: yes
when: flux_version.stdout != flux.version
-
-- name: Install flux into cluster
- tags:
- - flux
- shell: |
- flux install \
- --network-policy=false \
- --watch-all-namespaces=true \
- --namespace=flux-system \
- --components="source-controller,kustomize-controller,helm-controller"
diff --git a/install/flux-version-check.sh b/install/flux-version-check.sh
index ecc57f66a..38d7b22bb 100644
--- a/install/flux-version-check.sh
+++ b/install/flux-version-check.sh
@@ -1,3 +1,5 @@
+# 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"
exit 1;
diff --git a/install/install-openappstack.sh b/install/install-openappstack.sh
index f4b551582..953072c08 100755
--- a/install/install-openappstack.sh
+++ b/install/install-openappstack.sh
@@ -7,7 +7,8 @@ set -euo pipefail
flux install \
--network-policy=false \
--watch-all-namespaces=true \
- --namespace=flux-system
+ --namespace=flux-system \
+ --components="source-controller,kustomize-controller,helm-controller"
# get current git branch name
branch=${CI_COMMIT_REF_NAME:-}
--
GitLab