Skip to content
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

Jump to bottom

chore(clickhouse): support custom labels and pod labels #550

Merged
merged 2 commits into from
Nov 8, 2024
Merged

chore(clickhouse): support custom labels and pod labels #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b33ac78
chore(clickhouse): support custom labels and pod labels
prashant-shahi Nov 8, 2024
aa85ed4
chore(release): bump up clickhouse to 24.1.9
prashant-shahi Nov 8, 2024
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
2 changes: 1 addition & 1 deletion charts/clickhouse/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: clickhouse
description: A Helm chart for ClickHouse
type: application
version: 24.1.8
version: 24.1.9
appVersion: "24.1.2"
icon: https://github.com/ClickHouse/clickhouse-docs/raw/84f38d893eb7e561c7296279d7953b6a508ec413/static/img/clickhouse-logo.svg
sources:
Expand Down
6 changes: 6 additions & 0 deletions charts/clickhouse/templates/clickhouse-instance/clickhouse-instance.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
namespace: {{ include "clickhouse.namespace" . }}
labels:
{{- include "clickhouse.labels" . | nindent 4 }}
{{- if .Values.labels }}
{{- toYaml .Values.labels | nindent 4 }}
{{- end }}
prashant-shahi marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.annotations }}
annotations:
{{- toYaml .Values.annotations | nindent 4 }}
Expand Down Expand Up @@ -131,6 +134,9 @@ spec:
metadata:
labels:
{{- include "clickhouse.labels" . | nindent 12 }}
{{- if .Values.podLabels }}
{{- toYaml .Values.podLabels | nindent 12 }}
{{- end }}
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 12 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/clickhouse/templates/clickhouse-operator/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
namespace: {{ include "clickhouse.namespace" . }}
labels:
{{- include "clickhouseOperator.labels" . | nindent 4 }}
{{- if .Values.clickhouseOperator.labels }}
{{- toYaml .Values.clickhouseOperator.labels | nindent 4 }}
{{- end }}
{{- if .Values.clickhouseOperator.annotations }}
annotations:
{{- toYaml .Values.clickhouseOperator.annotations | nindent 4 }}
Expand All @@ -27,6 +30,9 @@ spec:
checksum/usersd-files: {{ include (print $.Template.BasePath "/clickhouse-operator/configmaps/etc-usersd-files.yaml") . | sha256sum }}
labels:
{{- include "clickhouseOperator.selectorLabels" . | nindent 8 }}
{{- if .Values.clickhouseOperator.podLabels }}
{{- toYaml .Values.clickhouseOperator.podLabels | nindent 8 }}
{{- end }}
spec:
{{- include "clickhouseOperator.imagePullSecrets" . | indent 6 }}
serviceAccountName: {{ include "clickhouseOperator.serviceAccountName" . }}
Expand Down
10 changes: 8 additions & 2 deletions charts/clickhouse/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ image:
# If global.imagePullSecrets is set as well, it will merged.
imagePullSecrets: []
# - "clickhouse-pull-secret"

# ClickHouse instance labels
labels: {}
# ClickHouse pod labels
podLabels: {}
# -- ClickHouse instance annotations.
annotations: {}

Expand Down Expand Up @@ -487,9 +490,12 @@ clickhouseOperator:
# If not set and create is true, a name is generated using the fullname template
name:

# ClickHouse operator deployment labels
labels: {}
# ClickHouse operator pod labels
podLabels: {}
# -- Clickhouse Operator deployment annotations
annotations: {}

# -- Clickhouse Operator pod(s) annotation.
podAnnotations: {}
# signoz.io/port: '8888'
Expand Down
Loading