Skip to content

#1 support multiple namespaces - we just need daemon to support it #2

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

Open
KlavsKlavsen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#1 support multiple namespaces - we just need daemon to support it #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c95e0f5
support multiple namespaces - we just need daemon to support it
KlavsKlavsen Jul 22, 2020
aaf8f12
fixup useExistingRole option
KlavsKlavsen Jul 23, 2020
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
4 changes: 2 additions & 2 deletions helm-chart/prometheus-container-resource-exporter/templates/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.runScope.cluster -}}
{{- if and .Values.runScope.cluster (not .Values.useExistingRole) -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand All @@ -21,4 +21,4 @@ rules:
- pods
verbs:
- list
{{- end -}}
{{- end -}}
Binary file modified helm-chart/prometheus-container-resource-exporter/templates/cluster-rolebinding.yaml
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions helm-chart/prometheus-container-resource-exporter/templates/local-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.runScope.local -}}
{{- if and .Values.runScope.local (not .Values.useExistingRole) -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
Expand All @@ -22,4 +22,4 @@ rules:
- pods
verbs:
- list
{{- end -}}
{{- end -}}
50 changes: 41 additions & 9 deletions helm-chart/prometheus-container-resource-exporter/templates/local-rolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,52 @@
{{- if .Values.runScope.local -}}
{{- if empty .Values.runScope.namespaces -}}
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: {{ template "prometheus-container-resource-exporter.name" . }}
chart: {{ template "prometheus-container-resource-exporter.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
name: {{ template "prometheus-container-resource-exporter.fullname" . }}
namespace: {{ .Release.Namespace }}
app: {{ template "prometheus-container-resource-exporter.name" $ }}
chart: {{ template "prometheus-container-resource-exporter.chart" $ }}
release: {{ $.Release.Name }}
heritage: {{ $.Release.Service }}
name: {{ template "prometheus-container-resource-exporter.fullname" $ }}
namespace: {{ $.Release.Namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
{{- if (not .Values.useExistingRole) }}
name: {{ template "prometheus-container-resource-exporter.fullname" . }}
{{- else }}
name: {{ .Values.useExistingRole }}
{{- end }}
subjects:
- kind: ServiceAccount
name: {{ template "prometheus-container-resource-exporter.serviceAccountName" $ }}
namespace: {{ $.Release.Namespace }}
{{- else }}
{{- range $.Values.runScope.namespaces }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
app: {{ template "prometheus-container-resource-exporter.name" $ }}
chart: {{ template "prometheus-container-resource-exporter.chart" $ }}
release: {{ $.Release.Name }}
heritage: {{ $.Release.Service }}
name: {{ template "prometheus-container-resource-exporter.fullname" $ }}
namespace: {{ . }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
{{- if (not $.Values.useExistingRole) }}
name: {{ template "prometheus-container-resource-exporter.fullname" $ }}
{{- else }}
name: {{ $.Values.useExistingRole }}
{{- end }}
subjects:
- kind: ServiceAccount
name: {{ template "prometheus-container-resource-exporter.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
{{- end -}}
name: {{ template "prometheus-container-resource-exporter.serviceAccountName" $ }}
namespace: {{ $.Release.Namespace }}
{{- end -}}
{{- end -}}
{{- end -}}
3 changes: 3 additions & 0 deletions helm-chart/prometheus-container-resource-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
runScope:
local: true
cluster: false
# add list of namespaces for this instance to collect from - if you have set runScope.local = true
# - otherwise it only collects from current namespace
namespaces: []

replicaCount: 1

Expand Down