From e78897adfc9781a3eaf6077740dddd9c3ce7ac81 Mon Sep 17 00:00:00 2001
From: Syrine Neifar <syrine@greenhost.nl>
Date: Wed, 26 Apr 2023 15:53:26 +0200
Subject: [PATCH] Renaming the new apps vars and small improvements
---
README.md | 13 ++++++-----
templates/nextcloud-onlyoffice-config.yaml | 6 ++---
values-local.yaml.example | 4 +++-
values.yaml | 26 +---------------------
4 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/README.md b/README.md
index 6ad4571d..702c076a 100644
--- a/README.md
+++ b/README.md
@@ -107,16 +107,17 @@ through the Apps screen in Nextcloud.
Apps that are installed this way are automatically updated to their newest
version every time Nextcloud is updated.
-To install apps, edit the values.yaml file by adding your app config under:
-- `default_apps` if this app will part of the Stackspin defaults.
-- `custom_apps` if you're installing this app only for a specific cluster.
+To install apps, you can add entries to the following helm values.
+- `default` if this app will part of the Stackspin defaults.
+- `custom` if you're installing this app only for a specific cluster.
+These apps will then be installed when the Nextcloud pod starts. Both `default` and `custom` are treated the same way -- we have both to make it easier to organize your helm values.
```yaml
apps:
- default_apps:
+ default:
- name: sociallogin # Installs sociallogin app
enabled: false # Disables sociallogin by default
- custom_apps:
+ custom:
- name: polls
enabled: false
```
@@ -132,7 +133,7 @@ To install an app from GitHub releases:
```yaml
apps:
- default_apps:
+ default:
- name: onlyoffice
# The name of the repository. This is the name for a repository located at
# https://github.com/ONLYOFFICE/onlyoffice-nextcloud:
diff --git a/templates/nextcloud-onlyoffice-config.yaml b/templates/nextcloud-onlyoffice-config.yaml
index 4bee1bf1..f8c22f73 100644
--- a/templates/nextcloud-onlyoffice-config.yaml
+++ b/templates/nextcloud-onlyoffice-config.yaml
@@ -178,9 +178,9 @@ data:
{{- if .enabled }}
# Enable {{ .name }} app
run_as "php $occ app:enable {{ .name }}"
- {{ end }} # end if .enabled
- {{ end }} # end range $apps
- {{ end }} # end range .Values.apps
+ {{- end }} # end if .enabled
+ {{- end }} # end range $apps
+ {{- end }} # end range .Values.apps
# Some of the manually installed apps might need to run upgrade scripts, run
# them now
diff --git a/values-local.yaml.example b/values-local.yaml.example
index a73249e0..c7b6fbeb 100644
--- a/values-local.yaml.example
+++ b/values-local.yaml.example
@@ -67,13 +67,15 @@ rabbitmq:
# apps controls which apps will be installed and enabled in nextcloud
# apps:
-# default_apps:
+# default:
# - name: sociallogin
# # apps[0].enabled needs to be set to true if you want to enable login via an external
# # oauth server. In that case you need to configure all the values in `sociallogin`
# enabled: false
# - name: onlyoffice
# enabled: true
+# custom:
+# # Apps you want to add that are not part of Stackspin defaults.
# - name: polls
# # Install an app from a github repository. This has the advantage that you
# # can pin the version number, so it does not get auto-updated to breaking
diff --git a/values.yaml b/values.yaml
index e5b8dc3e..7f8a8476 100644
--- a/values.yaml
+++ b/values.yaml
@@ -61,25 +61,7 @@ nextcloud:
- "/var/local/setup-apps.sh"
apps:
-<<<<<<< HEAD
- - name: sociallogin
- # apps[0].enabled needs to be set to true if you want to enable login via an external
- # oauth server. In that case you need to configure all the values in `sociallogin`
- enabled: false
- # Line order is important here for renovatebot! first github_repository,
- # then version
- github_repository: zorn-v/nextcloud-social-login
- version: v5.4.3
- release_filename: release.tar.gz
- - name: onlyoffice
- # Line order is important here for renovatebot! first github_repository,
- # then version
- github_repository: ONLYOFFICE/onlyoffice-nextcloud
- version: v7.8.0
- release_filename: onlyoffice.tar.gz
- enabled: true
-=======
- default_apps:
+ default:
- name: sociallogin
# apps[0].enabled needs to be set to true if you want to enable login via an external
# oauth server. In that case you need to configure all the values in `sociallogin`
@@ -96,12 +78,6 @@ apps:
github_repository: ONLYOFFICE/onlyoffice-nextcloud
version: v7.8.0
release_filename: onlyoffice.tar.gz
- custom_apps:
- # Apps you want to add that are not part of Stackspin defaults.
- - name: polls
- enabled: false
-
->>>>>>> 28ef4ee (add a custom_apps list to the chart values)
setupApps:
# How many times the setup-apps job can try and fail before it is marked as
--
GitLab