Skip to content

Fix namespace selector #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Richardds wants to merge 9 commits into from
Closed

Fix namespace selector #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a949dcd
Add missing namespace selector
Richardds Feb 14, 2023
da69b98
Bump version
Richardds Feb 14, 2023
5d64fab
Bump version to 3.5.1
Richardds Feb 19, 2023
7f4eb31
Merge branch 'master' into fix_namespace_selector
Richardds Feb 19, 2023
fd7dc9c
Merge branch 'master' into fix_namespace_selector
jessebot Mar 4, 2023
133923d
Match the namespace logic with the block above
Richardds Mar 19, 2023
31140e6
bump helm chart version in charts/nextcloud/Chart.yaml
jessebot May 4, 2023
6f783e7
Merge branch 'main' into fix_namespace_selector
jessebot May 4, 2023
7de5a97
Tweak formatting
Richardds May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nextcloud/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: nextcloud
version: 3.5.12
version: 3.5.13
appVersion: 26.0.1
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
Expand Down
7 changes: 7 additions & 0 deletions charts/nextcloud/templates/metrics-servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ metadata:
{{- end }}
spec:
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }}
namespaceSelector:
matchNames:
{{- if .Values.metrics.serviceMonitor.namespace }}
Copy link
Collaborator

@wrenix wrenix Nov 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

      {{- with .Values.metrics.serviceMonitor.namespaces }}
      {{- toYaml . | nindent 6 }}

Copy link
Collaborator

@wrenix wrenix Nov 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. with is easy reable
  2. so multiple namespaces are configurable

Copy link
Collaborator

@jessebot jessebot Nov 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree

- {{ .Values.metrics.serviceMonitor.namespace | quote }}
{{- else }}
- {{ .Release.Namespace | quote }}
{{- end }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "nextcloud.name" . }}
Expand Down