Skip to content

Commit aa52509

Browse files
authored
fix: Correctly references ingress tls secret and storage class names (#69)
Fixes: HDX-1982 Fixes issue #60
1 parent dfe3e8d commit aa52509

File tree

7 files changed

+37
-18
lines changed

7 files changed

+37
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ metadata:
88
spec:
99
accessModes:
1010
- ReadWriteOnce
11-
{{- if .Values.global.storageClass }}
12-
storageClassName: {{ .Values.global.storageClass }}
11+
{{- if .Values.global.storageClassName }}
12+
storageClassName: {{ .Values.global.storageClassName }}
1313
{{- end }}
1414
resources:
1515
requests:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ metadata:
123123
spec:
124124
accessModes:
125125
- ReadWriteOnce
126-
{{- if .Values.global.storageClass }}
127-
storageClassName: {{ .Values.global.storageClass }}
126+
{{- if .Values.global.storageClassName }}
127+
storageClassName: {{ .Values.global.storageClassName }}
128128
{{- end }}
129129
resources:
130130
requests:
@@ -139,8 +139,8 @@ metadata:
139139
spec:
140140
accessModes:
141141
- ReadWriteOnce
142-
{{- if .Values.global.storageClass }}
143-
storageClassName: {{ .Values.global.storageClass }}
142+
{{- if .Values.global.storageClassName }}
143+
storageClassName: {{ .Values.global.storageClassName }}
144144
{{- end }}
145145
resources:
146146
requests:

charts/hdx-oss-v2/templates/ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
tls:
2828
- hosts:
2929
- {{ .Values.hyperdx.ingress.host | default "localhost" }}
30-
secretName: {{ .Values.hyperdx.ingress.tlsSecretName | default "hyperdx-tls" }}
30+
secretName: {{ .Values.hyperdx.ingress.tls.secretName | default "hyperdx-tls" }}
3131
{{- end }}
3232
rules:
3333
- host: {{ .Values.hyperdx.ingress.host | default "localhost" }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ tests:
3535
isKind:
3636
of: PersistentVolumeClaim
3737

38-
- it: should include storageClassName when global.storageClass is set
38+
- it: should include storageClassName when global.storageClassName is set
3939
set:
4040
global:
41-
storageClass: "fast-ssd"
41+
storageClassName: "fast-ssd"
4242
clickhouse:
4343
enabled: true
4444
persistence:
@@ -55,10 +55,10 @@ tests:
5555
path: spec.storageClassName
5656
value: "fast-ssd"
5757

58-
- it: should omit storageClassName when global.storageClass is empty
58+
- it: should omit storageClassName when global.storageClassName is empty
5959
set:
6060
global:
61-
storageClass: ""
61+
storageClassName: ""
6262
clickhouse:
6363
enabled: true
6464
persistence:

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,24 @@ tests:
175175
nginx.ingress.kubernetes.io/ssl-redirect: "true"
176176
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
177177

178+
- it: should use custom TLS secret name when provided
179+
set:
180+
hyperdx:
181+
ingress:
182+
enabled: true
183+
host: hyperdx.example.com
184+
tls:
185+
enabled: true
186+
secretName: my-custom-tls-secret
187+
asserts:
188+
- hasDocuments:
189+
count: 1
190+
- isKind:
191+
of: Ingress
192+
- equal:
193+
path: spec.tls[0].secretName
194+
value: my-custom-tls-secret
195+
178196
- it: should render additional ingress templates
179197
set:
180198
hyperdx:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tests:
55
- it: should use correct mongodb PVC name and size
66
set:
77
global:
8-
storageClass: "custom-storage-class"
8+
storageClassName: "custom-storage-class"
99
mongodb:
1010
persistence:
1111
enabled: true
@@ -35,7 +35,7 @@ tests:
3535
- it: should omit storageClassName when global.storageClass is empty string
3636
set:
3737
global:
38-
storageClass: ""
38+
storageClassName: ""
3939
mongodb:
4040
persistence:
4141
enabled: true

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ tests:
99
enabled: true
1010
dataSize: 10Gi
1111
global:
12-
storageClass: standard
12+
storageClassName: standard
1313
asserts:
1414
- isKind:
1515
of: PersistentVolumeClaim
@@ -42,14 +42,14 @@ tests:
4242
enabled: true
4343
dataSize: 10Gi
4444
global:
45-
storageClass: ""
45+
storageClassName: ""
4646
asserts:
4747
- isKind:
4848
of: PersistentVolumeClaim
4949
- isNull:
5050
path: spec.storageClassName
5151

52-
- it: should not include storageClassName when global.storageClass is not set
52+
- it: should use default storageClassName when global.storageClassName is not explicitly overridden
5353
set:
5454
mongodb:
5555
persistence:
@@ -58,5 +58,6 @@ tests:
5858
asserts:
5959
- isKind:
6060
of: PersistentVolumeClaim
61-
- isNull:
62-
path: spec.storageClassName
61+
- equal:
62+
path: spec.storageClassName
63+
value: local-path

0 commit comments

Comments
 (0)