Helm: Be able to customize the Namespace (#830)

* Add release namespace for loki * Add Release namespace for promtail chart * Add Release namespace for loki-stack chart * Add doumentation * Increase chart version
grafana · Aug 1, 2019 · 664537e · 664537e
1 parent e7fb205
commit 664537e
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 3 deletions.
diff --git a/production/helm/README.md b/production/helm/README.md
@@ -24,6 +24,12 @@ $ helm repo update
 $ helm upgrade --install loki loki/loki-stack
 ```
 
+### Deploy in a custom namespace
+
+```bash
+$ helm upgrade --install loki --namespace=loki-stack loki/loki-stack
+```
+
 ### Deploy with custom config
 
 ```bash

diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki-stack
-version: 0.11.1
+version: 0.12.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki-stack/templates/datasources.yaml b/production/helm/loki-stack/templates/datasources.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "loki-stack.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki-stack.name" . }}
     chart: {{ template "loki-stack.chart" . }}

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki
-version: 0.10.0
+version: 0.11.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/loki/templates/networkpolicy.yaml b/production/helm/loki/templates/networkpolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/pdb.yaml b/production/helm/loki/templates/pdb.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     heritage: {{ .Release.Service }}

diff --git a/production/helm/loki/templates/podsecuritypolicy.yaml b/production/helm/loki/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/role.yaml b/production/helm/loki/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/rolebinding.yaml b/production/helm/loki/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/secret.yaml b/production/helm/loki/templates/secret.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/service-headless.yaml b/production/helm/loki/templates/service-headless.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "loki.fullname" . }}-headless
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/service.yaml b/production/helm/loki/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/loki/templates/serviceaccount.yaml b/production/helm/loki/templates/serviceaccount.yaml
@@ -8,5 +8,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "loki.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 
diff --git a/production/helm/loki/templates/statefulset.yaml b/production/helm/loki/templates/statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "loki.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "loki.name" . }}
     chart: {{ template "loki.chart" . }}

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,5 +1,5 @@
 name: promtail
-version: 0.8.1
+version: 0.9.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/templates/clusterrole.yaml b/production/helm/promtail/templates/clusterrole.yaml
@@ -8,6 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   name: {{ template "promtail.fullname" . }}-clusterrole
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups: [""] # "" indicates the core API group
   resources:

diff --git a/production/helm/promtail/templates/configmap.yaml b/production/helm/promtail/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "promtail.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}

diff --git a/production/helm/promtail/templates/daemonset.yaml b/production/helm/promtail/templates/daemonset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "promtail.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}

diff --git a/production/helm/promtail/templates/podsecuritypolicy.yaml b/production/helm/promtail/templates/podsecuritypolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "promtail.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}

diff --git a/production/helm/promtail/templates/role.yaml b/production/helm/promtail/templates/role.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "promtail.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}

diff --git a/production/helm/promtail/templates/rolebinding.yaml b/production/helm/promtail/templates/rolebinding.yaml
@@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "promtail.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "promtail.name" . }}
     chart: {{ template "promtail.chart" . }}

diff --git a/production/helm/promtail/templates/serviceaccount.yaml b/production/helm/promtail/templates/serviceaccount.yaml
@@ -8,5 +8,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "promtail.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}