Skip to content

Commit 023073e

Browse files
committed
fix storage class issue preventing upgrades + add tests
1 parent 468d567 commit 023073e

File tree

6 files changed

+88
-4
lines changed

6 files changed

+88
-4
lines changed

charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ metadata:
88
spec:
99
accessModes:
1010
- ReadWriteOnce
11+
{{- if .Values.global.storageClass }}
1112
storageClassName: {{ .Values.global.storageClass }}
13+
{{- end }}
1214
resources:
1315
requests:
1416
storage: {{ .Values.persistence.mongodb.size }}

charts/hdx-oss-v2/templates/clickhouse-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ metadata:
105105
spec:
106106
accessModes:
107107
- ReadWriteOnce
108+
{{- if .Values.global.storageClass }}
108109
storageClassName: {{ .Values.global.storageClass }}
110+
{{- end }}
109111
resources:
110112
requests:
111113
storage: {{ .Values.clickhouse.persistence.dataSize }}
@@ -119,7 +121,9 @@ metadata:
119121
spec:
120122
accessModes:
121123
- ReadWriteOnce
124+
{{- if .Values.global.storageClass }}
122125
storageClassName: {{ .Values.global.storageClass }}
126+
{{- end }}
123127
resources:
124128
requests:
125129
storage: {{ .Values.clickhouse.persistence.logSize }}

charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,42 @@ tests:
3333
of: PersistentVolumeClaim
3434
- documentIndex: 5
3535
isKind:
36-
of: PersistentVolumeClaim
36+
of: PersistentVolumeClaim
37+
38+
- it: should include storageClassName when global.storageClass is set
39+
set:
40+
global:
41+
storageClass: "fast-ssd"
42+
clickhouse:
43+
enabled: true
44+
persistence:
45+
enabled: true
46+
dataSize: 10Gi
47+
logSize: 5Gi
48+
asserts:
49+
- documentIndex: 4
50+
equal:
51+
path: spec.storageClassName
52+
value: "fast-ssd"
53+
- documentIndex: 5
54+
equal:
55+
path: spec.storageClassName
56+
value: "fast-ssd"
57+
58+
- it: should omit storageClassName when global.storageClass is empty
59+
set:
60+
global:
61+
storageClass: ""
62+
clickhouse:
63+
enabled: true
64+
persistence:
65+
enabled: true
66+
dataSize: 10Gi
67+
logSize: 5Gi
68+
asserts:
69+
- documentIndex: 4
70+
isNull:
71+
path: spec.storageClassName
72+
- documentIndex: 5
73+
isNull:
74+
path: spec.storageClassName

charts/hdx-oss-v2/tests/persistence_test.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,18 @@ tests:
3030
enabled: false
3131
asserts:
3232
- hasDocuments:
33-
count: 0
33+
count: 0
34+
35+
- it: should omit storageClassName when global.storageClass is empty string
36+
set:
37+
global:
38+
storageClass: ""
39+
persistence:
40+
mongodb:
41+
enabled: true
42+
size: 10Gi
43+
asserts:
44+
- isKind:
45+
of: PersistentVolumeClaim
46+
- isNull:
47+
path: spec.storageClassName

charts/hdx-oss-v2/tests/pvc_test.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,30 @@ tests:
3333
enabled: false
3434
asserts:
3535
- hasDocuments:
36-
count: 0
36+
count: 0
37+
38+
- it: should not include storageClassName when global.storageClass is empty
39+
set:
40+
persistence:
41+
mongodb:
42+
enabled: true
43+
size: 10Gi
44+
global:
45+
storageClass: ""
46+
asserts:
47+
- isKind:
48+
of: PersistentVolumeClaim
49+
- isNull:
50+
path: spec.storageClassName
51+
52+
- it: should not include storageClassName when global.storageClass is not set
53+
set:
54+
persistence:
55+
mongodb:
56+
enabled: true
57+
size: 10Gi
58+
asserts:
59+
- isKind:
60+
of: PersistentVolumeClaim
61+
- isNull:
62+
path: spec.storageClassName

charts/hdx-oss-v2/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
global:
22
imageRegistry: ""
33
imagePullSecrets: []
4-
storageClassName: []
4+
storageClassName: "local-path"
55

66
hyperdx:
77
image: "hyperdx/hyperdx:2-beta"

0 commit comments

Comments
 (0)