Skip to content

Commit 6a1993d

Browse files
wrn14897wrn14897
committed
fix: tests
1 parent a88feb1 commit 6a1993d

10 files changed

+73
-25
lines changed

‎charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
restartPolicy: OnFailure
2121
containers:
2222
- name: task
23-
image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.appVersion }}"
23+
image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.AppVersion }}"
2424
imagePullPolicy: {{ .Values.hyperdx.image.pullPolicy }}
2525
command: ["node", "/app/api/build/tasks/index.js", "check-alerts"]
2626
envFrom:

‎charts/hdx-oss-v2/templates/hyperdx-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
{{- end }}
3737
containers:
3838
- name: app
39-
image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.appVersion }}"
39+
image: "{{ .Values.hyperdx.image.repository }}:{{ .Values.hyperdx.image.tag | default .Chart.AppVersion }}"
4040
imagePullPolicy: {{ .Values.hyperdx.image.pullPolicy }}
4141
ports:
4242
- name: app-port

‎charts/hdx-oss-v2/templates/otel-collector-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- name: otel-collector
23-
image: "{{ .Values.otel.image.repository }}:{{ .Values.otel.image.tag | default .Chart.appVersion }}"
23+
image: "{{ .Values.otel.image.repository }}:{{ .Values.otel.image.tag | default .Chart.AppVersion }}"
2424
imagePullPolicy: {{ .Values.otel.image.pullPolicy }}
2525
ports:
2626
- containerPort: {{ .Values.otel.port }}

‎charts/hdx-oss-v2/tests/app-deployment_test.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ tests:
55
- it: should render the app deployment correctly
66
set:
77
hyperdx:
8-
image: hyperdx/hyperdx:2-beta
8+
image:
9+
repository: hyperdx/hyperdx
10+
tag: 2-beta
911
apiKey: test-api-key
1012
appPort: 3000
1113
apiPort: 8000
@@ -38,7 +40,9 @@ tests:
3840
- it: should scale replicas when specified
3941
set:
4042
hyperdx:
41-
image: hyperdx/hyperdx:2-beta
43+
image:
44+
repository: hyperdx/hyperdx
45+
tag: 2-beta
4246
replicas: 3
4347
asserts:
4448
- equal:

