diff --git a/production/helm/templates/loki/configmap.yaml b/production/helm/templates/loki/configmap.yaml
index 2eff8df8131e6ec889a16bace472e7ac3b45e4f6..5b93c3f6de8e0bf603c707635642945a22863134 100644
--- a/production/helm/templates/loki/configmap.yaml
+++ b/production/helm/templates/loki/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -35,13 +36,14 @@ data:
index:
prefix: {{ .index.prefix }}
period: {{ .index.period }}
- {{- end -}}
-{{- end -}}
+ {{- end }}
+{{- end }}
{{- if .Values.loki.config.storage_configs }}
storage_config:
{{- range .Values.loki.config.storage_configs }}
{{ .name }}:
directory: {{ .directory }}
- {{- end -}}
-{{- end -}}
\ No newline at end of file
+ {{- end }}
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/deployment.yaml b/production/helm/templates/loki/deployment.yaml
index 1da9554d89034651fdc99c69f850e9407b1c5747..0f50bd47b725b880de41e4dd4a1bf1b2eb2fe1eb 100644
--- a/production/helm/templates/loki/deployment.yaml
+++ b/production/helm/templates/loki/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
apiVersion: apps/v1beta2
kind: Deployment
metadata:
@@ -87,4 +88,5 @@ spec:
claimName: {{ .Values.loki.persistence.existingClaim | default (include "loki.fullname" .) }}
{{- else }}
emptyDir: {}
- {{- end -}}
+ {{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/podsecuritypolicy.yaml b/production/helm/templates/loki/podsecuritypolicy.yaml
index a5007bdbba186ad33f8b11bf9bf355803b4065a4..9c2175ba45088de7dfafaded3d34a983ca6c6446 100644
--- a/production/helm/templates/loki/podsecuritypolicy.yaml
+++ b/production/helm/templates/loki/podsecuritypolicy.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
{{- if .Values.rbac.pspEnabled }}
apiVersion: extensions/v1beta1
kind: PodSecurityPolicy
@@ -29,3 +30,4 @@ spec:
rule: 'RunAsAny'
readOnlyRootFilesystem: false
{{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/pvc.yaml b/production/helm/templates/loki/pvc.yaml
index b31e91bb59935658afbe82ea4d97d2b65d0c934e..9bba88becb3a54f0d15872f77a3e5b6b285b25c2 100644
--- a/production/helm/templates/loki/pvc.yaml
+++ b/production/helm/templates/loki/pvc.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
{{- if and .Values.loki.persistence.enabled (not .Values.loki.persistence.existingClaim) }}
apiVersion: v1
kind: PersistentVolumeClaim
@@ -21,4 +22,5 @@ spec:
requests:
storage: {{ .Values.loki.persistence.size | quote }}
storageClassName: {{ .Values.loki.persistence.storageClassName }}
-{{- end -}}
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/role.yaml b/production/helm/templates/loki/role.yaml
index cc09eb3de8262c06fb4ca607ece384dbebf1d6d6..68951cf814ecf68a0259d0526e095a17cbb27521 100644
--- a/production/helm/templates/loki/role.yaml
+++ b/production/helm/templates/loki/role.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
{{- if .Values.rbac.create }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role
@@ -15,4 +16,5 @@ rules:
verbs: ['use']
resourceNames: [{{ template "loki.fullname" . }}]
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/rolebinding.yaml b/production/helm/templates/loki/rolebinding.yaml
index 587ac9585a7a3c9e1f5144078e308810b37e088b..afe1af010d26687a62e9a563bf953ffed2b0a798 100644
--- a/production/helm/templates/loki/rolebinding.yaml
+++ b/production/helm/templates/loki/rolebinding.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.rbac.create -}}
+{{- if .Values.loki.enabled }}
+{{- if .Values.rbac.create }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
metadata:
@@ -15,4 +16,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ template "loki.serviceAccountName" . }}
-{{- end -}}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/loki/service.yaml b/production/helm/templates/loki/service.yaml
index db03cf4a67a9087b88bccb5e17a814e296949209..0ad728923195bfc430e8289ddf387536df2a58a5 100644
--- a/production/helm/templates/loki/service.yaml
+++ b/production/helm/templates/loki/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
apiVersion: v1
kind: Service
metadata:
@@ -22,4 +23,5 @@ spec:
targetPort: {{ .Values.loki.service.port }}
selector:
app: {{ template "loki.name" . }}
- release: {{ .Release.Name }}
\ No newline at end of file
+ release: {{ .Release.Name }}
+{{- end }}
diff --git a/production/helm/templates/loki/serviceaccount.yaml b/production/helm/templates/loki/serviceaccount.yaml
index 5ad0dcf6d50afe92cc703c206f634ba198cb2d68..302cafdb452ced33fdcc494ba9256069779122aa 100644
--- a/production/helm/templates/loki/serviceaccount.yaml
+++ b/production/helm/templates/loki/serviceaccount.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.loki.enabled }}
{{- if .Values.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
@@ -8,4 +9,5 @@ metadata:
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
name: {{ template "loki.serviceAccountName" . }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/promtail/clusterrole.yaml b/production/helm/templates/promtail/clusterrole.yaml
index 8a1f20702936a33c04f1d1f76892202d63516b45..75be62d03d24a82cea86f5b1b7a16e42f4479f1b 100644
--- a/production/helm/templates/promtail/clusterrole.yaml
+++ b/production/helm/templates/promtail/clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
{{- if .Values.rbac.create }}
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
@@ -21,4 +22,5 @@ rules:
- endpoints
- pods
verbs: ["get", "watch", "list"]
-{{- end}}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/promtail/clusterrolebinding.yaml b/production/helm/templates/promtail/clusterrolebinding.yaml
index f958a38915ad5df0f0880f81d20425ef24cb117d..7a842922c82830817d63a8741013e01ff1b28833 100644
--- a/production/helm/templates/promtail/clusterrolebinding.yaml
+++ b/production/helm/templates/promtail/clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
{{- if .Values.rbac.create }}
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
@@ -20,4 +21,5 @@ roleRef:
kind: ClusterRole
name: {{ template "promtail.fullname" . }}-clusterrole
apiGroup: rbac.authorization.k8s.io
-{{- end}}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/promtail/configmap.yaml b/production/helm/templates/promtail/configmap.yaml
index c1b996ec07a01832e29f3f54efe69a35a74fb752..e6c88b5e1fe407ab5f4e0b8ce45a69885b992a35 100644
--- a/production/helm/templates/promtail/configmap.yaml
+++ b/production/helm/templates/promtail/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -92,3 +93,4 @@ data:
- __meta_kubernetes_pod_uid
- __meta_kubernetes_pod_container_name
target_label: __path__
+{{- end }}
diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml
index 24370380a00730380b778e1457f7f7dfe31d107b..9012dc13e4e96977a031695ebc6fadb8f9a1f327 100644
--- a/production/helm/templates/promtail/daemonset.yaml
+++ b/production/helm/templates/promtail/daemonset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@@ -95,3 +96,4 @@ spec:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
+{{- end }}
diff --git a/production/helm/templates/promtail/podsecuritypolicy.yaml b/production/helm/templates/promtail/podsecuritypolicy.yaml
index 72e57f35248954b03ac9f1fd0e2776d7022e0f04..547f1a544e093f8e4e22557ea90eae169b75cc59 100644
--- a/production/helm/templates/promtail/podsecuritypolicy.yaml
+++ b/production/helm/templates/promtail/podsecuritypolicy.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
{{- if .Values.rbac.pspEnabled }}
apiVersion: extensions/v1beta1
kind: PodSecurityPolicy
@@ -27,4 +28,5 @@ spec:
fsGroup:
rule: 'RunAsAny'
readOnlyRootFilesystem: false
- {{- end }}
\ No newline at end of file
+ {{- end }}
+{{- end }}
diff --git a/production/helm/templates/promtail/role.yaml b/production/helm/templates/promtail/role.yaml
index 4de03d9e28beef537602aeffeae78cbe977ae726..d1a97cbaf67f40e9b32ed0bcec4a1aa8d15b4bae 100644
--- a/production/helm/templates/promtail/role.yaml
+++ b/production/helm/templates/promtail/role.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.promtail.enabled }}
{{- if .Values.rbac.create }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: Role
@@ -15,4 +16,5 @@ rules:
verbs: ['use']
resourceNames: [{{ template "promtail.fullname" . }}]
{{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/templates/promtail/rolebinding.yaml b/production/helm/templates/promtail/rolebinding.yaml
index b23fb1374b09ac6185f4f2fc3b26e0a355482ac4..aa3521b2cbe3b6898adcf79d98dde80ffa64a2c3 100644
--- a/production/helm/templates/promtail/rolebinding.yaml
+++ b/production/helm/templates/promtail/rolebinding.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.rbac.create -}}
+{{- if .Values.promtail.enabled }}
+{{- if .Values.rbac.create }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
metadata:
@@ -15,4 +16,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ template "promtail.serviceAccountName" . }}
-{{- end -}}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/production/helm/values.yaml b/production/helm/values.yaml
index 943e182849bc00d7174020298a822b74206b4875..94e194539b29aff76e34c5dffb8c29addbd2f330 100644
--- a/production/helm/values.yaml
+++ b/production/helm/values.yaml
@@ -7,6 +7,8 @@ serviceAccount:
name:
loki:
+ enabled: true
+
replicas: 1
deploymentStrategy: RollingUpdate
@@ -94,6 +96,8 @@ loki:
directory: /data/loki/chunks
promtail:
+ enabled: true
+
nameOverride: promtail
deploymentStrategy: RollingUpdate