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.

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

clickhouse-operator: upgrade to 0.19.0 #476

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kind: CustomResourceDefinition
metadata:
name: clickhouseinstallations.clickhouse.altinity.com
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
spec:
group: clickhouse.altinity.com
scope: Namespaced
Expand Down Expand Up @@ -119,6 +119,9 @@ spec:
chop-date:
type: string
description: "ClickHouse operator build date"
chop-ip:
type: string
description: "IP address of the operator's pod which managed this CHI"
clusters:
type: integer
minimum: 0
Expand Down Expand Up @@ -188,6 +191,11 @@ spec:
description: "Pods"
items:
type: string
pod-ips:
type: array
description: "Pod IPs"
items:
type: string
fqdns:
type: array
description: "Pods FQDNs"
Expand Down Expand Up @@ -657,6 +665,26 @@ spec:
volumeClaimTemplate:
type: string
description: "DEPRECATED! VolumeClaimTemplate is deprecated in favor of DataVolumeClaimTemplate and LogVolumeClaimTemplate"
schemaPolicy:
type: object
description: |
describes how schema is propagated within replicas and shards
properties:
replica:
type: string
description: "how schema is propagated within a replica"
enum:
# List SchemaPolicyReplicaXXX constants from model
- "None"
- "All"
shard:
type: string
description: "how schema is propagated between shards"
enum:
# List SchemaPolicyShardXXX constants from model
- "None"
- "All"
- "DistributedTablesOnly"
layout:
type: object
description: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kind: CustomResourceDefinition
metadata:
name: clickhouseinstallationtemplates.clickhouse.altinity.com
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
spec:
group: clickhouse.altinity.com
scope: Namespaced
Expand Down Expand Up @@ -119,6 +119,9 @@ spec:
chop-date:
type: string
description: "ClickHouse operator build date"
chop-ip:
type: string
description: "IP address of the operator's pod which managed this CHI"
clusters:
type: integer
minimum: 0
Expand Down Expand Up @@ -188,6 +191,11 @@ spec:
description: "Pods"
items:
type: string
pod-ips:
type: array
description: "Pod IPs"
items:
type: string
fqdns:
type: array
description: "Pods FQDNs"
Expand Down Expand Up @@ -657,6 +665,26 @@ spec:
volumeClaimTemplate:
type: string
description: "DEPRECATED! VolumeClaimTemplate is deprecated in favor of DataVolumeClaimTemplate and LogVolumeClaimTemplate"
schemaPolicy:
type: object
description: |
describes how schema is propagated within replicas and shards
properties:
replica:
type: string
description: "how schema is propagated within a replica"
enum:
# List SchemaPolicyReplicaXXX constants from model
- "None"
- "All"
shard:
type: string
description: "how schema is propagated between shards"
enum:
# List SchemaPolicyShardXXX constants from model
- "None"
- "All"
- "DistributedTablesOnly"
layout:
type: object
description: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ kind: CustomResourceDefinition
metadata:
name: clickhouseoperatorconfigurations.clickhouse.altinity.com
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
spec:
group: clickhouse.altinity.com
scope: Namespaced
Expand Down Expand Up @@ -116,6 +116,9 @@ spec:
password:
type: string
description: "ClickHouse password to be used by operator to connect to ClickHouse instances, deprecated, use chCredentialsSecretName"
rootCA:
type: string
description: "Root certificate authority that clients use when verifying server certificates. Used for https connection to ClickHouse"
secret:
type: object
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }}
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
rules:
- apiGroups:
- ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
name: clickhouse-operator-{{ .Values.clickhouse.namespace | default .Release.Namespace }}
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
61 changes: 52 additions & 9 deletions charts/posthog/templates/clickhouse-operator/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ metadata:
name: etc-clickhouse-operator-files
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
data:
config.yaml: |
# IMPORTANT
# This file is auto-generated from deploy/builder/templates-config.
# It will be overwritten upon next sources build.
# This file is auto-generated
# Do not edit this file - all changes would be lost
# Edit appropriate template in the following folder:
# deploy/builder/templates-config
# IMPORTANT
#
# Template parameters available:
# watchNamespaces
Expand Down Expand Up @@ -243,7 +246,7 @@ metadata:
name: etc-clickhouse-operator-confd-files
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
data:

