Skip to content

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

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
kodiakhq merged 9 commits into from
Jun 11, 2025
Merged

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

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc5b037
feat: refactor image value + bump default tag to 2.0.0
wrn14897 Jun 5, 2025
a88feb1
docs: add changeset
wrn14897 Jun 5, 2025
6a1993d
fix: tests
wrn14897 Jun 5, 2025
b4963ec
ci: test version format instead (no need to update tests everytime)
wrn14897 Jun 5, 2025
1c6a405
chore: bump to 2.0.1
wrn14897 Jun 9, 2025
97488aa
Merge branch 'main' into warren/bump-images-tag
wrn14897 Jun 10, 2025
7607641
Merge branch 'main' into warren/bump-images-tag
wrn14897 Jun 10, 2025
14ad656
Merge branch 'main' into warren/bump-images-tag
kodiakhq[bot] Jun 11, 2025
93dc58e
Convert snapshot test to assertions
teeohhem Jun 11, 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/nasty-teeth-camp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"helm-charts": minor
---

feat: refactor image value + bump default tag to 2.0.0
2 changes: 1 addition & 1 deletion charts/hdx-oss-v2/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -32,4 +33,4 @@ spec:
value: "hdx-oss-task-check-alerts"
resources:
{{- toYaml .Values.tasks.checkAlerts.resources | nindent 16 }}
{{- end }}
{{- end }}
5 changes: 3 additions & 2 deletions charts/hdx-oss-v2/templates/hyperdx-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -63,4 +64,4 @@ spec:
{{- end }}
{{- with .Values.hyperdx.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
3 changes: 2 additions & 1 deletion charts/hdx-oss-v2/templates/otel-collector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 6 additions & 2 deletions charts/hdx-oss-v2/tests/app-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/hdx-oss-v2/tests/default-env-vars_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ tests:
hyperdx:
env:
- name: DEFAULT_SOURCES
value: |
value: |-
[
{
"name": "HyperDX Logs",
Expand All @@ -134,7 +134,7 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: DEFAULT_SOURCES
value: |
value: |-
[
{
"name": "HyperDX Logs",
Expand Down
7 changes: 3 additions & 4 deletions charts/hdx-oss-v2/tests/helpers_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+$
6 changes: 3 additions & 3 deletions charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -106,4 +106,4 @@ tests:
asserts:
- equal:
path: spec.template.spec.containers[0].ports[2].containerPort
value: 5320
value: 5320
62 changes: 52 additions & 10 deletions charts/hdx-oss-v2/tests/otel-collector_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ tests:
- it: should render both deployment and service when enabled
set:
otel:
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
port: 13133
nativePort: 24225
grpcPort: 4317
Expand Down Expand Up @@ -34,8 +36,13 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
nativePort: 9000
Expand Down Expand Up @@ -99,9 +106,14 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
clickhouseEndpoint: "tcp://custom-clickhouse:9000"
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: debug
clickhouse:
prometheus:
Expand Down Expand Up @@ -234,9 +246,14 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
clickhousePrometheusEndpoint: "external-clickhouse:8080/custom-metrics"
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
prometheus:
Expand All @@ -263,8 +280,13 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
prometheus:
Expand All @@ -288,9 +310,14 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
opampServerUrl: "https://custom-opamp-server:8080"
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
config:
Expand All @@ -313,8 +340,13 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
config:
Expand All @@ -337,9 +369,14 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
clickhouseDatabase: "custom_db"
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
config:
Expand All @@ -362,10 +399,15 @@ tests:
set:
otel:
enabled: true
image: hyperdx/hyperdx-otel-collector:2-beta
image:
repository: hyperdx/hyperdx-otel-collector
tag: 2-beta
clickhouseUser: "custom-user"
clickhousePassword: "custom-password"
hyperdx:
image:
repository: hyperdx/hyperdx
tag: 2-beta
logLevel: info
clickhouse:
config:
Expand All @@ -388,4 +430,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: CLICKHOUSE_PASSWORD
value: "custom-password"
value: "custom-password"
12 changes: 9 additions & 3 deletions charts/hdx-oss-v2/tests/secrets_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,21 @@ tests:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: hdx-oss-v2
app.kubernetes.io/version: 1.0.0
documentIndex: 0
- matchRegex:
path: metadata.labels["app.kubernetes.io/version"]
pattern: ^\d+\.\d+\.\d+$
documentIndex: 0
- isSubset:
path: metadata.labels
content:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: hdx-oss-v2
app.kubernetes.io/version: 1.0.0
documentIndex: 1
- matchRegex:
path: metadata.labels["app.kubernetes.io/version"]
pattern: ^\d+\.\d+\.\d+$
documentIndex: 1
# Validate chart version format without exact match
- matchRegex:
Expand All @@ -99,4 +105,4 @@ tests:
enabled: false
asserts:
- hasDocuments:
count: 1
count: 1
6 changes: 4 additions & 2 deletions charts/hdx-oss-v2/tests/task-checkAlerts_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ tests:
cpu: 150m
memory: 150Mi
hyperdx:
image: hyperdx/hyperdx:2-beta
image:
repository: hyperdx/hyperdx
tag: 2-beta
asserts:
- isKind:
of: CronJob
Expand Down Expand Up @@ -69,4 +71,4 @@ tests:
asserts:
- equal:
path: spec.schedule
value: "*/1 * * * *"
value: "*/1 * * * *"
10 changes: 8 additions & 2 deletions charts/hdx-oss-v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ global:
storageClassName: "local-path"

hyperdx:
image: "hyperdx/hyperdx:2-beta"
image:
repository: docker.hyperdx.io/hyperdx/hyperdx
tag:
pullPolicy: IfNotPresent
apiKey: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
apiPort: 8000
appPort: 3000
Expand Down Expand Up @@ -207,7 +210,10 @@ clickhouse:
- "192.168.0.0/16" # OrbStack, Minikube, and local development

otel:
image: "hyperdx/hyperdx-otel-collector:2-beta"
image:
repository: docker.hyperdx.io/hyperdx/hyperdx-otel-collector
tag:
Copy link
Contributor

@teeohhem teeohhem Jun 9, 2025

Choose a reason for hiding this comment

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

We probably want to assign a default tag, yeah? latest?

Copy link
Collaborator Author

@wrn14897 wrn14897 Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

the default is appVersion. pinning the version for now since we want to make sure all int + e2e tests pass

pullPolicy: IfNotPresent
port: 13133
nativePort: 24225
grpcPort: 4317
Expand Down
Loading