Skip to content

Commit 6f490d7

Browse files
authored
Merge pull request #96 from thanos-io/filter-pvc-empty-dir
kube-thanos: Filter emptyDir instead of resetting volumes with PVC
2 parents bede412 + b9cff03 commit 6f490d7

9 files changed

+9
-9
lines changed

Diff for: examples/all/manifests/thanos-compact-statefulSet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
name: data
6262
readOnly: false
6363
terminationGracePeriodSeconds: 120
64-
volumes: null
64+
volumes: []
6565
volumeClaimTemplates:
6666
- metadata:
6767
labels:

Diff for: examples/all/manifests/thanos-receive-statefulSet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ spec:
9292
name: data
9393
readOnly: false
9494
terminationGracePeriodSeconds: 120
95-
volumes: null
95+
volumes: []
9696
volumeClaimTemplates:
9797
- metadata:
9898
labels:

Diff for: examples/all/manifests/thanos-rule-statefulSet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ spec:
7070
- mountPath: /var/thanos/rule
7171
name: data
7272
readOnly: false
73-
volumes: null
73+
volumes: []
7474
volumeClaimTemplates:
7575
- metadata:
7676
labels:

Diff for: examples/all/manifests/thanos-store-statefulSet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
name: data
6464
readOnly: false
6565
terminationGracePeriodSeconds: 120
66-
volumes: null
66+
volumes: []
6767
volumeClaimTemplates:
6868
- metadata:
6969
labels:

Diff for: jsonnet/kube-thanos/kube-thanos-compact.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
125125
spec+: {
126126
template+: {
127127
spec+: {
128-
volumes: null,
128+
volumes: std.filter(function(v) v.name != 'data', super.volumes),
129129
},
130130
},
131131
volumeClaimTemplates: [tc.config.volumeClaimTemplate {

Diff for: jsonnet/kube-thanos/kube-thanos-receive.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
172172
spec+: {
173173
template+: {
174174
spec+: {
175-
volumes: null,
175+
volumes: std.filter(function(v) v.name != 'data', super.volumes),
176176
},
177177
},
178178
volumeClaimTemplates: [tr.config.volumeClaimTemplate {

Diff for: jsonnet/kube-thanos/kube-thanos-rule.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
139139
spec+: {
140140
template+: {
141141
spec+: {
142-
volumes: null,
142+
volumes: std.filter(function(v) v.name != 'data', super.volumes),
143143
},
144144
},
145145
volumeClaimTemplates: [tr.config.volumeClaimTemplate {

Diff for: jsonnet/kube-thanos/kube-thanos-store.libsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
129129
spec+: {
130130
template+: {
131131
spec+: {
132-
volumes: null,
132+
volumes: std.filter(function(v) v.name != 'data', super.volumes),
133133
},
134134
},
135135
volumeClaimTemplates: [ts.config.volumeClaimTemplate {

Diff for: manifests/thanos-store-statefulSet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
name: data
6464
readOnly: false
6565
terminationGracePeriodSeconds: 120
66-
volumes: null
66+
volumes: []
6767
volumeClaimTemplates:
6868
- metadata:
6969
labels:

0 commit comments

Comments
 (0)