Skip to content

Commit

Permalink
add namespace property to all namespaced objects
Browse files Browse the repository at this point in the history
Using the helm built-in .Release.Namespace as per:
https://helm.sh/docs/chart_template_guide/builtin_objects/
  • Loading branch information
rbjorklin committed Nov 17, 2023
1 parent e0a0b40 commit e9db7a5
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 0 deletions.
4 changes: 4 additions & 0 deletions charts/netdata/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: netdata-conf-parent
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -21,6 +22,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: netdata-conf-child
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -37,6 +39,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: netdata-conf-k8s-state
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -53,6 +56,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.sd.child.configmap.name }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ apiVersion: batch/v1
kind: CronJob
metadata:
name: {{ template "netdata.name" . }}-restarter
namespace: {{ .Release.Namespace }}
spec:
schedule: "{{ .Values.restarter.schedule }}"
concurrencyPolicy: {{ .Values.restarter.concurrencyPolicy }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: {{ template "netdata.name" . }}-child
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
2 changes: 2 additions & 0 deletions charts/netdata/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "netdata.name" . }}-parent
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down Expand Up @@ -182,6 +183,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ template "netdata.name" . }}-k8s-state
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ apiVersion: {{ $apiVersion }}
kind: Ingress
metadata:
name: {{ $fullName }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/netdata/templates/persistentvolumeclaim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ template "netdata.name" . }}-parent-database
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -26,6 +27,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ template "netdata.name" . }}-parent-alarms
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -48,6 +50,7 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ template "netdata.name" . }}-k8s-state-varlib
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/role.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ template "netdata.fullname" . }}-restarter
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ template "netdata.fullname" . }}-restarter
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
3 changes: 3 additions & 0 deletions charts/netdata/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apiVersion: v1
kind: Secret
metadata:
name: netdata-conf-parent
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -22,6 +23,7 @@ apiVersion: v1
kind: Secret
metadata:
name: netdata-conf-child
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand All @@ -39,6 +41,7 @@ apiVersion: v1
kind: Secret
metadata:
name: netdata-conf-k8s-state
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
1 change: 1 addition & 0 deletions charts/netdata/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "netdata.name" . }}
namespace: {{ .Release.Namespace }}
labels:
app: {{ template "netdata.name" . }}
chart: {{ template "netdata.chart" . }}
Expand Down
2 changes: 2 additions & 0 deletions charts/netdata/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
name: {{ .Values.serviceAccount.name }}
namespace: {{ .Release.Namespace }}
{{- end -}}

{{- if and .Values.serviceAccount.create (include "netdata.restarter.enabled" .) }}
Expand All @@ -22,4 +23,5 @@ metadata:
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
name: {{ .Values.serviceAccount.name }}-restarter
namespace: {{ .Release.Namespace }}
{{- end -}}

0 comments on commit e9db7a5

Please sign in to comment.