Skip to content

Commit 585a38e

Browse files
alex-zaitsevalex-zaitsev
authored
Merge pull request #131 from Altinity/0.4.1
Release 0.4.1
2 parents 3ce3ef6 + 85e06a9 commit 585a38e

18 files changed

+367
-57
lines changed

‎dev/binary_build.sh‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@ GIT_SHA=$(cd "${CUR_DIR}"; git rev-parse --short HEAD)
1515
"${SRC_ROOT}/manifests/operator/build-clickhouse-operator-install-yaml.sh"
1616

1717
#CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${CUR_DIR}/clickhouse-operator ${SRC_ROOT}/cmd/clickhouse-operator
18-
CGO_ENABLED=0 go build \
19-
-v -a \
18+
if CGO_ENABLED=0 go build \
19+
-a \
2020
-ldflags "-X ${REPO}/pkg/version.Version=${VERSION} -X ${REPO}/pkg/version.GitSHA=${GIT_SHA}" \
2121
-o "${OPERATOR_BIN}" \
22-
"${SRC_ROOT}/cmd/manager/main.go"
22+
"${SRC_ROOT}/cmd/manager/main.go"; then
23+
echo "Build OK"
24+
else
25+
echo "WARING!"
26+
echo "BUILD FAILED"
27+
echo "Check logs for details"
28+
fi
2329

2430
exit $?

‎docs/examples/10-zones-03-advanced-03-pod-per-host-default-storage-class.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ spec:
2323
templates:
2424
podTemplate: clickhouse-per-host
2525
volumeClaimTemplate: storage-vc-template
26-
configuration:
27-
templates:
2826
serviceTemplate: ch-service
27+
configuration:
2928
clusters:
3029
- name: zoned
3130
layout:

‎docs/examples/10-zones-04-advanced-04-pod-per-host-local-storage.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ spec:
2222
defaults:
2323
templates:
2424
podTemplate: clickhouse-per-host-localstorage
25-
configuration:
26-
templates:
2725
serviceTemplate: ch-service
26+
configuration:
2827
clusters:
2928
- name: ch-localstorage
3029
layout:

‎docs/examples/99-clickhouseinstallation-max.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ spec:
1212
templates:
1313
podTemplate: clickhouse-v18.16.1
1414
volumeClaimTemplate: default-volume-claim
15+
serviceTemplate: chi-service-template
1516

1617
configuration:
17-
templates:
18-
serviceTemplate: chi-service-template
19-
zookeeper:
18+
s zookeeper:
2019
nodes:
2120
- host: zookeeper-0.zookeepers.zoo3ns.svc.cluster.local
2221
port: 2181
@@ -123,14 +122,14 @@ spec:
123122
templates:
124123
podTemplate: clickhouse-v18.16.1
125124
volumeClaimTemplate: default-volume-claim
126-
serviceTemplate: replica-service-template
125+
replicaServiceTemplate: replica-service-template
127126
replicas:
128127
- name: replica0
129128
port: 9000
130129
templates:
131130
podTemplate: clickhouse-v18.16.2
132131
volumeClaimTemplate: default-volume-claim
133-
serviceTemplate: replica-service-template
132+
replicaServiceTemplate: replica-service-template
134133

135134
templates:
136135
serviceTemplates:

‎docs/examples/evolution/01-persistent-volume.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: "clickhouse.altinity.com/v1"
2+
kind: "ClickHouseInstallation"
3+
metadata:
4+
name: evolution
5+
spec:
6+
configuration:
7+
clusters:
8+
- name: cluster
9+
# Templates are specified for this cluster explicitly
10+
templates:
11+
podTemplate: pod-template-with-volume
12+
volumeClaimTemplate: storage-vc-template
13+
layout:
14+
shardsCount: 1
15+
replicasCount: 1
16+
17+
templates:
18+
podTemplates:
19+
- name: pod-template-with-volume
20+
spec:
21+
containers:
22+
- name: clickhouse
23+
image: yandex/clickhouse-server:19.3.7
24+
ports:
25+
- name: http
26+
containerPort: 8123
27+
- name: client
28+
containerPort: 9000
29+
- name: interserver
30+
containerPort: 9009
31+
volumeMounts:
32+
- name: storage-vc-template
33+
mountPath: /var/lib/clickhouse
34+
35+
volumeClaimTemplates:
36+
- name: storage-vc-template
37+
spec:
38+
accessModes:
39+
- ReadWriteOnce
40+
resources:
41+
requests:
42+
storage: 10Gi

‎docs/examples/evolution/02-introduce-replication.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
apiVersion: "clickhouse.altinity.com/v1"
2+
kind: "ClickHouseInstallation"
3+
metadata:
4+
name: evolution
5+
spec:
6+
configuration:
7+
zookeeper:
8+
nodes:
9+
- host: zookeeper.zoo1ns
10+
clusters:
11+
- name: cluster
12+
# Templates are specified for this cluster explicitly
13+
templates:
14+
podTemplate: pod-template-with-volume
15+
volumeClaimTemplate: storage-vc-template
16+
layout:
17+
shardsCount: 1
18+
replicasCount: 2
19+
20+
templates:
21+
podTemplates:
22+
- name: pod-template-with-volume
23+
spec:
24+
containers:
25+
- name: clickhouse
26+
image: yandex/clickhouse-server:19.3.7
27+
ports:
28+
- name: http
29+
containerPort: 8123
30+
- name: client
31+
containerPort: 9000
32+
- name: interserver
33+
containerPort: 9009
34+
volumeMounts:
35+
- name: storage-vc-template
36+
mountPath: /var/lib/clickhouse
37+
38+
volumeClaimTemplates:
39+
- name: storage-vc-template
40+
spec:
41+
accessModes:
42+
- ReadWriteOnce
43+
resources:
44+
requests:
45+
storage: 10Gi

