Skip to content

feat: relocate persistence field + handle the case when pvc is disabled #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teeohhem merged 4 commits into from
Jun 5, 2025
Merged

feat: relocate persistence field + handle the case when pvc is disabled #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ee80aa
feat: relocate persistence field + handle the case when pvc is disabled
wrn14897 Jun 4, 2025
20825a8
feat: use pvc for ch service
wrn14897 Jun 4, 2025
763a23d
ci: fix tests
wrn14897 Jun 4, 2025
581df08
docs: add changeset
wrn14897 Jun 4, 2025
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
5 changes: 5 additions & 0 deletions .changeset/fair-houses-begin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"helm-charts": patch
---

fix: relocate mongodb volume persistence field + handle the case when CH pvc is disabled
6 changes: 3 additions & 3 deletions charts/hdx-oss-v2/templates/claims/persistent-volume-claims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.persistence.mongodb.enabled }}
{{- if .Values.mongodb.persistence.enabled }}
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Expand All @@ -13,6 +13,6 @@ spec:
{{- end }}
resources:
requests:
storage: {{ .Values.persistence.mongodb.size }}
storage: {{ .Values.mongodb.persistence.dataSize }}
---
{{- end }}
{{- end }}
10 changes: 10 additions & 0 deletions charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,19 @@ spec:
configMap:
name: {{ include "hdx-oss.fullname" . }}-clickhouse-users
- name: data
{{- if .Values.clickhouse.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "hdx-oss.fullname" . }}-clickhouse-data
{{- else }}
emptyDir: {}
{{- end }}
- name: logs
{{- if .Values.clickhouse.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "hdx-oss.fullname" . }}-clickhouse-logs
{{- else }}
emptyDir: {}
{{- end }}
---
apiVersion: v1
kind: Service
Expand Down
4 changes: 4 additions & 0 deletions charts/hdx-oss-v2/templates/mongodb-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,12 @@ spec:
mountPath: /data/db
volumes:
- name: mongodb-data
{{- if .Values.mongodb.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "hdx-oss.fullname" . }}-mongodb
{{- else }}
emptyDir: {}
{{- end }}
---
apiVersion: v1
kind: Service
Expand Down
76 changes: 75 additions & 1 deletion charts/hdx-oss-v2/tests/clickhouse-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,78 @@ tests:
path: spec.storageClassName
- documentIndex: 5
isNull:
path: spec.storageClassName
path: spec.storageClassName

- it: should use PVCs when persistence is enabled
set:
clickhouse:
enabled: true
persistence:
enabled: true
dataSize: 10Gi
logSize: 5Gi
asserts:
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.volumes[2].name
value: data
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[2].persistentVolumeClaim
- documentIndex: 0
matchRegex:
path: spec.template.spec.volumes[2].persistentVolumeClaim.claimName
pattern: .*-clickhouse-data$
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[2].emptyDir
- documentIndex: 0
equal:
path: spec.template.spec.volumes[3].name
value: logs
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[3].persistentVolumeClaim
- documentIndex: 0
matchRegex:
path: spec.template.spec.volumes[3].persistentVolumeClaim.claimName
pattern: .*-clickhouse-logs$
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[3].emptyDir

- it: should use emptyDir when persistence is disabled
set:
clickhouse:
enabled: true
persistence:
enabled: false
asserts:
- hasDocuments:
count: 4
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.volumes[2].name
value: data
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[2].emptyDir
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[2].persistentVolumeClaim
- documentIndex: 0
equal:
path: spec.template.spec.volumes[3].name
value: logs
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[3].emptyDir
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[3].persistentVolumeClaim
48 changes: 47 additions & 1 deletion charts/hdx-oss-v2/tests/mongodb-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,50 @@ tests:
enabled: false
asserts:
- hasDocuments:
count: 0
count: 0

- it: should use PVC when persistence is enabled
set:
mongodb:
enabled: true
persistence:
enabled: true
asserts:
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.volumes[0].name
value: mongodb-data
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[0].persistentVolumeClaim
- documentIndex: 0
matchRegex:
path: spec.template.spec.volumes[0].persistentVolumeClaim.claimName
pattern: .*-mongodb$
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[0].emptyDir

- it: should use emptyDir when persistence is disabled
set:
mongodb:
enabled: true
persistence:
enabled: false
asserts:
- documentIndex: 0
isKind:
of: Deployment
- documentIndex: 0
equal:
path: spec.template.spec.volumes[0].name
value: mongodb-data
- documentIndex: 0
isNotNull:
path: spec.template.spec.volumes[0].emptyDir
- documentIndex: 0
isNull:
path: spec.template.spec.volumes[0].persistentVolumeClaim
16 changes: 8 additions & 8 deletions charts/hdx-oss-v2/tests/persistence_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ tests:
set:
global:
storageClass: "custom-storage-class"
persistence:
mongodb:
mongodb:
persistence:
enabled: true
size: 15Gi
dataSize: 15Gi
asserts:
- isKind:
of: PersistentVolumeClaim
Expand All @@ -25,8 +25,8 @@ tests:

- it: should not create PVCs when persistence is disabled
set:
persistence:
mongodb:
mongodb:
persistence:
enabled: false
asserts:
- hasDocuments:
Expand All @@ -36,10 +36,10 @@ tests:
set:
global:
storageClass: ""
persistence:
mongodb:
mongodb:
persistence:
enabled: true
size: 10Gi
dataSize: 10Gi
asserts:
- isKind:
of: PersistentVolumeClaim
Expand Down
22 changes: 11 additions & 11 deletions charts/hdx-oss-v2/tests/pvc_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ templates:
tests:
- it: should render mongodb pvc correctly when enabled
set:
persistence:
mongodb:
mongodb:
persistence:
enabled: true
size: 10Gi
dataSize: 10Gi
global:
storageClass: standard
asserts:
Expand All @@ -28,19 +28,19 @@ tests:

- it: should not render mongodb pvc when disabled
set:
persistence:
mongodb:
mongodb:
persistence:
enabled: false
asserts:
- hasDocuments:
count: 0

- it: should not include storageClassName when global.storageClass is empty
set:
persistence:
mongodb:
mongodb:
persistence:
enabled: true
size: 10Gi
dataSize: 10Gi
global:
storageClass: ""
asserts:
Expand All @@ -51,10 +51,10 @@ tests:

- it: should not include storageClassName when global.storageClass is not set
set:
persistence:
mongodb:
mongodb:
persistence:
enabled: true
size: 10Gi
dataSize: 10Gi
asserts:
- isKind:
of: PersistentVolumeClaim
Expand Down
8 changes: 3 additions & 5 deletions charts/hdx-oss-v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ mongodb:
image: "mongo:5.0.14-focal"
port: 27017
enabled: true
persistence:
enabled: true
dataSize: 10Gi

clickhouse:
image: "clickhouse/clickhouse-server:24-alpine"
Expand Down Expand Up @@ -205,11 +208,6 @@ otel:
# Clickhouse database to send logs/traces/metrics to. Defaults to "default"
clickhouseDatabase: "default"

persistence:
Copy link
Collaborator Author

@wrn14897 wrn14897 Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved this to 'mongodb'

mongodb:
enabled: true
size: 10Gi

tasks:
enabled: false
checkAlerts:
Expand Down
Loading