fix #508 by checking for tokenKey

Signed-off-by: jessebot <[email protected]>
nextcloud · Jul 29, 2024 · 0722386 · 0722386
1 parent 58d75f9
commit 0722386
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 5.5.1
+version: 5.5.2
 appVersion: 29.0.4
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:

diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -119,6 +119,7 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `nextcloud.existingSecret.smtpUsernameKey`                  | Name of the key that contains the SMTP username                                                     | `nil`                      |
 | `nextcloud.existingSecret.smtpPasswordKey`                  | Name of the key that contains the SMTP password                                                     | `nil`                      |
 | `nextcloud.existingSecret.smtpHostKey`                      | Name of the key that contains the SMTP hostname                                                     | `nil`                      |
+| `nextcloud.existingSecret.tokenKey`                         | Name of the key that contains the nextcloud metrics token                                           | `''`                       |
 | `nextcloud.update`                                          | Trigger update if custom command is used                                                            | `0`                        |
 | `nextcloud.containerPort`                                   | Customize container port when not running as root                                                   | `80`                       |
 | `nextcloud.trustedDomains`                                  | Optional space-separated list of trusted domains                                                    | `[]`                       |

diff --git a/charts/nextcloud/templates/metrics/deployment.yaml b/charts/nextcloud/templates/metrics/deployment.yaml
@@ -40,12 +40,12 @@ spec:
           image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
           imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
           env:
-            {{- if .Values.metrics.token }}
+            {{- if or .Values.metrics.token .Values.nextcloud.existingSecret.tokenKey }}
             - name: NEXTCLOUD_AUTH_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
-                  key: {{ .Values.nextcloud.existingSecret.tokenKey }}
+                  key: {{ .Values.nextcloud.existingSecret.tokenKey | default "nextcloud-token" }}
             {{- else }}
             - name: NEXTCLOUD_USERNAME
               valueFrom:

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -83,7 +83,7 @@ nextcloud:
     # secretName: nameofsecret
     usernameKey: nextcloud-username
     passwordKey: nextcloud-password
-    tokenKey: nextcloud-token
+    tokenKey: ""
     smtpUsernameKey: smtp-username
     smtpPasswordKey: smtp-password
     smtpHostKey: smtp-host