From 8f7bc37de66a1b0e87951614edd55fc198917c10 Mon Sep 17 00:00:00 2001 From: Jaspreet Sandhu Date: Wed, 24 Sep 2025 14:54:47 -0400 Subject: [PATCH 1/4] Configure resources of the hyperdx-deployment initContainers --- charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 7d58e0a..b55794d 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -52,6 +52,10 @@ spec: - name: wait-for-mongodb image: busybox command: ['sh', '-c', 'until nc -z {{ include "hdx-oss.fullname" . }}-mongodb {{ .Values.mongodb.port }}; do echo waiting for mongodb; sleep 2; done;'] + {{- if .Values.hyperdx.initContainers.resources }} + resources: + {{- toYaml .Values.hyperdx.initContainers.resources | nindent 12 }} + {{- end }} {{- end }} containers: - name: app From c70def3b717fcacced5db79ab65705dd177ee991 Mon Sep 17 00:00:00 2001 From: Jaspreet Sandhu Date: Wed, 24 Sep 2025 15:57:07 -0400 Subject: [PATCH 2/4] Add unit tests for hyperdx-deployment --- .../tests/hyperdx-deployment_test.yaml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml index 10e3cf0..12f6d33 100644 --- a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml +++ b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml @@ -269,4 +269,36 @@ tests: value: private-registry-secret - lengthEqual: path: spec.template.spec.imagePullSecrets - count: 3 \ No newline at end of file + count: 3 + + - it: should include initContainers resources when configured and mongodb is enabled + set: + mongodb: + enabled: true + hyperdx: + initContainers: + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 2 + memory: 2Gi + asserts: + - isNotEmpty: + path: spec.template.spec.initContainers + - equal: + path: spec.template.spec.initContainers[0].name + value: wait-for-mongodb + - isNotEmpty: + path: spec.template.spec.initContainers[0].resources + - equal: + path: spec.template.spec.initContainers[0].resources.limits + content: + cpu: 1 + memory: 1Gi + - equal: + path: spec.template.spec.initContainers[0].resources.requests + content: + cpu: 2 + memory: 2Gi From d221dd9b966d4bd3e75b1ef6d522685c5ac2de4c Mon Sep 17 00:00:00 2001 From: Jaspreet Sandhu Date: Sun, 5 Oct 2025 14:26:10 -0400 Subject: [PATCH 3/4] Check presence of nested keys --- .../hdx-oss-v2/templates/hyperdx-deployment.yaml | 4 ++-- .../hdx-oss-v2/tests/hyperdx-deployment_test.yaml | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index b55794d..c90d0a9 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -52,9 +52,9 @@ spec: - name: wait-for-mongodb image: busybox command: ['sh', '-c', 'until nc -z {{ include "hdx-oss.fullname" . }}-mongodb {{ .Values.mongodb.port }}; do echo waiting for mongodb; sleep 2; done;'] - {{- if .Values.hyperdx.initContainers.resources }} + {{- if and (hasKey .Values.hyperdx "initContainer") (hasKey .Values.hyperdx.initContainer "resources") }} resources: - {{- toYaml .Values.hyperdx.initContainers.resources | nindent 12 }} + {{- toYaml .Values.hyperdx.initContainer.resources | nindent 12}} {{- end }} {{- end }} containers: diff --git a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml index 12f6d33..938ae6a 100644 --- a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml +++ b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml @@ -302,3 +302,18 @@ tests: content: cpu: 2 memory: 2Gi + +- it: should not include initContainers resources when not configured and mongodb is enabled + set: + mongodb: + enabled: true + hyperdx: + initContainers: + asserts: + - isNotEmpty: + path: spec.template.spec.initContainers + - equal: + path: spec.template.spec.initContainers[0].name + value: wait-for-mongodb + - isEmpty: + path: spec.template.spec.initContainers[0].resources From 22093cd2b0cba5f3d3016de4cc76a35d575e17b3 Mon Sep 17 00:00:00 2001 From: Jaspreet Sandhu Date: Mon, 6 Oct 2025 18:56:18 -0700 Subject: [PATCH 4/4] Update initContainer key name --- charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml index 938ae6a..dfea09c 100644 --- a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml +++ b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml @@ -276,7 +276,7 @@ tests: mongodb: enabled: true hyperdx: - initContainers: + initContainer: resources: limits: cpu: 1 @@ -308,7 +308,7 @@ tests: mongodb: enabled: true hyperdx: - initContainers: + initContainer: asserts: - isNotEmpty: path: spec.template.spec.initContainers