From 3fae98338656d32103fd2059d01079350798655a Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 30 Jun 2021 13:55:52 +0200
Subject: [PATCH] Rename existing NC override configmap
---
flux2/apps/nextcloud/release.yaml | 4 ----
install/install-nextcloud.sh | 2 +-
...cloud-values-override.yaml => oas-nextcloud-override.yaml} | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
rename install/{nextcloud-values-override.yaml => oas-nextcloud-override.yaml} (81%)
diff --git a/flux2/apps/nextcloud/release.yaml b/flux2/apps/nextcloud/release.yaml
index bcef09fd6..6061b8e9e 100644
--- a/flux2/apps/nextcloud/release.yaml
+++ b/flux2/apps/nextcloud/release.yaml
@@ -192,10 +192,6 @@ spec:
client_id: nextcloud
client_secret: "${nextcloud_oauth_client_secret}"
groups_claim: "openappstack_roles"
- valuesFrom:
- - kind: ConfigMap
- name: nextcloud-values-override
- optional: true
# Allow custom values either by configMap or by secret
valuesFrom:
- kind: ConfigMap
diff --git a/install/install-nextcloud.sh b/install/install-nextcloud.sh
index e6aea0346..b1a296164 100755
--- a/install/install-nextcloud.sh
+++ b/install/install-nextcloud.sh
@@ -3,7 +3,7 @@
set -euo pipefail
# First, add some overrides for values that are only useful in CI
-kubectl apply -n oas-apps -f $( dirname "${BASH_SOURCE[0]}" )/nextcloud-values-override.yaml
+kubectl apply -n oas-apps -f $( dirname "${BASH_SOURCE[0]}" )/oas-nextcloud-override.yaml
# This kustomization's only purpose is to add the kustomization that is in the
# flxu2/cluster/optional/nextcloud folder. After this kustomization is applied
diff --git a/install/nextcloud-values-override.yaml b/install/oas-nextcloud-override.yaml
similarity index 81%
rename from install/nextcloud-values-override.yaml
rename to install/oas-nextcloud-override.yaml
index 238c6409e..5ad5657ae 100644
--- a/install/nextcloud-values-override.yaml
+++ b/install/oas-nextcloud-override.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: nextcloud-values-override
+ name: oas-nextcloud-override
data:
values.yaml: |
onlyoffice:
--
GitLab