Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion charts/clickstack/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ helm.sh/chart: {{ include "clickstack.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: clickstack
{{- end }}

{{/*
Expand All @@ -46,4 +47,4 @@ Selector labels
{{- define "clickstack.selectorLabels" -}}
app.kubernetes.io/name: {{ include "clickstack.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{- end }}
12 changes: 12 additions & 0 deletions charts/clickstack/templates/clickhouse-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
spec:
replicas: 1
Expand All @@ -18,6 +19,7 @@ spec:
metadata:
labels:
{{- include "clickstack.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
spec:
terminationGracePeriodSeconds: {{ .Values.clickhouse.terminationGracePeriodSeconds | default 90 }}
Expand Down Expand Up @@ -127,6 +129,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
{{- if .Values.clickhouse.service.annotations }}
annotations:
{{- with .Values.clickhouse.service.annotations }}
Expand Down Expand Up @@ -157,6 +161,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse-config
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
data:
config.xml: |-
{{- tpl (.Files.Get "data/config.xml") . | nindent 4 }}
Expand All @@ -168,6 +174,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse-users
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
data:
users.xml: |-
{{- tpl (.Files.Get "data/users.xml") . | nindent 4 }}
Expand All @@ -180,6 +188,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse-data
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
{{- if .Values.global.keepPVC }}
annotations:
"helm.sh/resource-policy": keep
Expand All @@ -200,6 +210,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse-logs
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
app: clickhouse
{{- if .Values.global.keepPVC }}
annotations:
"helm.sh/resource-policy": keep
Expand Down
1 change: 1 addition & 0 deletions charts/clickstack/templates/configmaps/app-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-app-config
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: workload
Copy link
Contributor

Choose a reason for hiding this comment

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

why not hyperdx for this one?

data:
APP_PORT: {{ .Values.hyperdx.appPort | quote }}
API_PORT: {{ .Values.hyperdx.apiPort | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ metadata:
name: {{ include "clickstack.fullname" . }}-otel-custom-config
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: opentelemetry
app: otel-collector
data:
custom.config.yaml: |
{{ .Values.otel.customConfig | indent 4 }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/clickstack/templates/cronjobs/task-checkAlerts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-check-alerts
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: workflow
spec:
schedule: {{ .Values.tasks.checkAlerts.schedule | quote }}
concurrencyPolicy: Forbid
Expand Down
6 changes: 4 additions & 2 deletions charts/clickstack/templates/hyperdx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ metadata:
name: {{ include "clickstack.fullname" . }}-app
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: hyperdx
app: {{ include "clickstack.fullname" . }}
{{- if .Values.hyperdx.labels }}
{{- with .Values.hyperdx.labels }}
{{- toYaml . | nindent 4 }}
{{- toYaml . | nindent 4 }}
{{- end -}}
{{- end }}
spec:
Expand All @@ -20,11 +21,12 @@ spec:
metadata:
labels:
{{- include "clickstack.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: hyperdx
app: {{ include "clickstack.fullname" . }}
annotations:
{{- if .Values.hyperdx.annotations }}
{{- with .Values.hyperdx.annotations }}
{{- toYaml . | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end -}}
{{- end }}
spec:
Expand Down
1 change: 1 addition & 0 deletions charts/clickstack/templates/hyperdx-pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-pdb
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: hyperdx
app: {{ include "clickstack.fullname" . }}
{{- if .Values.hyperdx.labels }}
{{- with .Values.hyperdx.labels }}
Expand Down
4 changes: 3 additions & 1 deletion charts/clickstack/templates/hyperdx-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-app
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: hyperdx
app: {{ include "clickstack.fullname" . }}
{{- if .Values.hyperdx.service.annotations }}
annotations:
{{- with .Values.hyperdx.service.annotations }}
Expand All @@ -21,4 +23,4 @@ spec:
name: opamp
selector:
{{- include "clickstack.selectorLabels" . | nindent 4 }}
app: {{ include "clickstack.fullname" . }}
app: {{ include "clickstack.fullname" . }}
2 changes: 2 additions & 0 deletions charts/clickstack/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-app-ingress
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: hyperdx
annotations:
{{ $reqAnnotations := dict }}
{{- if eq .Values.hyperdx.ingress.ingressClassName "nginx" }}
Expand Down Expand Up @@ -48,6 +49,7 @@ metadata:
name: {{ printf "%s-%s" (include "clickstack.fullname" $) .name }}
labels:
{{- include "clickstack.labels" $ | nindent 4 }}
app.kubernetes.io/component: hyperdx
{{- if .annotations }}
{{- if not (kindIs "map" .annotations) }}
{{- fail "annotations must be a map of string key-value pairs" }}
Expand Down
6 changes: 6 additions & 0 deletions charts/clickstack/templates/mongodb-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-mongodb
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: mongodb
app: mongodb
{{- if .Values.global.keepPVC }}
annotations:
"helm.sh/resource-policy": keep
Expand All @@ -27,6 +29,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-mongodb
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: mongodb
app: mongodb
spec:
replicas: 1
Expand All @@ -42,6 +45,7 @@ spec:
metadata:
labels:
{{- include "clickstack.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: mongodb
app: mongodb
spec:
{{- if .Values.mongodb.nodeSelector }}
Expand Down Expand Up @@ -97,6 +101,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-mongodb
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: mongodb
app: mongodb
spec:
ports:
- port: {{ .Values.mongodb.port }}
Expand Down
4 changes: 4 additions & 0 deletions charts/clickstack/templates/otel-collector-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-otel-collector
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: opentelemetry
app: otel-collector
spec:
replicas: {{ .Values.otel.replicas | default 1 }}
Expand All @@ -16,6 +17,7 @@ spec:
metadata:
labels:
{{- include "clickstack.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: opentelemetry
app: otel-collector
annotations:
{{- if .Values.otel.annotations }}
Expand Down Expand Up @@ -121,6 +123,8 @@ metadata:
name: {{ include "clickstack.fullname" . }}-otel-collector
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: opentelemetry
app: otel-collector
spec:
ports:
- port: {{ .Values.otel.port }}
Expand Down
4 changes: 3 additions & 1 deletion charts/clickstack/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: {{ include "clickstack.fullname" . }}-app-secrets
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: hyperdx
type: Opaque
data:
api-key: {{ .Values.hyperdx.apiKey | b64enc }}
Expand All @@ -15,8 +16,9 @@ metadata:
name: {{ include "clickstack.fullname" . }}-clickhouse-secrets
labels:
{{- include "clickstack.labels" . | nindent 4 }}
app.kubernetes.io/component: clickhouse
type: Opaque
data:
appUserPassword: {{ .Values.clickhouse.config.users.appUserPassword | toString | b64enc }}
otelUserPassword: {{ .Values.clickhouse.config.users.otelUserPassword | toString | b64enc }}
{{- end }}
{{- end }}