From a629b0f2c6b765f31bbb08c2047b708ff24dedef Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 31 May 2025 11:12:56 +0200 Subject: [PATCH 1/4] feat: refactoring Kubernetes labels Signed-off-by: Nicolas Lamirault --- charts/hdx-oss-v2/templates/_helpers.tpl | 31 ++++++++++++++++++- .../templates/clickhouse-deployment.yaml | 9 +++++- .../templates/configmaps/app-configmap.yaml | 1 + .../templates/cronjobs/task-checkAlerts.yaml | 3 +- .../templates/hyperdx-deployment.yaml | 8 +++-- .../hdx-oss-v2/templates/hyperdx-service.yaml | 3 +- charts/hdx-oss-v2/templates/ingress.yaml | 3 +- .../templates/mongodb-deployment.yaml | 5 ++- .../templates/otel-collector-deployment.yaml | 5 ++- charts/hdx-oss-v2/templates/secrets.yaml | 4 ++- 10 files changed, 61 insertions(+), 11 deletions(-) diff --git a/charts/hdx-oss-v2/templates/_helpers.tpl b/charts/hdx-oss-v2/templates/_helpers.tpl index b9edfe1..743378a 100644 --- a/charts/hdx-oss-v2/templates/_helpers.tpl +++ b/charts/hdx-oss-v2/templates/_helpers.tpl @@ -38,6 +38,7 @@ helm.sh/chart: {{ include "hdx-oss.chart" . }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/part-of: hyperdx {{- end }} {{/* @@ -46,4 +47,32 @@ Selector labels {{- define "hdx-oss.selectorLabels" -}} app.kubernetes.io/name: {{ include "hdx-oss.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} \ No newline at end of file +{{- end }} + +{{/* +Hyperdx component +*/}} +{{- define "hdx-oss.hyperdx.labels" -}} +app.kubernetes.io/component: hyperdx +{{- end }} + +{{/* +Hyperdx component +*/}} +{{- define "hdx-oss.clickhouse.labels" -}} +app.kubernetes.io/component: clickhouse +{{- end }} + +{{/* +MongoDB component +*/}} +{{- define "hdx-oss.mongodb.labels" -}} +app.kubernetes.io/component: mongo +{{- end }} + +{{/* +OpenTelemetry Collector component +*/}} +{{- define "hdx-oss.otel.labels" -}} +app.kubernetes.io/component: opentelemetry +{{- end }} diff --git a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml index c7329b5..f11f109 100644 --- a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml +++ b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml @@ -5,6 +5,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} app: clickhouse spec: replicas: 1 @@ -16,6 +17,7 @@ spec: metadata: labels: {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 8 }} app: clickhouse spec: containers: @@ -56,6 +58,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} spec: ports: - port: {{ .Values.clickhouse.port }} @@ -79,6 +82,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse-config labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} data: config.xml: |- {{- tpl (.Files.Get "data/config.xml") . | nindent 4 }} @@ -90,6 +94,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse-users labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} data: users.xml: |- {{- tpl (.Files.Get "data/users.xml") . | nindent 4 }} @@ -102,6 +107,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse-data labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} spec: accessModes: - ReadWriteOnce @@ -118,6 +124,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse-logs labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.clickhouse.labels" . | nindent 4 }} spec: accessModes: - ReadWriteOnce @@ -128,4 +135,4 @@ spec: requests: storage: {{ .Values.clickhouse.persistence.logSize }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml index 0e85f06..948c7e4 100644 --- a/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml +++ b/charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml @@ -4,6 +4,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-app-config labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} data: APP_PORT: {{ .Values.hyperdx.appPort | quote }} API_PORT: {{ .Values.hyperdx.apiPort | quote }} diff --git a/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml b/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml index b315012..9fc12d8 100644 --- a/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml +++ b/charts/hdx-oss-v2/templates/cronjobs/task-checkAlerts.yaml @@ -6,6 +6,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-check-alerts labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} spec: schedule: {{ .Values.tasks.checkAlerts.schedule | quote }} concurrencyPolicy: Forbid @@ -32,4 +33,4 @@ spec: value: "hdx-oss-task-check-alerts" resources: {{- toYaml .Values.tasks.checkAlerts.resources | nindent 16 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 45a2d50..453ddeb 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -4,10 +4,11 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-app labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} app: {{ include "hdx-oss.fullname" . }} {{- if .Values.hyperdx.labels }} {{- with .Values.hyperdx.labels }} - {{- toYaml . | nindent 4 }} + {{- toYaml . | nindent 4 }} {{- end -}} {{- end }} spec: @@ -20,11 +21,12 @@ spec: metadata: labels: {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 8 }} app: {{ include "hdx-oss.fullname" . }} annotations: {{- if .Values.hyperdx.annotations }} {{- with .Values.hyperdx.annotations }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 8 }} {{- end -}} {{- end }} spec: @@ -61,4 +63,4 @@ spec: {{- end }} {{- with .Values.hyperdx.env }} {{- toYaml . | nindent 12 }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/hdx-oss-v2/templates/hyperdx-service.yaml b/charts/hdx-oss-v2/templates/hyperdx-service.yaml index f02a5af..89099ed 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-service.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-service.yaml @@ -4,6 +4,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-app labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} spec: type: LoadBalancer ports: @@ -15,4 +16,4 @@ spec: name: opamp selector: {{- include "hdx-oss.selectorLabels" . | nindent 4 }} - app: {{ include "hdx-oss.fullname" . }} \ No newline at end of file + app: {{ include "hdx-oss.fullname" . }} diff --git a/charts/hdx-oss-v2/templates/ingress.yaml b/charts/hdx-oss-v2/templates/ingress.yaml index f05c2fa..1733d04 100644 --- a/charts/hdx-oss-v2/templates/ingress.yaml +++ b/charts/hdx-oss-v2/templates/ingress.yaml @@ -5,6 +5,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-app-ingress labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} annotations: nginx.ingress.kubernetes.io/rewrite-target: /$1 nginx.ingress.kubernetes.io/use-regex: "true" @@ -35,4 +36,4 @@ spec: name: {{ include "hdx-oss.fullname" . }}-app port: number: {{ .Values.hyperdx.appPort }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml index 91ea4fd..d3f76f3 100644 --- a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml +++ b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml @@ -4,6 +4,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-mongodb labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.mongodb.labels" . | nindent 4 }} app: mongodb spec: replicas: 1 @@ -15,6 +16,7 @@ spec: metadata: labels: {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.mongodb.labels" . | nindent 8 }} app: mongodb spec: containers: @@ -36,10 +38,11 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-mongodb labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.mongodb.labels" . | nindent 4 }} spec: ports: - port: {{ .Values.mongodb.port }} targetPort: {{ .Values.mongodb.port }} selector: {{- include "hdx-oss.selectorLabels" . | nindent 4 }} - app: mongodb \ No newline at end of file + app: mongodb diff --git a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml index 9a8c8b6..476f537 100644 --- a/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml +++ b/charts/hdx-oss-v2/templates/otel-collector-deployment.yaml @@ -5,6 +5,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-otel-collector labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.otel.labels" . | nindent 4 }} app: otel-collector spec: replicas: 1 @@ -16,6 +17,7 @@ spec: metadata: labels: {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.otel.labels" . | nindent 8 }} app: otel-collector spec: containers: @@ -58,6 +60,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-otel-collector labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.otel.labels" . | nindent 4 }} spec: ports: - port: {{ .Values.otel.port }} @@ -78,4 +81,4 @@ spec: selector: {{- include "hdx-oss.selectorLabels" . | nindent 4 }} app: otel-collector -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/hdx-oss-v2/templates/secrets.yaml b/charts/hdx-oss-v2/templates/secrets.yaml index f2828b4..fe4ed3a 100644 --- a/charts/hdx-oss-v2/templates/secrets.yaml +++ b/charts/hdx-oss-v2/templates/secrets.yaml @@ -4,6 +4,7 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-app-secrets labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} type: Opaque data: api-key: {{ .Values.hyperdx.apiKey | b64enc }} @@ -15,8 +16,9 @@ metadata: name: {{ include "hdx-oss.fullname" . }}-clickhouse-secrets labels: {{- include "hdx-oss.labels" . | nindent 4 }} + {{- include "hdx-oss.hyperdx.labels" . | nindent 4 }} type: Opaque data: appUserPassword: {{ .Values.clickhouse.config.users.appUserPassword | toString | b64enc }} otelUserPassword: {{ .Values.clickhouse.config.users.otelUserPassword | toString | b64enc }} -{{- end }} \ No newline at end of file +{{- end }} From a5eae532280f55af3c1ad1201fe0a32753b1c647 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 31 May 2025 11:16:24 +0200 Subject: [PATCH 2/4] feat: additional labels Signed-off-by: Nicolas Lamirault --- charts/hdx-oss-v2/templates/_helpers.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/hdx-oss-v2/templates/_helpers.tpl b/charts/hdx-oss-v2/templates/_helpers.tpl index 743378a..c299aa7 100644 --- a/charts/hdx-oss-v2/templates/_helpers.tpl +++ b/charts/hdx-oss-v2/templates/_helpers.tpl @@ -39,6 +39,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: hyperdx +{{- if .Values.global.additionalLabels}} +{{ toYaml .Values.global.additionalLabels }} +{{- end }} {{- end }} {{/* From 0b4f0a510fbbe978939bd2031340cf6cff155b6b Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 31 May 2025 11:17:03 +0200 Subject: [PATCH 3/4] feat: additional labels Signed-off-by: Nicolas Lamirault --- charts/hdx-oss-v2/templates/clickhouse-deployment.yaml | 2 +- charts/hdx-oss-v2/templates/hyperdx-deployment.yaml | 2 +- charts/hdx-oss-v2/templates/mongodb-deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml index f11f109..835fe6a 100644 --- a/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml +++ b/charts/hdx-oss-v2/templates/clickhouse-deployment.yaml @@ -16,7 +16,7 @@ spec: template: metadata: labels: - {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.labels" . | nindent 8 }} {{- include "hdx-oss.clickhouse.labels" . | nindent 8 }} app: clickhouse spec: diff --git a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml index 453ddeb..3094d72 100644 --- a/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml +++ b/charts/hdx-oss-v2/templates/hyperdx-deployment.yaml @@ -20,7 +20,7 @@ spec: template: metadata: labels: - {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.labels" . | nindent 8 }} {{- include "hdx-oss.hyperdx.labels" . | nindent 8 }} app: {{ include "hdx-oss.fullname" . }} annotations: diff --git a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml index d3f76f3..a988067 100644 --- a/charts/hdx-oss-v2/templates/mongodb-deployment.yaml +++ b/charts/hdx-oss-v2/templates/mongodb-deployment.yaml @@ -15,7 +15,7 @@ spec: template: metadata: labels: - {{- include "hdx-oss.selectorLabels" . | nindent 8 }} + {{- include "hdx-oss.labels" . | nindent 8 }} {{- include "hdx-oss.mongodb.labels" . | nindent 8 }} app: mongodb spec: From a08fda218328160956b4ff4c1f0ee70ed8d8b526 Mon Sep 17 00:00:00 2001 From: Nicolas Lamirault Date: Sat, 31 May 2025 11:18:16 +0200 Subject: [PATCH 4/4] fix: typo Signed-off-by: Nicolas Lamirault --- charts/hdx-oss-v2/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hdx-oss-v2/templates/_helpers.tpl b/charts/hdx-oss-v2/templates/_helpers.tpl index c299aa7..2d82a6d 100644 --- a/charts/hdx-oss-v2/templates/_helpers.tpl +++ b/charts/hdx-oss-v2/templates/_helpers.tpl @@ -60,7 +60,7 @@ app.kubernetes.io/component: hyperdx {{- end }} {{/* -Hyperdx component +clickHouse component */}} {{- define "hdx-oss.clickhouse.labels" -}} app.kubernetes.io/component: clickhouse