From d2c7ef1715517ec7e7cc0e2f35919649a4414106 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 30 Apr 2019 15:01:25 +0200
Subject: [PATCH] process Varacs feedback and fix a mistake
---
requirements.lock | 6 +++---
requirements.yaml | 1 -
templates/NOTES.txt | 17 ++++++++++++++++-
templates/job-register-collabora.yaml | 4 ++--
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/requirements.lock b/requirements.lock
index cef04574..a599598a 100644
--- a/requirements.lock
+++ b/requirements.lock
@@ -4,6 +4,6 @@ dependencies:
version: 1.0.2
- name: collabora-code
repository: https://kubernetes-charts.storage.googleapis.com
- version: 1.0.1
-digest: sha256:f33ff06ddf9918e4aea15a99a509da296e3669ab1f61a272fefc1f9ae5a7e8a7
-generated: 2019-04-23T12:35:28.513705997+02:00
+ version: 1.0.2
+digest: sha256:53d9ba3d4b86bea6e2b7aa480abd03737e623e14cf14275feb27a0ff320a15f6
+generated: 2019-04-30T13:00:36.870647752+02:00
diff --git a/requirements.yaml b/requirements.yaml
index 1e961c70..e0d50e86 100644
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -6,7 +6,6 @@ dependencies:
- nextcloud
# Needs https://github.com/helm/charts/pull/13311
- name: collabora-code
- alias: office
version: 1.0.2
repository: "@stable"
tags:
diff --git a/templates/NOTES.txt b/templates/NOTES.txt
index 22d04481..9ed1c4dc 100644
--- a/templates/NOTES.txt
+++ b/templates/NOTES.txt
@@ -1 +1,16 @@
-Installed!
+{{- $collabora := index .Values "collabora-code" -}}
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}. This chart has installed Nextcloud
+with Mariadb enabled and Collabora. Nextcloud is available under a pod starting
+with the name {{ .Release.Name }}-nextcloud, the Collabora pod name starts with
+{{ .Release.Name }}-office.
+
+Nextcloud has been configured to use Collabora for opening rich text documents,
+using the `richdocuments` app. It uses WOPI url:
+"https://{{ $collabora.collabora.server_name }}"
+
+To learn more, try:
+
+ $ helm status {{ .Release.Name }}
+ $ helm get {{ .Release.Name }}
diff --git a/templates/job-register-collabora.yaml b/templates/job-register-collabora.yaml
index 4fbafaeb..420b74c2 100644
--- a/templates/job-register-collabora.yaml
+++ b/templates/job-register-collabora.yaml
@@ -1,6 +1,6 @@
# Work around the fact that we can not index hyphenated names
# (https://github.com/helm/helm/issues/2993)
-{{- $collabora := index .Values "collabora-code" -}}
+{{- $collabora := index .Values "collabora-code" }}
apiVersion: batch/v1
kind: Job
metadata:
@@ -24,7 +24,7 @@ spec:
spec:
restartPolicy: Never
containers:
- - name: register-collabora
+ - name: {{ .Release.Name }}-register-collabora-job
image: {{ .Values.nextcloud.image.repository }}:{{ .Values.nextcloud.image.tag }}
securityContext:
runAsUser: 33
--
GitLab