‎docs/examples/evolution/03-introduce-more-shards-and-zones.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
apiVersion: "clickhouse.altinity.com/v1"
2+
kind: "ClickHouseInstallation"
3+
metadata:
4+
name: evolution
5+
spec:
6+
configuration:
7+
zookeeper:
8+
nodes:
9+
- host: zookeeper.zoo1ns
10+
clusters:
11+
- name: cluster
12+
# Templates are specified for this cluster explicitly
13+
templates:
14+
podTemplate: pod-template-with-volume
15+
volumeClaimTemplate: storage-vc-template
16+
layout:
17+
shardsCount: 2
18+
replicasCount: 2
19+
20+
templates:
21+
podTemplates:
22+
- name: pod-template-with-volume
23+
zone:
24+
key: "clickhouse"
25+
values:
26+
- "allow"
27+
distribution: "OnePerHost"
28+
spec:
29+
containers:
30+
- name: clickhouse
31+
image: yandex/clickhouse-server:19.3.7
32+
ports:
33+
- name: http
34+
containerPort: 8123
35+
- name: client
36+
containerPort: 9000
37+
- name: interserver
38+
containerPort: 9009
39+
volumeMounts:
40+
- name: storage-vc-template
41+
mountPath: /var/lib/clickhouse
42+
43+
volumeClaimTemplates:
44+
- name: storage-vc-template
45+
spec:
46+
accessModes:
47+
- ReadWriteOnce
48+
resources:
49+
requests:
50+
storage: 10Gi

‎docs/examples/evolution/04-update-introduce-canary.yaml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
apiVersion: "clickhouse.altinity.com/v1"
2+
kind: "ClickHouseInstallation"
3+
metadata:
4+
name: evolution
5+
spec:
6+
configuration:
7+
zookeeper:
8+
nodes:
9+
- host: zookeeper.zoo1ns
10+
clusters:
11+
- name: cluster
12+
# Templates are specified for this cluster explicitly
13+
templates:
14+
podTemplate: pod-template-with-volume
15+
volumeClaimTemplate: storage-vc-template
16+
layout:
17+
shardsCount: 2
18+
replicasCount: 2
19+
shards:
20+
- name: "1"
21+
replicasCount: 2
22+
replicas:
23+
- name: "1"
24+
templates:
25+
podTemplate: pod-template-with-volume-19.4
26+
volumeClaimTemplate: storage-vc-template
27+
28+
29+
templates:
30+
podTemplates:
31+
- name: pod-template-with-volume
32+
zone:
33+
key: "clickhouse"
34+
values:
35+
- "allow"
36+
distribution: "OnePerHost"
37+
spec:
38+
containers:
39+
- name: clickhouse
40+
image: yandex/clickhouse-server:19.3.7
41+
ports:
42+
- name: http
43+
containerPort: 8123
44+
- name: client
45+
containerPort: 9000
46+
- name: interserver
47+
containerPort: 9009
48+
volumeMounts:
49+
- name: storage-vc-template
50+
mountPath: /var/lib/clickhouse
51+
52+
- name: pod-template-with-volume-19.4
53+
zone:
54+
key: "clickhouse"
55+
values:
56+
- "allow"
57+
distribution: "OnePerHost"
58+
spec:
59+
containers:
60+
- name: clickhouse
61+
image: yandex/clickhouse-server:19.4.3.11
62+
ports:
63+
- name: http
64+
containerPort: 8123
65+
- name: client
66+
containerPort: 9000
67+
- name: interserver
68+
containerPort: 9009
69+
volumeMounts:
70+
- name: storage-vc-template
71+
mountPath: /var/lib/clickhouse
72+
73+
volumeClaimTemplates:
74+
- name: storage-vc-template
75+
spec:
76+
accessModes:
77+
- ReadWriteOnce
78+
resources:
79+
requests:
80+
storage: 10Gi

‎docs/examples/evolution/05-update-propagate-update.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
apiVersion: "clickhouse.altinity.com/v1"
2+
kind: "ClickHouseInstallation"
3+
metadata:
4+
name: evolution
5+
spec:
6+
configuration:
7+
zookeeper:
8+
nodes:
9+
- host: zookeeper.zoo1ns
10+
clusters:
11+
- name: cluster
12+
# Templates are specified for this cluster explicitly
13+
templates:
14+
podTemplate: pod-template-with-volume
15+
volumeClaimTemplate: storage-vc-template
16+
layout:
17+
shardsCount: 2
18+
replicasCount: 2
19+
20+
templates:
21+
podTemplates:
22+
- name: pod-template-with-volume
23+
zone:
24+
key: "clickhouse"
25+
values:
26+
- "allow"
27+
distribution: "OnePerHost"
28+
spec:
29+
containers:
30+
- name: clickhouse
31+
image: yandex/clickhouse-server:19.4.3.11
32+
ports:
33+
- name: http
34+
containerPort: 8123
35+
- name: client
36+
containerPort: 9000
37+
- name: interserver
38+
containerPort: 9009
39+
volumeMounts:
40+
- name: storage-vc-template
41+
mountPath: /var/lib/clickhouse
42+
43+
volumeClaimTemplates:
44+
- name: storage-vc-template
45+
spec:
46+
accessModes:
47+
- ReadWriteOnce
48+
resources:
49+
requests:
50+
storage: 10Gi

0 commit comments

Comments
 (0)