From d8e9321a7f1a1d13925fe2f7656bf91b3524815a Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 13 Jul 2021 09:22:25 +0200
Subject: [PATCH] move ci-overrides to overrides, fix CLUSTER_DIR
---
.gitlab-ci.yml | 2 +-
docs/advanced_installation.rst | 4 ++--
docs/installation_instructions.rst | 7 ++++---
.../oas-nextcloud-override.yaml | 0
4 files changed, 7 insertions(+), 6 deletions(-)
rename install/{ci-overrides => overrides}/oas-nextcloud-override.yaml (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 039d31bb7..799ea9593 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -433,7 +433,7 @@ single-sign-on-helm-release:
script:
- *debug_information
# Add optional override values we need for the CI pipeline only
- - '[ -f ./install/ci-overrides/oas-${APP}-override.yaml ] && kubectl apply -n oas-apps -f ./install/ci-overrides/oas-${APP}-override.yaml'
+ - '[ -f ./install/overrides/oas-${APP}-override.yaml ] && kubectl apply -n oas-apps -f ./install/ci-overrides/oas-${APP}-override.yaml'
- bash ./install/install-${APP}.sh
extends:
- .ssh_setup
diff --git a/docs/advanced_installation.rst b/docs/advanced_installation.rst
index 3698806a7..afb92a7ea 100644
--- a/docs/advanced_installation.rst
+++ b/docs/advanced_installation.rst
@@ -132,7 +132,7 @@ Example: Customize Nextcloud to work with staging certificates
Our CI pipeline works with staging certificates from Let's Encrypt, for that
reason we need to allow insecure connections for the integration with
-ONLYOFFICE. You can find the file at ``install/ci-overrides/oas-nextcloud-override.yaml``.
+ONLYOFFICE. You can find the file at ``install/overrides/oas-nextcloud-override.yaml``.
To apply it, run the following commands:
@@ -147,7 +147,7 @@ To apply it, run the following commands:
# same namespace as your helmrelease with the '-n' argument
kubectl apply \
-n oas-apps \
- -f ./install/ci-overrides/oas-nextcloud-override.yaml
+ -f ./install/overrides/oas-nextcloud-override.yaml
Adding custom apps to the cluster
=================================
diff --git a/docs/installation_instructions.rst b/docs/installation_instructions.rst
index b8e65fc83..8aba8812f 100644
--- a/docs/installation_instructions.rst
+++ b/docs/installation_instructions.rst
@@ -341,7 +341,7 @@ directory **on your provisioning machine**. Don't forget to replace
.. code:: bash
- export CLUSTER_DIR=oas.example.org
+ export CLUSTER_DIR=clusters/oas.example.org
# Copy the installation kustomization to your cluster directory
cp install/kustomization.yaml clusters/$CLUSTER_DIR/
# Tell kubectl to use your cluster's kube_config
@@ -352,11 +352,12 @@ directory **on your provisioning machine**. Don't forget to replace
After you have executed that code, your terminal should show:
.. code:: bash
+
secret/oas-cluster-variables configured
Next, run:
-.. code::
+.. code::
./install/install-openappstack.sh
@@ -370,7 +371,7 @@ to install:
- Nextcloud and Onlyoffice with ``install-nextcloud.sh``
- Rocket.Chat with ``install-rocketchat.sh``
-- ONLYOFFICE with ``install-onlyoffice.sh``
+- WordPress with ``install-wordpress.sh``
- Velero with ``install-velero.sh`` (make sure you have configured it in
:ref:`backups-with-velero`).
diff --git a/install/ci-overrides/oas-nextcloud-override.yaml b/install/overrides/oas-nextcloud-override.yaml
similarity index 100%
rename from install/ci-overrides/oas-nextcloud-override.yaml
rename to install/overrides/oas-nextcloud-override.yaml
--
GitLab