From d900ffb953debe725903d26c4c101a2fc4bd6abb Mon Sep 17 00:00:00 2001 From: Matej Kern Date: Thu, 22 Dec 2022 11:52:40 +0100 Subject: [PATCH] feat(cAdvisor): set namespace for all templates with release namespace (#129) Fixes: #128 --- charts/cadvisor/Chart.yaml | 2 +- charts/cadvisor/templates/clusterrole.yaml | 1 + charts/cadvisor/templates/clusterrolebinding.yaml | 1 + charts/cadvisor/templates/daemonset.yaml | 1 + charts/cadvisor/templates/psp.yaml | 1 + charts/cadvisor/templates/service.yaml | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/cadvisor/Chart.yaml b/charts/cadvisor/Chart.yaml index 8b045dc..ab31bb2 100644 --- a/charts/cadvisor/Chart.yaml +++ b/charts/cadvisor/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A chart for a Cadvisor deployment name: cadvisor -version: 2.2.2 +version: 2.2.3 appVersion: 0.44.0 home: https://github.com/google/cadvisor sources: diff --git a/charts/cadvisor/templates/clusterrole.yaml b/charts/cadvisor/templates/clusterrole.yaml index 306156b..2d7fa84 100644 --- a/charts/cadvisor/templates/clusterrole.yaml +++ b/charts/cadvisor/templates/clusterrole.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: {{ template "cadvisor.name" . }} + namespace: {{ .Release.Namespace }} rules: - apiGroups: ['policy'] resources: ['podsecuritypolicies'] diff --git a/charts/cadvisor/templates/clusterrolebinding.yaml b/charts/cadvisor/templates/clusterrolebinding.yaml index a042cb0..d59147a 100644 --- a/charts/cadvisor/templates/clusterrolebinding.yaml +++ b/charts/cadvisor/templates/clusterrolebinding.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: {{ template "cadvisor.name" . }} + namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/cadvisor/templates/daemonset.yaml b/charts/cadvisor/templates/daemonset.yaml index 550a951..dae59de 100644 --- a/charts/cadvisor/templates/daemonset.yaml +++ b/charts/cadvisor/templates/daemonset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: {{ template "cadvisor.name" . }} + namespace: {{ .Release.Namespace }} annotations: seccomp.security.alpha.kubernetes.io/pod: 'docker/default' labels: diff --git a/charts/cadvisor/templates/psp.yaml b/charts/cadvisor/templates/psp.yaml index f3d12a4..56fbe05 100644 --- a/charts/cadvisor/templates/psp.yaml +++ b/charts/cadvisor/templates/psp.yaml @@ -3,6 +3,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "cadvisor.name" . }} + namespace: {{ .Release.Namespace }} spec: seLinux: rule: RunAsAny diff --git a/charts/cadvisor/templates/service.yaml b/charts/cadvisor/templates/service.yaml index 9a9b4a0..a68ce2f 100644 --- a/charts/cadvisor/templates/service.yaml +++ b/charts/cadvisor/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ template "cadvisor.name" . }} + namespace: {{ .Release.Namespace }} labels: app: {{ template "cadvisor.name" . }} chart: {{ template "cadvisor.chart" . }}