Skip to content

Refactoring Kubernetes labels #24

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Refactoring Kubernetes labels #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a629b0f
feat: refactoring Kubernetes labels
nlamirault May 31, 2025
a5eae53
feat: additional labels
nlamirault May 31, 2025
0b4f0a5
feat: additional labels
nlamirault May 31, 2025
a08fda2
fix: typo
nlamirault May 31, 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
34 changes: 33 additions & 1 deletion charts/hdx-oss-v2/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ 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
{{- if .Values.global.additionalLabels}}
{{ toYaml .Values.global.additionalLabels }}
{{- end }}
{{- end }}

{{/*
Expand All @@ -46,4 +50,32 @@ Selector labels
{{- define "hdx-oss.selectorLabels" -}}
app.kubernetes.io/name: {{ include "hdx-oss.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{- end }}

{{/*
Hyperdx component
*/}}
{{- define "hdx-oss.hyperdx.labels" -}}
app.kubernetes.io/component: hyperdx
{{- end }}

{{/*
clickHouse 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 }}
11 changes: 9 additions & 2 deletions charts/hdx-oss-v2/templates/clickhouse-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -15,7 +16,8 @@ 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:
containers:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -128,4 +135,4 @@ spec:
requests:
storage: {{ .Values.clickhouse.persistence.logSize }}
{{- end }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/hdx-oss-v2/templates/configmaps/app-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -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
Expand All @@ -32,4 +33,4 @@ spec:
value: "hdx-oss-task-check-alerts"
resources:
{{- toYaml .Values.tasks.checkAlerts.resources | nindent 16 }}
{{- end }}
{{- end }}
10 changes: 6 additions & 4 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 @@ -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:
Expand All @@ -19,12 +20,13 @@ 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:
{{- if .Values.hyperdx.annotations }}
{{- with .Values.hyperdx.annotations }}
{{- toYaml . | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end -}}
{{- end }}
spec:
Expand Down Expand Up @@ -61,4 +63,4 @@ spec:
{{- end }}
{{- with .Values.hyperdx.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
3 changes: 2 additions & 1 deletion charts/hdx-oss-v2/templates/hyperdx-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -15,4 +16,4 @@ spec:
name: opamp
selector:
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
app: {{ include "hdx-oss.fullname" . }}
app: {{ include "hdx-oss.fullname" . }}
3 changes: 2 additions & 1 deletion charts/hdx-oss-v2/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -35,4 +36,4 @@ spec:
name: {{ include "hdx-oss.fullname" . }}-app
port:
number: {{ .Values.hyperdx.appPort }}
{{- end }}
{{- end }}
7 changes: 5 additions & 2 deletions charts/hdx-oss-v2/templates/mongodb-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,7 +15,8 @@ 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:
containers:
Expand All @@ -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
app: mongodb
5 changes: 4 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 @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -78,4 +81,4 @@ spec:
selector:
{{- include "hdx-oss.selectorLabels" . | nindent 4 }}
app: otel-collector
{{- end }}
{{- end }}
4 changes: 3 additions & 1 deletion charts/hdx-oss-v2/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
{{- end }}
Loading