diff --git a/charts/distributed-loki/Chart.yaml b/charts/distributed-loki/Chart.yaml index 48f46e5..b657523 100644 --- a/charts/distributed-loki/Chart.yaml +++ b/charts/distributed-loki/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: loki-distributed description: A Helm chart for Kubernetes type: application -version: 0.6.1 +version: 0.7.0 appVersion: 2.0.0 diff --git a/charts/distributed-loki/README.md b/charts/distributed-loki/README.md index 027198f..750b709 100644 --- a/charts/distributed-loki/README.md +++ b/charts/distributed-loki/README.md @@ -2,7 +2,7 @@ loki-distributed ================ A Helm chart for Kubernetes -Current chart version is `0.6.1` +Current chart version is `0.7.0` diff --git a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-servicemonitor.yaml b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-servicemonitor.yaml index 574b613..88d287d 100644 --- a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-servicemonitor.yaml +++ b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-servicemonitor.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.loki.useBoltDBShipper false}} {{- if .Values.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor @@ -24,3 +25,4 @@ spec: scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }} {{- end }} {{- end }} +{{- end }} diff --git a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-sfs.yaml b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-sfs.yaml index 9b92049..7197144 100644 --- a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-sfs.yaml +++ b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-sfs.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.loki.useBoltDBShipper false}} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -57,3 +58,4 @@ spec: name: http-metrics updateStrategy: type: RollingUpdate +{{- end }} diff --git a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-svc.yaml b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-svc.yaml index d22d8cb..805297e 100644 --- a/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-svc.yaml +++ b/charts/distributed-loki/templates/memcached-index-writes/memcached-index-writes-svc.yaml @@ -1,3 +1,4 @@ +{{- if eq .Values.loki.useBoltDBShipper false}} apiVersion: v1 kind: Service metadata: @@ -16,3 +17,4 @@ spec: targetPort: 9150 selector: {{- include "loki-helm.selectorLabels" . | nindent 4 }} app.kubernetes.io/component: memcached-index-writes +{{- end }}