Merge pull request #521 from wrenix/fix/metrics-broken

nextcloud · Feb 4, 2024 · 9e51e9c · 9e51e9c
2 parents e00863d + 30cb787
commit 9e51e9c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 4.5.16
+version: 4.5.17
 appVersion: 28.0.2
 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/templates/metrics/deployment.yaml b/charts/nextcloud/templates/metrics/deployment.yaml
@@ -38,38 +38,38 @@ spec:
           image: "{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}"
           imagePullPolicy: {{ .Values.metrics.image.pullPolicy }}
           env:
-          {{- if .Values.metrics.token }}
-          - name: NEXTCLOUD_AUTH_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
-                key: {{ .Values.nextcloud.existingSecret.tokenKey }}
-          {{- else }}
-          - name: NEXTCLOUD_USERNAME
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
-                key: {{ .Values.nextcloud.existingSecret.usernameKey }}
-          - name: NEXTCLOUD_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
-                key: {{ .Values.nextcloud.existingSecret.passwordKey }}
+            {{- if .Values.metrics.token }}
+            - name: NEXTCLOUD_AUTH_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
+                  key: {{ .Values.nextcloud.existingSecret.tokenKey }}
+            {{- else }}
+            - name: NEXTCLOUD_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
+                  key: {{ .Values.nextcloud.existingSecret.usernameKey }}
+            - name: NEXTCLOUD_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.nextcloud.existingSecret.secretName | default (include "nextcloud.fullname" .) }}
+                  key: {{ .Values.nextcloud.existingSecret.passwordKey }}
+            {{- end }}
+            # NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
+            - name: NEXTCLOUD_SERVER # deployment.namespace.svc.cluster.local
+              value: "http{{ if .Values.metrics.https }}s{{ end }}://{{ template "nextcloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}"
+            - name: NEXTCLOUD_TIMEOUT
+              value: {{ .Values.metrics.timeout }}
+            - name: NEXTCLOUD_TLS_SKIP_VERIFY
+              value: {{ .Values.metrics.tlsSkipVerify | quote }}
+          ports:
+            - name: metrics
+              containerPort: 9205
+          {{- if .Values.metrics.resources }}
+          resources: {{- toYaml .Values.metrics.resources | nindent 10 }}
           {{- end }}
-          # NEXTCLOUD_SERVER is used by metrics-exporter to reach the Nextcloud (K8s-)Service to grab the serverinfo api endpoint
-          - name: NEXTCLOUD_SERVER # deployment.namespace.svc.cluster.local
-            value: "http{{ if .Values.metrics.https }}s{{ end }}://{{ template "nextcloud.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }}"
-          - name: NEXTCLOUD_TIMEOUT
-            value: {{ .Values.metrics.timeout }}
-          - name: NEXTCLOUD_TLS_SKIP_VERIFY
-            value: {{ .Values.metrics.tlsSkipVerify | quote }}
-        ports:
-          - name: metrics
-            containerPort: 9205
-        {{- if .Values.metrics.resources }}
-        resources: {{- toYaml .Values.metrics.resources | nindent 10 }}
-        {{- end }}
-        securityContext:
-          runAsUser: 1000
-          runAsNonRoot: true
+          securityContext:
+            runAsUser: 1000
+            runAsNonRoot: true
 {{- end }}