Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
spec:
accessModes:
- ReadWriteOnce
{{- if .Values.global.storageClass }}
storageClassName: {{ .Values.global.storageClass }}
{{- if .Values.global.storageClassName }}
storageClassName: {{ .Values.global.storageClassName }}
{{- end }}
resources:
requests:
Expand Down
8 changes: 4 additions & 4 deletions charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ metadata:
spec:
accessModes:
- ReadWriteOnce
{{- if .Values.global.storageClass }}
storageClassName: {{ .Values.global.storageClass }}
{{- if .Values.global.storageClassName }}
storageClassName: {{ .Values.global.storageClassName }}
{{- end }}
resources:
requests:
Expand All @@ -139,8 +139,8 @@ metadata:
spec:
accessModes:
- ReadWriteOnce
{{- if .Values.global.storageClass }}
storageClassName: {{ .Values.global.storageClass }}
{{- if .Values.global.storageClassName }}
storageClassName: {{ .Values.global.storageClassName }}
{{- end }}
resources:
requests:
Expand Down
8 changes: 4 additions & 4 deletions charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ tests:
isKind:
of: PersistentVolumeClaim

- it: should include storageClassName when global.storageClass is set
- it: should include storageClassName when global.storageClassName is set
set:
global:
storageClass: "fast-ssd"
storageClassName: "fast-ssd"
clickhouse:
enabled: true
persistence:
Expand All @@ -55,10 +55,10 @@ tests:
path: spec.storageClassName
value: "fast-ssd"

- it: should omit storageClassName when global.storageClass is empty
- it: should omit storageClassName when global.storageClassName is empty
set:
global:
storageClass: ""
storageClassName: ""
clickhouse:
enabled: true
persistence:
Expand Down
6 changes: 3 additions & 3 deletions charts/hdx-oss-v2/tests/persistence_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ tests:
- it: should use correct mongodb PVC name and size
set:
global:
storageClass: "custom-storage-class"
storageClassName: "custom-storage-class"
mongodb:
persistence:
enabled: true
Expand All @@ -32,10 +32,10 @@ tests:
- hasDocuments:
count: 0

- it: should omit storageClassName when global.storageClass is empty string
- it: should omit storageClassName when global.storageClassName is empty string
set:
global:
storageClass: ""
storageClassName: ""
mongodb:
persistence:
enabled: true
Expand Down
8 changes: 4 additions & 4 deletions charts/hdx-oss-v2/tests/pvc_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tests:
enabled: true
dataSize: 10Gi
global:
storageClass: standard
storageClassName: standard
asserts:
- isKind:
of: PersistentVolumeClaim
Expand All @@ -35,21 +35,21 @@ tests:
- hasDocuments:
count: 0

- it: should not include storageClassName when global.storageClass is empty
- it: should not include storageClassName when global.storageClassName is empty
set:
mongodb:
persistence:
enabled: true
dataSize: 10Gi
global:
storageClass: ""
storageClassName: ""
asserts:
- isKind:
of: PersistentVolumeClaim
- isNull:
path: spec.storageClassName

- it: should not include storageClassName when global.storageClass is not set
- it: should not include storageClassName when global.storageClassName is not set
set:
mongodb:
persistence:
Expand Down