Skip to content

feat(helm): Enhancement Add support for multiple monitoring na (#72) #73

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

Merged
spbolton merged 1 commit into from
Sep 5, 2025
Merged

feat(helm): Enhancement Add support for multiple monitoring na (#72) #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/dotcms/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: dotcms
description: A Helm chart for DotCMS cluster
type: application
version: 1.0.33
version: 1.0.34
appVersion: 1.0.0
maintainers:
- name: dcolina
Expand Down
8 changes: 5 additions & 3 deletions charts/dotcms/templates/allow-prometheus-monitoring.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ spec:
- Ingress
ingress:
- from:
{{- range .Values.networkPolicy.allowPrometheusMonitoring.namespaceSelectors }}
- namespaceSelector:
matchLabels:
{{- range $key, $value := .Values.networkPolicy.allowPrometheusMonitoring.namespaceSelector }}
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- if .Values.networkPolicy.allowPrometheusMonitoring.podSelector }}
{{- end }}
{{- range .Values.networkPolicy.allowPrometheusMonitoring.podSelectors }}
- podSelector:
matchLabels:
{{- range $key, $value := .Values.networkPolicy.allowPrometheusMonitoring.podSelector }}
{{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
Expand Down
16 changes: 8 additions & 8 deletions charts/dotcms/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,11 +676,11 @@ networkPolicy:
# -- Enable NetworkPolicy for Prometheus monitoring access
# @default -- false
enabled: false
# -- Namespace selector for Prometheus pods
# @default -- {"kubernetes.io/metadata.name": "monitoring"}
namespaceSelector:
kubernetes.io/metadata.name: monitoring
# -- Pod selector for Prometheus pods (optional)
# @default -- {"app.kubernetes.io/name": "prometheus"}
podSelector:
app.kubernetes.io/name: prometheus
# -- Namespace selectors for monitoring pods (supports multiple namespaces)
# @default -- [{"kubernetes.io/metadata.name": "monitoring"}]
namespaceSelectors:
- kubernetes.io/metadata.name: monitoring
# -- Pod selectors for monitoring pods (supports multiple selectors)
# @default -- [{"app.kubernetes.io/name": "prometheus"}]
podSelectors:
- app.kubernetes.io/name: prometheus