Skip to content

update versions and improve clickhouse-keeper manifests #911

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

Merged
sunsingerus merged 1 commit into from
Mar 28, 2022
Merged

update versions and improve clickhouse-keeper manifests #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 config/templates.d/001-templates.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"containers" : [
{
"name": "clickhouse",
"image": "yandex/clickhouse-server:21.3",
"image": "clickhouse/clickhouse-server:22.3",
"ports": [
{
"name": "http",
Expand Down
2 changes: 1 addition & 1 deletion deploy/builder/templates-config/templates.d/001-templates.json.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"containers" : [
{
"name": "clickhouse",
"image": "yandex/clickhouse-server:21.3",
"image": "clickhouse/clickhouse-server:22.3",
"ports": [
{
"name": "http",
Expand Down
52 changes: 18 additions & 34 deletions deploy/clickhouse-keeper/clickhouse-keeper-1-node-256M-for-test-only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ spec:
apiVersion: v1
kind: Service
metadata:
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
name: clickhouse-keepers
labels:
app: clickhouse-keeper
spec:
ports:
- port: 9234
- port: 9444
name: raft
clusterIP: None
selector:
Expand Down Expand Up @@ -80,9 +80,10 @@ data:
<keeper_server incl="keeper_server">
<path>/var/lib/clickhouse-keeper</path>
<tcp_port>2181</tcp_port>
<four_letter_word_white_list>*</four_letter_word_white_list>
<coordination_settings>
<!-- <raft_logs_level>trace</raft_logs_level> -->
<raft_logs_level>debug</raft_logs_level>
<raft_logs_level>information</raft_logs_level>
</coordination_settings>
</keeper_server>
</yandex>
Expand Down Expand Up @@ -134,7 +135,7 @@ spec:
path: keeper_config.xml
containers:
- name: clickhouse-keeper
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
image: "clickhouse/clickhouse-server:latest"
resources:
requests:
Expand All @@ -152,7 +153,7 @@ spec:
- name: SERVERS
value: "1"
- name: RAFT_PORT
value: "9234"
value: "9444"
command:
- bash
- -x
Expand All @@ -178,38 +179,20 @@ spec:
done
echo "</raft_configuration>"
echo "</keeper_server></yandex>"
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
readinessProbe:
exec:
command:
- bash
- -xc
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
if [[ \"$OK\" == \"imok\" ]];
then
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
if [[ \"$STATE\" == \"leader\" ]]; then
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
exit 0;
else
exit 1;
fi;
elif [[ \"$STATE\" == \"follower\" ]]; then
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
exit 0;
else
exit 1;
fi;
fi;
else
exit 1;
fi"
initialDelaySeconds: 15
timeoutSeconds: 15
tcpSocket:
port: 9444
timeoutSeconds: 5
periodSeconds: 60
failureThreshold: 3
livenessProbe:
tcpSocket:
port: 2181
timeoutSeconds: 5
periodSeconds: 30
- name: zookeeper-exporter
imagePullPolicy: IfNotPresent
image: dabealu/zookeeper-exporter:latest
Expand All @@ -232,6 +215,7 @@ spec:
- sh
- -c
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
periodSeconds: 5
ports:
- containerPort: 7000
name: prometheus
Expand Down
50 changes: 17 additions & 33 deletions deploy/clickhouse-keeper/clickhouse-keeper-1-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ spec:
apiVersion: v1
kind: Service
metadata:
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
name: clickhouse-keepers
labels:
app: clickhouse-keeper
spec:
ports:
- port: 9234
- port: 9444
name: raft
clusterIP: None
selector:
Expand Down Expand Up @@ -62,9 +62,10 @@ data:
<keeper_server incl="keeper_server">
<path>/var/lib/clickhouse-keeper</path>
<tcp_port>2181</tcp_port>
<four_letter_word_white_list>*</four_letter_word_white_list>
<coordination_settings>
<!-- <raft_logs_level>trace</raft_logs_level> -->
<raft_logs_level>debug</raft_logs_level>
<raft_logs_level>information</raft_logs_level>
</coordination_settings>
</keeper_server>
</yandex>
Expand Down Expand Up @@ -133,7 +134,7 @@ spec:
- name: SERVERS
value: "1"
- name: RAFT_PORT
value: "9234"
value: "9444"
command:
- bash
- -x
Expand All @@ -159,38 +160,20 @@ spec:
done
echo "</raft_configuration>"
echo "</keeper_server></yandex>"
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
readinessProbe:
exec:
command:
- bash
- -xc
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
if [[ \"$OK\" == \"imok\" ]];
then
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
if [[ \"$STATE\" == \"leader\" ]]; then
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
exit 0;
else
exit 1;
fi;
elif [[ \"$STATE\" == \"follower\" ]]; then
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
exit 0;
else
exit 1;
fi;
fi;
else
exit 1;
fi"
initialDelaySeconds: 15
timeoutSeconds: 15
tcpSocket:
port: 9444
timeoutSeconds: 5
periodSeconds: 60
failureThreshold: 3
livenessProbe:
tcpSocket:
port: 2181
timeoutSeconds: 5
periodSeconds: 30
- name: zookeeper-exporter
imagePullPolicy: IfNotPresent
image: dabealu/zookeeper-exporter:latest
Expand All @@ -213,6 +196,7 @@ spec:
- sh
- -c
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
periodSeconds: 5
ports:
- containerPort: 7000
name: prometheus
Expand Down
52 changes: 18 additions & 34 deletions deploy/clickhouse-keeper/clickhouse-keeper-3-nodes-256M-for-test-only.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ spec:
apiVersion: v1
kind: Service
metadata:
# DNS would be like keeper-0.clickhouse-keepers.namespace.svc
# DNS would be like clickhouse-keeper-0.clickhouse-keepers.namespace.svc
name: clickhouse-keepers
labels:
app: clickhouse-keeper
spec:
ports:
- port: 9234
- port: 9444
name: raft
clusterIP: None
selector:
Expand Down Expand Up @@ -80,9 +80,10 @@ data:
<keeper_server incl="keeper_server">
<path>/var/lib/clickhouse-keeper</path>
<tcp_port>2181</tcp_port>
<four_letter_word_white_list>*</four_letter_word_white_list>
<coordination_settings>
<!-- <raft_logs_level>trace</raft_logs_level> -->
<raft_logs_level>debug</raft_logs_level>
<raft_logs_level>information</raft_logs_level>
</coordination_settings>
</keeper_server>
</yandex>
Expand Down Expand Up @@ -134,7 +135,7 @@ spec:
path: keeper_config.xml
containers:
- name: clickhouse-keeper
imagePullPolicy: IfNotPresent
imagePullPolicy: Always
image: "clickhouse/clickhouse-server:latest"
resources:
requests:
Expand All @@ -152,7 +153,7 @@ spec:
- name: SERVERS
value: "3"
- name: RAFT_PORT
value: "9234"
value: "9444"
command:
- bash
- -x
Expand All @@ -178,38 +179,20 @@ spec:
done
echo "</raft_configuration>"
echo "</keeper_server></yandex>"
} >> /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
} > /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
cat /tmp/clickhouse-keeper/config.d/generated-keeper-settings.xml &&
clickhouse keeper --config-file=/etc/clickhouse-keeper/keeper_config.xml
readinessProbe:
exec:
command:
- bash
- -xc
- "OK=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"ruok\" >&3 && timeout 5 cat <&3');
if [[ \"$OK\" == \"imok\" ]];
then
STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_server_state | cut -d \" \" -f 2);
if [[ \"$STATE\" == \"leader\" ]]; then
SYNCED_FOLLOWERS=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_synced_followers | cut -d \" \" -f 2 | cut -d \".\" -f 1);
if [[ $SYNCED_FOLLOWERS == $(( $SERVERS - 1 )) ]]; then
exit 0;
else
exit 1;
fi;
elif [[ \"$STATE\" == \"follower\" ]]; then
PEER_STATE=$(bash -c 'exec 3<>/dev/tcp/127.0.0.1/2181 && printf \"mntr\" >&3 && timeout 5 cat <&3' | grep zk_peer_state);
if [[ \"$PEER_STATE\" == \"following - broadcast\" ]]; then
exit 0;
else
exit 1;
fi;
fi;
else
exit 1;
fi"
initialDelaySeconds: 15
timeoutSeconds: 15
tcpSocket:
port: 9444
timeoutSeconds: 5
periodSeconds: 60
failureThreshold: 3
livenessProbe:
tcpSocket:
port: 2181
timeoutSeconds: 5
periodSeconds: 30
- name: zookeeper-exporter
imagePullPolicy: IfNotPresent
image: dabealu/zookeeper-exporter:latest
Expand All @@ -232,6 +215,7 @@ spec:
- sh
- -c
- "OK=$(echo ruok | nc 127.0.0.1 2181); if [[ \"$OK\" == \"imok\" ]]; then exit 0; else exit 1; fi"
periodSeconds: 5
ports:
- containerPort: 7000
name: prometheus
Expand Down
Loading