‎charts/hdx-oss-v2/tests/default-env-vars_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ tests:
117117
hyperdx:
118118
env:
119119
- name: DEFAULT_SOURCES
120-
value: |
120+
value: |-
121121
[
122122
{
123123
"name": "HyperDX Logs",
@@ -134,7 +134,7 @@ tests:
134134
path: spec.template.spec.containers[0].env
135135
content:
136136
name: DEFAULT_SOURCES
137-
value: |
137+
value: |-
138138
[
139139
{
140140
"name": "HyperDX Logs",

‎charts/hdx-oss-v2/tests/helpers_test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ tests:
4747
- isSubset:
4848
path: metadata.labels
4949
content:
50-
app.kubernetes.io/version: "1.0.0"
50+
app.kubernetes.io/version: "2.0.0"

‎charts/hdx-oss-v2/tests/hyperdx-deployment_test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tests:
1111
value: 1
1212
- equal:
1313
path: spec.template.spec.containers[0].image
14-
value: hyperdx/hyperdx:2-beta
14+
value: docker.hyperdx.io/hyperdx/hyperdx:2.0.0
1515
- equal:
1616
path: spec.template.spec.containers[0].ports[0].containerPort
1717
value: 3000
@@ -106,4 +106,4 @@ tests:
106106
asserts:
107107
- equal:
108108
path: spec.template.spec.containers[0].ports[2].containerPort
109-
value: 5320
109+
value: 5320

‎charts/hdx-oss-v2/tests/otel-collector_test.yaml‎

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ tests:
55
- it: should render both deployment and service when enabled
66
set:
77
otel:
8-
image: hyperdx/hyperdx-otel-collector:2-beta
8+
image:
9+
repository: hyperdx/hyperdx-otel-collector
10+
tag: 2-beta
911
port: 13133
1012
nativePort: 24225
1113
grpcPort: 4317
@@ -34,8 +36,13 @@ tests:
3436
set:
3537
otel:
3638
enabled: true
37-
image: hyperdx/hyperdx-otel-collector:2-beta
39+
image:
40+
repository: hyperdx/hyperdx-otel-collector
41+
tag: 2-beta
3842
hyperdx:
43+
image:
44+
repository: hyperdx/hyperdx
45+
tag: 2-beta
3946
logLevel: info
4047
clickhouse:
4148
nativePort: 9000
@@ -99,9 +106,14 @@ tests:
99106
set:
100107
otel:
101108
enabled: true
102-
image: hyperdx/hyperdx-otel-collector:2-beta
109+
image:
110+
repository: hyperdx/hyperdx-otel-collector
111+
tag: 2-beta
103112
clickhouseEndpoint: "tcp://custom-clickhouse:9000"
104113
hyperdx:
114+
image:
115+
repository: hyperdx/hyperdx
116+
tag: 2-beta
105117
logLevel: debug
106118
clickhouse:
107119
prometheus:
@@ -234,9 +246,14 @@ tests:
234246
set:
235247
otel:
236248
enabled: true
237-
image: hyperdx/hyperdx-otel-collector:2-beta
249+
image:
250+
repository: hyperdx/hyperdx-otel-collector
251+
tag: 2-beta
238252
clickhousePrometheusEndpoint: "external-clickhouse:8080/custom-metrics"
239253
hyperdx:
254+
image:
255+
repository: hyperdx/hyperdx
256+
tag: 2-beta
240257
logLevel: info
241258
clickhouse:
242259
prometheus:
@@ -263,8 +280,13 @@ tests:
263280
set:
264281
otel:
265282
enabled: true
266-
image: hyperdx/hyperdx-otel-collector:2-beta
283+
image:
284+
repository: hyperdx/hyperdx-otel-collector
285+
tag: 2-beta
267286
hyperdx:
287+
image:
288+
repository: hyperdx/hyperdx
289+
tag: 2-beta
268290
logLevel: info
269291
clickhouse:
270292
prometheus:
@@ -288,9 +310,14 @@ tests:
288310
set:
289311
otel:
290312
enabled: true
291-
image: hyperdx/hyperdx-otel-collector:2-beta
313+
image:
314+
repository: hyperdx/hyperdx-otel-collector
315+
tag: 2-beta
292316
opampServerUrl: "https://custom-opamp-server:8080"
293317
hyperdx:
318+
image:
319+
repository: hyperdx/hyperdx
320+
tag: 2-beta
294321
logLevel: info
295322
clickhouse:
296323
config:
@@ -313,8 +340,13 @@ tests:
313340
set:
314341
otel:
315342
enabled: true
316-
image: hyperdx/hyperdx-otel-collector:2-beta
343+
image:
344+
repository: hyperdx/hyperdx-otel-collector
345+
tag: 2-beta
317346
hyperdx:
347+
image:
348+
repository: hyperdx/hyperdx
349+
tag: 2-beta
318350
logLevel: info
319351
clickhouse:
320352
config:
@@ -337,9 +369,14 @@ tests:
337369
set:
338370
otel:
339371
enabled: true
340-
image: hyperdx/hyperdx-otel-collector:2-beta
372+
image:
373+
repository: hyperdx/hyperdx-otel-collector
374+
tag: 2-beta
341375
clickhouseDatabase: "custom_db"
342376
hyperdx:
377+
image:
378+
repository: hyperdx/hyperdx
379+
tag: 2-beta
343380
logLevel: info
344381
clickhouse:
345382
config:
@@ -362,10 +399,15 @@ tests:
362399
set:
363400
otel:
364401
enabled: true
365-
image: hyperdx/hyperdx-otel-collector:2-beta
402+
image:
403+
repository: hyperdx/hyperdx-otel-collector
404+
tag: 2-beta
366405
clickhouseUser: "custom-user"
367406
clickhousePassword: "custom-password"
368407
hyperdx:
408+
image:
409+
repository: hyperdx/hyperdx
410+
tag: 2-beta
369411
logLevel: info
370412
clickhouse:
371413
config:
@@ -388,4 +430,4 @@ tests:
388430
path: spec.template.spec.containers[0].env
389431
content:
390432
name: CLICKHOUSE_PASSWORD
391-
value: "custom-password"
433+
value: "custom-password"

‎charts/hdx-oss-v2/tests/secrets_test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ tests:
7373
app.kubernetes.io/instance: RELEASE-NAME
7474
app.kubernetes.io/managed-by: Helm
7575
app.kubernetes.io/name: hdx-oss-v2
76-
app.kubernetes.io/version: 1.0.0
76+
app.kubernetes.io/version: 2.0.0
7777
documentIndex: 0
7878
- isSubset:
7979
path: metadata.labels
8080
content:
8181
app.kubernetes.io/instance: RELEASE-NAME
8282
app.kubernetes.io/managed-by: Helm
8383
app.kubernetes.io/name: hdx-oss-v2
84-
app.kubernetes.io/version: 1.0.0
84+
app.kubernetes.io/version: 2.0.0
8585
documentIndex: 1
8686
# Validate chart version format without exact match
8787
- matchRegex:
@@ -99,4 +99,4 @@ tests:
9999
enabled: false
100100
asserts:
101101
- hasDocuments:
102-
count: 1
102+
count: 1

‎charts/hdx-oss-v2/tests/task-checkAlerts_test.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ tests:
2424
cpu: 150m
2525
memory: 150Mi
2626
hyperdx:
27-
image: hyperdx/hyperdx:2-beta
27+
image:
28+
repository: hyperdx/hyperdx
29+
tag: 2-beta
2830
asserts:
2931
- isKind:
3032
of: CronJob
@@ -69,4 +71,4 @@ tests:
6971
asserts:
7072
- equal:
7173
path: spec.schedule
72-
value: "*/1 * * * *"
74+
value: "*/1 * * * *"

0 commit comments

Comments
 (0)