Merge pull request #96 from thanos-io/filter-pvc-empty-dir

kube-thanos: Filter emptyDir instead of resetting volumes with PVC
thanos-io · Feb 11, 2020 · 6f490d7 · 6f490d7
2 parents bede412 + b9cff03
commit 6f490d7
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -63,7 +63,7 @@ spec:
           name: data
           readOnly: false
       terminationGracePeriodSeconds: 120
-      volumes: null
+      volumes: []
   volumeClaimTemplates:
   - metadata:
       labels: