feat: refactor image value + bump default tag to 2.0.1 (#37)

wrn14897 · teeohhem · web-flow · commit 1541c5ff9179 · 2025-06-11T14:27:54.000Z
Ref: HDX-1839

Co-authored-by: Tom Alexander &lt;3245235+teeohhem@users.noreply.github.com&gt;
diff --git a/.changeset/nasty-teeth-camp.md b/.changeset/nasty-teeth-camp.md
@@ -0,0 +1,5 @@
+---
+"helm-charts": minor
+---
+
+feat: refactor image value + bump default tag to 2.0.0
diff --git a/charts/hdx-oss-v2/Chart.yaml b/charts/hdx-oss-v2/Chart.yaml
@@ -3,4 +3,4 @@ name: hdx-oss-v2
 description: A Helm chart for HyperDX OSS V2
 type: application
 version: 0.5.2
-appVersion: 1.0.0
+appVersion: 2.0.1
diff --git a/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml b/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml
@@ -20,7 +20,8 @@ spec:
           restartPolicy: OnFailure
           containers:
             - name: task
-              image: "{{ .Values.hyperdx.image }}"
+              image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.AppVersion }}"
+              imagePullPolicy: {{ .Values.hyperdx.image.pullPolicy }}
               command: ["node", "/app/api/build/tasks/index.js", "check-alerts"]
               envFrom:
                 - configMapRef:
@@ -32,4 +33,4 @@ spec:
                   value: "hdx-oss-task-check-alerts"
               resources:
                 {{- toYaml .Values.tasks.checkAlerts.resources | nindent 16 }}
-{{- end }}
+{{- end }}
diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml
@@ -36,7 +36,8 @@ spec:
       {{- end }}
       containers:
         - name: app
-          image: "{{ .Values.hyperdx.image }}"
+          image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.hyperdx.image.pullPolicy }}
           ports:
             - name: app-port
               containerPort: {{ .Values.hyperdx.appPort }}
@@ -63,4 +64,4 @@ spec:
             {{- end }}
             {{- with .Values.hyperdx.env }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
+            {{- end }}
diff --git a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
@@ -20,7 +20,8 @@ spec:
     spec:
       containers:
         - name: otel-collector
-          image: "{{ .Values.otel.image }}"
+          image: "{{ .Values.otel.image.repository }}:{{ .Values.otel.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.otel.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.otel.port }}
             - containerPort: {{ .Values.otel.nativePort }}
diff --git a/charts/hdx-oss-v2/tests/__snapshot__/ingress_test.yaml.snap b/charts/hdx-oss-v2/tests/__snapshot__/ingress_test.yaml.snap
diff --git a/charts/hdx-oss-v2/tests/app-deployment_test.yaml b/charts/hdx-oss-v2/tests/app-deployment_test.yaml
@@ -5,7 +5,9 @@ tests:
   - it: should render the app deployment correctly
     set:
       hyperdx:
-        image: hyperdx/hyperdx:2-beta
+        image:
+          repository: hyperdx/hyperdx
+          tag: 2-beta
         apiKey: test-api-key
         appPort: 3000
         apiPort: 8000
@@ -38,7 +40,9 @@ tests:
   - it: should scale replicas when specified
     set:
       hyperdx:
-        image: hyperdx/hyperdx:2-beta
+        image:
+          repository: hyperdx/hyperdx
+          tag: 2-beta
         replicas: 3
     asserts:
       - equal:
diff --git a/charts/hdx-oss-v2/tests/default-env-vars_test.yaml b/charts/hdx-oss-v2/tests/default-env-vars_test.yaml
@@ -117,7 +117,7 @@ tests:
       hyperdx:
         env:
           - name: DEFAULT_SOURCES
-            value: |
+            value: |-
               [
                 {
                   "name": "HyperDX Logs",
@@ -134,7 +134,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: DEFAULT_SOURCES
-            value: |
+            value: |-
               [
                 {
                   "name": "HyperDX Logs",
diff --git a/charts/hdx-oss-v2/tests/helpers_test.yaml b/charts/hdx-oss-v2/tests/helpers_test.yaml
@@ -44,7 +44,6 @@ tests:
           
   - it: should render chart version in labels when available
     asserts:
-      - isSubset:
-          path: metadata.labels
-          content:
-            app.kubernetes.io/version: "1.0.0"
+      - matchRegex:
+          path: metadata.labels["app.kubernetes.io/version"]
+          pattern: ^\d+\.\d+\.\d+$
diff --git a/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml b/charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml
@@ -9,9 +9,9 @@ tests:
       - equal:
           path: spec.replicas
           value: 1
-      - equal:
+      - matchRegex:
           path: spec.template.spec.containers[0].image
-          value: hyperdx/hyperdx:2-beta
+          pattern: ^docker\.hyperdx\.io/hyperdx/hyperdx:\d+\.\d+\.\d+$
       - equal:
           path: spec.template.spec.containers[0].ports[0].containerPort
           value: 3000
@@ -106,4 +106,4 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].ports[2].containerPort
-          value: 5320
+          value: 5320
diff --git a/charts/hdx-oss-v2/tests/ingress_test.yaml b/charts/hdx-oss-v2/tests/ingress_test.yaml
@@ -99,10 +99,63 @@ tests:
     asserts:
       - hasDocuments:
           count: 2
-      - matchSnapshot: {}
-        documentSelector:
+      # Test the main app ingress (document 0)
+      - isKind:
+          of: Ingress
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-hdx-oss-v2-app-ingress
+        documentIndex: 0
+      - equal:
+          path: spec.rules[0].host
+          value: hyperdx.example.com
+        documentIndex: 0
+      # Test the additional otel-collector ingress (document 1)
+      - isKind:
+          of: Ingress
+        documentIndex: 1
+      - equal:
           path: metadata.name
           value: RELEASE-NAME-hdx-oss-v2-otel-collector
+        documentIndex: 1
+      - equal:
+          path: metadata.annotations.testProperty
+          value: "true"
+        documentIndex: 1
+      - equal:
+          path: metadata.annotations.another
+          value: "yes"
+        documentIndex: 1
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].host
+          value: collector.example.com
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].pathType
+          value: Prefix
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.port.number
+          value: 4318
+        documentIndex: 1
+      # Validate version-agnostic labels exist
+      - matchRegex:
+          path: metadata.labels["helm.sh/chart"]
+          pattern: ^hdx-oss-v2-\d+\.\d+\.\d+$
+        documentIndex: 1
+      - matchRegex:
+          path: metadata.labels["app.kubernetes.io/version"]
+          pattern: ^\d+\.\d+\.\d+$
+        documentIndex: 1
 
   - it: should render additional ingress templates with TLS enabled
     set:
@@ -131,10 +184,72 @@ tests:
     asserts:
       - hasDocuments:
           count: 2
-      - matchSnapshot: {}
-        documentSelector:
+      # Test the main app ingress (document 0)
+      - isKind:
+          of: Ingress
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-hdx-oss-v2-app-ingress
+        documentIndex: 0
+      - equal:
+          path: spec.rules[0].host
+          value: hyperdx.example.com
+        documentIndex: 0
+      # Test the additional otel-collector ingress (document 1)
+      - isKind:
+          of: Ingress
+        documentIndex: 1
+      - equal:
           path: metadata.name
           value: RELEASE-NAME-hdx-oss-v2-otel-collector
+        documentIndex: 1
+      - equal:
+          path: metadata.annotations.testProperty
+          value: "true"
+        documentIndex: 1
+      - equal:
+          path: metadata.annotations.another
+          value: "yes"
+        documentIndex: 1
+      - equal:
+          path: spec.ingressClassName
+          value: nginx
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].host
+          value: collector.example.com
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].pathType
+          value: Prefix
+        documentIndex: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.port.number
+          value: 4318
+        documentIndex: 1
+      # Test TLS configuration
+      - equal:
+          path: spec.tls[0].secretName
+          value: otel-collector-tls
+        documentIndex: 1
+      - contains:
+          path: spec.tls[0].hosts
+          content: collector.example.com
+        documentIndex: 1
+      # Validate version-agnostic labels exist
+      - matchRegex:
+          path: metadata.labels["helm.sh/chart"]
+          pattern: ^hdx-oss-v2-\d+\.\d+\.\d+$
+        documentIndex: 1
+      - matchRegex:
+          path: metadata.labels["app.kubernetes.io/version"]
+          pattern: ^\d+\.\d+\.\d+$
+        documentIndex: 1
 
   - it: should fail when annotations of the additional ingresses is not a map of strings
     set:
diff --git a/charts/hdx-oss-v2/tests/otel-collector_test.yaml b/charts/hdx-oss-v2/tests/otel-collector_test.yaml
diff --git a/charts/hdx-oss-v2/tests/secrets_test.yaml b/charts/hdx-oss-v2/tests/secrets_test.yaml
diff --git a/charts/hdx-oss-v2/tests/task-checkAlerts_test.yaml b/charts/hdx-oss-v2/tests/task-checkAlerts_test.yaml
diff --git a/charts/hdx-oss-v2/values.yaml b/charts/hdx-oss-v2/values.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"helm-charts": minor
 +---
++
 +feat: refactor image value + bump default tag to 2.0.0
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ tests:`
`117`	`117`	`hyperdx:`
`118`	`118`	`env:`
`119`	`119`	`- name: DEFAULT_SOURCES`
`120`		`- value: \|`
	`120`	`+ value: \|-`
`121`	`121`	`[`
`122`	`122`	`{`
`123`	`123`	`"name": "HyperDX Logs",`
`@@ -134,7 +134,7 @@ tests:`
`134`	`134`	`path: spec.template.spec.containers[0].env`
`135`	`135`	`content:`
`136`	`136`	`name: DEFAULT_SOURCES`
`137`		`- value: \|`
	`137`	`+ value: \|-`
`138`	`138`	`[`
`139`	`139`	`{`
`140`	`140`	`"name": "HyperDX Logs",`