Expand All @@ -261,10 +264,16 @@ metadata:
name: etc-clickhouse-operator-configd-files
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
data:
01-clickhouse-01-listen.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
<listen_host>::</listen_host>
Expand All @@ -273,6 +282,12 @@ data:
</yandex>

01-clickhouse-02-logger.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<logger>
<!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
Expand All @@ -287,6 +302,12 @@ data:
</yandex>

01-clickhouse-03-query_log.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<query_log replace="1">
<database>system</database>
Expand All @@ -298,6 +319,12 @@ data:
</yandex>

01-clickhouse-04-part_log.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<part_log replace="1">
<database>system</database>
Expand All @@ -321,7 +348,7 @@ metadata:
name: etc-clickhouse-operator-templatesd-files
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
data:
001-templates.json.example: |
Expand Down Expand Up @@ -423,17 +450,21 @@ metadata:
name: etc-clickhouse-operator-usersd-files
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
data:
01-clickhouse-user.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<users>
<clickhouse_operator>
<networks>
<ip>127.0.0.1</ip>
<ip>0.0.0.0/0</ip>
<ip>::/0</ip>
</networks>
<password_sha256_hex>716b36073a90c6fe1d445ac1af85f4777c5b7a155cea359961826a030513e448</password_sha256_hex>
<profile>clickhouse_operator</profile>
Expand All @@ -450,6 +481,12 @@ data:
</yandex>

02-clickhouse-default-profile.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<yandex>
<profiles>
<default>
Expand All @@ -461,6 +498,12 @@ data:
</profiles>
</yandex>
03-database-ordinary.xml: |
<!-- IMPORTANT -->
<!-- This file is auto-generated -->
<!-- Do not edit this file - all changes would be lost -->
<!-- Edit appropriate template in the following folder: -->
<!-- deploy/builder/templates-config -->
<!-- IMPORTANT -->
<!-- Remove it for ClickHouse versions before 20.4 -->
<yandex>
<profiles>
Expand Down
12 changes: 7 additions & 5 deletions charts/posthog/templates/clickhouse-operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
# NAMESPACE={{ .Values.clickhouse.namespace | default .Release.Namespace }}
# COMMENT=
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.19.0
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:latest
# OPERATOR_IMAGE_PULL_POLICY=
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.19.0
# METRICS_EXPORTER_IMAGE_PULL_POLICY=
#
# Setup Deployment for clickhouse-operator
# Deployment would be created in kubectl-specified namespace
Expand All @@ -14,7 +16,7 @@ metadata:
name: clickhouse-operator
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
spec:
replicas: 1
Expand Down Expand Up @@ -49,7 +51,7 @@ spec:
containers:
- name: clickhouse-operator
image: altinity/clickhouse-operator:0.19.0
imagePullPolicy: Always
imagePullPolicy:
volumeMounts:
- name: etc-clickhouse-operator-folder
mountPath: /etc/clickhouse-operator
Expand Down Expand Up @@ -113,8 +115,8 @@ spec:
resource: limits.memory

- name: metrics-exporter
image: altinity/metrics-exporter:latest
imagePullPolicy: Always
image: altinity/metrics-exporter:0.19.0
imagePullPolicy:
volumeMounts:
- name: etc-clickhouse-operator-folder
mountPath: /etc/clickhouse-operator
Expand Down
2 changes: 1 addition & 1 deletion charts/posthog/templates/clickhouse-operator/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
name: clickhouse-operator-metrics
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
app: clickhouse-operator
spec:
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
name: clickhouse-operator
namespace: {{ .Values.clickhouse.namespace | default .Release.Namespace }}
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0

{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values:
kind: ClusterRole
metadata:
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
name: clickhouse-operator-NAMESPACE
namespace: NAMESPACE
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ the manifest should match the snapshot when using default values:
kind: ClusterRoleBinding
metadata:
labels:
clickhouse.altinity.com/chop: 0.18.4
clickhouse.altinity.com/chop: 0.19.0
name: clickhouse-operator-NAMESPACE
namespace: NAMESPACE
roleRef:
Expand Down
Loading