Skip to content
Merged
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
2 changes: 1 addition & 1 deletion charts/hdx-oss-v2/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
tls:
- hosts:
- {{ .Values.hyperdx.ingress.host | default "localhost" }}
secretName: {{ .Values.hyperdx.ingress.tlsSecretName | default "hyperdx-tls" }}
secretName: {{ .Values.hyperdx.ingress.tls.secretName | default "hyperdx-tls" }}
{{- end }}
rules:
- host: {{ .Values.hyperdx.ingress.host | default "localhost" }}
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
18 changes: 18 additions & 0 deletions charts/hdx-oss-v2/tests/ingress_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,24 @@ tests:
nginx.ingress.kubernetes.io/ssl-redirect: "true"
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"

- it: should use custom TLS secret name when provided
set:
hyperdx:
ingress:
enabled: true
host: hyperdx.example.com
tls:
enabled: true
secretName: my-custom-tls-secret
asserts:
- hasDocuments:
count: 1
- isKind:
of: Ingress
- equal:
path: spec.tls[0].secretName
value: my-custom-tls-secret

- it: should render additional ingress templates
set:
hyperdx:
Expand Down
4 changes: 2 additions & 2 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 Down Expand Up @@ -35,7 +35,7 @@ tests:
- it: should omit storageClassName when global.storageClass is empty string
set:
global:
storageClass: ""
storageClassName: ""
mongodb:
persistence:
enabled: true
Expand Down
11 changes: 6 additions & 5 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 Down Expand Up @@ -42,14 +42,14 @@ tests:
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 use default storageClassName when global.storageClassName is not explicitly overridden
set:
mongodb:
persistence:
Expand All @@ -58,5 +58,6 @@ tests:
asserts:
- isKind:
of: PersistentVolumeClaim
- isNull:
path: spec.storageClassName
- equal:
path: spec.storageClassName
value: local-path