Skip to content

Commit 8ced307

Browse files
authored
fix: pin clickhouse image tag (#5)
Instead of using head-alpine, this pins the clickhouse database container image to 24-alpine, which is what we've been using in the dev environments. Ref: HDX-1652
1 parent 57c2901 commit 8ced307

File tree

7 files changed

+16
-28
lines changed

7 files changed

+16
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
command: ['sh', '-c', 'until nc -z {{ include "hdx-oss.fullname" . }}-mongodb {{ .Values.mongodb.port }}; do echo waiting for mongodb; sleep 2; done;']
2424
containers:
2525
- name: app
26-
image: "{{ .Values.images.hdx.repository }}:{{ .Values.images.hdx.tag }}"
26+
image: "{{ .Values.hyperdx.image }}"
2727
ports:
2828
- name: app-port
2929
containerPort: {{ .Values.hyperdx.appPort }}
@@ -53,7 +53,7 @@ spec:
5353
name: app
5454
selector:
5555
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
56-
app: app
56+
app: app
5757
---
5858
apiVersion: networking.k8s.io/v1
5959
kind: Ingress

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- name: clickhouse
23-
image: "{{ .Values.images.clickhouse.repository }}:{{ .Values.images.clickhouse.tag }}"
23+
image: "{{ .Values.clickhouse.image }}"
2424
ports:
2525
- containerPort: {{ .Values.clickhouse.port }}
2626
- containerPort: {{ .Values.clickhouse.nativePort }}
@@ -66,7 +66,7 @@ spec:
6666
name: native
6767
selector:
6868
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
69-
app: clickhouse
69+
app: clickhouse
7070
---
7171
apiVersion: v1
7272
kind: ConfigMap

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.images.hdx.repository }}:{{ .Values.images.hdx.tag | default .Chart.AppVersion }}"
23+
image: "{{ .Values.hyperdx.image }}"
2424
command: ["node", "/app/api/build/tasks/index.js", "check-alerts"]
2525
envFrom:
2626
- configMapRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
spec:
2020
containers:
2121
- name: mongodb
22-
image: "{{ .Values.images.mongodb.repository }}:{{ .Values.images.mongodb.tag }}"
22+
image: "{{ .Values.mongodb.image }}"
2323
ports:
2424
- containerPort: {{ .Values.mongodb.port }}
2525
volumeMounts:
@@ -42,4 +42,4 @@ spec:
4242
targetPort: {{ .Values.mongodb.port }}
4343
selector:
4444
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
45-
app: mongodb
45+
app: mongodb

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
spec:
2121
containers:
2222
- name: otel-collector
23-
image: "{{ .Values.images.otelCollector.repository }}:{{ .Values.images.otelCollector.tag }}"
23+
image: "{{ .Values.otel.image }}"
2424
ports:
2525
- containerPort: {{ .Values.otel.port }}
2626
- containerPort: {{ .Values.otel.nativePort }}
@@ -62,5 +62,5 @@ spec:
6262
name: metrics
6363
selector:
6464
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
65-
app: otel-collector
65+
app: otel-collector
6666
{{- end }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
spec:
2020
containers:
2121
- name: redis
22-
image: "{{ .Values.images.redis.repository }}:{{ .Values.images.redis.tag }}"
22+
image: "{{ .Values.redis.image }}"
2323
ports:
2424
- containerPort: {{ .Values.redis.port }}
2525
volumeMounts:
@@ -42,4 +42,4 @@ spec:
4242
targetPort: {{ .Values.redis.port }}
4343
selector:
4444
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
45-
app: redis
45+
app: redis

charts/hdx-oss-v2/values.yaml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ global:
33
imagePullSecrets: []
44

55
hyperdx:
6+
image: "hyperdx/hyperdx:2-beta"
67
apiKey: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
78
apiPort: 8000
89
appPort: 3000
@@ -20,12 +21,15 @@ hyperdx:
2021
secretName: "hyperdx-tls"
2122

2223
mongodb:
24+
image: "mongo:5.0.14-focal"
2325
port: 27017
2426

2527
redis:
28+
image: "redis:7.0.11-alpine"
2629
port: 6379
2730

2831
clickhouse:
32+
image: "clickhouse/clickhouse-server:24-alpine"
2933
port: 8123
3034
nativePort: 9000
3135
enabled: true
@@ -39,30 +43,14 @@ clickhouse:
3943
otelUserPassword: "otelcollectorpass"
4044

4145
otel:
46+
image: "hyperdx/hyperdx-otel-collector:2-beta"
4247
port: 13133
4348
nativePort: 24225
4449
grpcPort: 4317
4550
httpPort: 4318
4651
healthPort: 8888
4752
enabled: true
4853

49-
images:
50-
hdx:
51-
repository: hyperdx/hyperdx
52-
tag: 2-beta
53-
redis:
54-
repository: redis
55-
tag: 7.0.11-alpine
56-
mongodb:
57-
repository: mongo
58-
tag: 5.0.14-focal
59-
otelCollector:
60-
repository: hyperdx/hyperdx-otel-collector
61-
tag: 2-beta
62-
clickhouse:
63-
repository: clickhouse/clickhouse-server
64-
tag: head-alpine
65-
6654
persistence:
6755
redis:
6856
enabled: true

0 commit comments

Comments
 (0)