From b9cff03a2631ff6bee8288689d156375f4e8033b Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 11 Feb 2020 11:01:55 +0100
Subject: [PATCH] kube-thanos: Filter emptyDir instead of resetting volumes
 with PVC

Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
---
 examples/all/manifests/thanos-compact-statefulSet.yaml | 2 +-
 examples/all/manifests/thanos-receive-statefulSet.yaml | 2 +-
 examples/all/manifests/thanos-rule-statefulSet.yaml    | 2 +-
 examples/all/manifests/thanos-store-statefulSet.yaml   | 2 +-
 jsonnet/kube-thanos/kube-thanos-compact.libsonnet      | 2 +-
 jsonnet/kube-thanos/kube-thanos-receive.libsonnet      | 2 +-
 jsonnet/kube-thanos/kube-thanos-rule.libsonnet         | 2 +-
 jsonnet/kube-thanos/kube-thanos-store.libsonnet        | 2 +-
 manifests/thanos-store-statefulSet.yaml                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/all/manifests/thanos-compact-statefulSet.yaml b/examples/all/manifests/thanos-compact-statefulSet.yaml
index ee46d2e2..f50c0aa1 100644
--- a/examples/all/manifests/thanos-compact-statefulSet.yaml
+++ b/examples/all/manifests/thanos-compact-statefulSet.yaml
@@ -61,7 +61,7 @@ spec:
           name: data
           readOnly: false
       terminationGracePeriodSeconds: 120
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels:
diff --git a/examples/all/manifests/thanos-receive-statefulSet.yaml b/examples/all/manifests/thanos-receive-statefulSet.yaml
index 10c7dee2..8ae373ba 100644
--- a/examples/all/manifests/thanos-receive-statefulSet.yaml
+++ b/examples/all/manifests/thanos-receive-statefulSet.yaml
@@ -92,7 +92,7 @@ spec:
           name: data
           readOnly: false
       terminationGracePeriodSeconds: 120
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels:
diff --git a/examples/all/manifests/thanos-rule-statefulSet.yaml b/examples/all/manifests/thanos-rule-statefulSet.yaml
index e4ff1d40..19372878 100644
--- a/examples/all/manifests/thanos-rule-statefulSet.yaml
+++ b/examples/all/manifests/thanos-rule-statefulSet.yaml
@@ -70,7 +70,7 @@ spec:
         - mountPath: /var/thanos/rule
           name: data
           readOnly: false
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels:
diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml
index 2ffd9249..e403718b 100644
--- a/examples/all/manifests/thanos-store-statefulSet.yaml
+++ b/examples/all/manifests/thanos-store-statefulSet.yaml
@@ -63,7 +63,7 @@ spec:
           name: data
           readOnly: false
       terminationGracePeriodSeconds: 120
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels:
diff --git a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet
index 9ade274c..4baf1930 100644
--- a/jsonnet/kube-thanos/kube-thanos-compact.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-compact.libsonnet
@@ -125,7 +125,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       spec+: {
         template+: {
           spec+: {
-            volumes: null,
+            volumes: std.filter(function(v) v.name != 'data', super.volumes),
           },
         },
         volumeClaimTemplates: [tc.config.volumeClaimTemplate {
diff --git a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
index 48fc5eee..c1320db6 100644
--- a/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-receive.libsonnet
@@ -172,7 +172,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       spec+: {
         template+: {
           spec+: {
-            volumes: null,
+            volumes: std.filter(function(v) v.name != 'data', super.volumes),
           },
         },
         volumeClaimTemplates: [tr.config.volumeClaimTemplate {
diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet
index 5cf7a14a..d5757733 100644
--- a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet
@@ -139,7 +139,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       spec+: {
         template+: {
           spec+: {
-            volumes: null,
+            volumes: std.filter(function(v) v.name != 'data', super.volumes),
           },
         },
         volumeClaimTemplates: [tr.config.volumeClaimTemplate {
diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
index e647f6fa..be074573 100644
--- a/jsonnet/kube-thanos/kube-thanos-store.libsonnet
+++ b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
@@ -129,7 +129,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
       spec+: {
         template+: {
           spec+: {
-            volumes: null,
+            volumes: std.filter(function(v) v.name != 'data', super.volumes),
           },
         },
         volumeClaimTemplates: [ts.config.volumeClaimTemplate {
diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml
index 2ffd9249..e403718b 100644
--- a/manifests/thanos-store-statefulSet.yaml
+++ b/manifests/thanos-store-statefulSet.yaml
@@ -63,7 +63,7 @@ spec:
           name: data
           readOnly: false
       terminationGracePeriodSeconds: 120
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels: