Skip to content

Commit 4568ee7

Browse files
alex-zaitsevalex-zaitsev
authored
Merge pull request #320 from Altinity/0.9.5
0.9.5
2 parents c61b42b + 80886e7 commit 4568ee7

21 files changed

+484
-143
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
- run:
99
name: Building Docker images
1010
command: |
11+
echo "Building Docker images"
12+
1113
docker build -f dockerfile/operator/Dockerfile -t clickhouse-operator:latest .
1214
docker build -f dockerfile/metrics-exporter/Dockerfile -t metrics-exporter:latest .
1315
- run:
@@ -30,6 +32,8 @@ jobs:
3032
- run:
3133
name: Building Docker images
3234
command: |
35+
echo "Building Docker images"
36+
3337
docker build -f dockerfile/operator/Dockerfile -t clickhouse-operator:dev .
3438
docker build -f dockerfile/metrics-exporter/Dockerfile -t metrics-exporter:dev .
3539
- run:

‎deploy/dev/clickhouse-operator-install-dev.yaml‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ spec:
537537
type:
538538
type: string
539539
enum:
540-
# List podDistributionXXX constants
540+
# List PodDistributionXXX constants
541541
- ""
542542
- "Unspecified"
543543
- "ClickHouseAntiAffinity"
@@ -554,6 +554,17 @@ spec:
554554
- "ReplicaAffinity"
555555
- "PreviousTailAffinity"
556556
- "CircularReplication"
557+
scope:
558+
type: string
559+
enum:
560+
# list PodDistributionScopeXXX constants
561+
- ""
562+
- "Unspecified"
563+
- "Shard"
564+
- "Replica"
565+
- "Cluster"
566+
- "ClickHouseInstallation"
567+
- "Namespace"
557568
number:
558569
type: integer
559570
minimum: 0
@@ -1155,7 +1166,7 @@ spec:
11551166
type:
11561167
type: string
11571168
enum:
1158-
# List podDistributionXXX constants
1169+
# List PodDistributionXXX constants
11591170
- ""
11601171
- "Unspecified"
11611172
- "ClickHouseAntiAffinity"
@@ -1172,6 +1183,17 @@ spec:
11721183
- "ReplicaAffinity"
11731184
- "PreviousTailAffinity"
11741185
- "CircularReplication"
1186+
scope:
1187+
type: string
1188+
enum:
1189+
# list PodDistributionScopeXXX constants
1190+
- ""
1191+
- "Unspecified"
1192+
- "Shard"
1193+
- "Replica"
1194+
- "Cluster"
1195+
- "ClickHouseInstallation"
1196+
- "Namespace"
11751197
number:
11761198
type: integer
11771199
minimum: 0
@@ -1345,7 +1367,7 @@ subjects:
13451367
# Possible Template Parameters:
13461368
#
13471369
# dev
1348-
# altinity/clickhouse-operator:0.9.4
1370+
# altinity/clickhouse-operator:0.9.5
13491371
# etc-clickhouse-operator-files
13501372
#
13511373
apiVersion: v1
@@ -1472,7 +1494,7 @@ data:
14721494
# Possible Template Parameters:
14731495
#
14741496
# dev
1475-
# altinity/clickhouse-operator:0.9.4
1497+
# altinity/clickhouse-operator:0.9.5
14761498
# etc-clickhouse-operator-confd-files
14771499
#
14781500
apiVersion: v1
@@ -1487,7 +1509,7 @@ data:
14871509
# Possible Template Parameters:
14881510
#
14891511
# dev
1490-
# altinity/clickhouse-operator:0.9.4
1512+
# altinity/clickhouse-operator:0.9.5
14911513
# etc-clickhouse-operator-configd-files
14921514
#
14931515
apiVersion: v1
@@ -1533,7 +1555,7 @@ data:
15331555
# Possible Template Parameters:
15341556
#
15351557
# dev
1536-
# altinity/clickhouse-operator:0.9.4
1558+
# altinity/clickhouse-operator:0.9.5
15371559
# etc-clickhouse-operator-templatesd-files
15381560
#
15391561
apiVersion: v1
@@ -1632,7 +1654,7 @@ data:
16321654
# Possible Template Parameters:
16331655
#
16341656
# dev
1635-
# altinity/clickhouse-operator:0.9.4
1657+
# altinity/clickhouse-operator:0.9.5
16361658
# etc-clickhouse-operator-usersd-files
16371659
#
16381660
apiVersion: v1
@@ -1681,8 +1703,8 @@ data:
16811703
# Possible Template Parameters:
16821704
#
16831705
# dev
1684-
# altinity/clickhouse-operator:0.9.4
1685-
# altinity/metrics-exporter:0.9.4
1706+
# altinity/clickhouse-operator:0.9.5
1707+
# altinity/metrics-exporter:0.9.5
16861708
#
16871709
# Setup Deployment for clickhouse-operator
16881710
# Deployment would be created in kubectl-specified namespace
@@ -1725,7 +1747,7 @@ spec:
17251747
name: etc-clickhouse-operator-usersd-files
17261748
containers:
17271749
- name: clickhouse-operator
1728-
image: altinity/clickhouse-operator:0.9.4
1750+
image: altinity/clickhouse-operator:0.9.5
17291751
imagePullPolicy: Always
17301752
volumeMounts:
17311753
- name: etc-clickhouse-operator-folder
@@ -1790,7 +1812,7 @@ spec:
17901812
resource: limits.memory
17911813

17921814
- name: metrics-exporter
1793-
image: altinity/metrics-exporter:0.9.4
1815+
image: altinity/metrics-exporter:0.9.5
17941816
imagePullPolicy: Always
17951817
volumeMounts:
17961818
- name: etc-clickhouse-operator-folder

‎deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-01-chi.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ spec:
537537
type:
538538
type: string
539539
enum:
540-
# List podDistributionXXX constants
540+
# List PodDistributionXXX constants
541541
- ""
542542
- "Unspecified"
543543
- "ClickHouseAntiAffinity"
@@ -554,6 +554,17 @@ spec:
554554
- "ReplicaAffinity"
555555
- "PreviousTailAffinity"
556556
- "CircularReplication"
557+
scope:
558+
type: string
559+
enum:
560+
# list PodDistributionScopeXXX constants
561+
- ""
562+
- "Unspecified"
563+
- "Shard"
564+
- "Replica"
565+
- "Cluster"
566+
- "ClickHouseInstallation"
567+
- "Namespace"
557568
number:
558569
type: integer
559570
minimum: 0

‎deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-02-chit.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ spec:
537537
type:
538538
type: string
539539
enum:
540-
# List podDistributionXXX constants
540+
# List PodDistributionXXX constants
541541
- ""
542542
- "Unspecified"
543543
- "ClickHouseAntiAffinity"
@@ -554,6 +554,17 @@ spec:
554554
- "ReplicaAffinity"
555555
- "PreviousTailAffinity"
556556
- "CircularReplication"
557+
scope:
558+
type: string
559+
enum:
560+
# list PodDistributionScopeXXX constants
561+
- ""
562+
- "Unspecified"
563+
- "Shard"
564+
- "Replica"
565+
- "Cluster"
566+
- "ClickHouseInstallation"
567+
- "Namespace"
557568
number:
558569
type: integer
559570
minimum: 0

‎deploy/operator/clickhouse-operator-install-crd.yaml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ spec:
537537
type:
538538
type: string
539539
enum:
540-
# List podDistributionXXX constants
540+
# List PodDistributionXXX constants
541541
- ""
542542
- "Unspecified"
543543
- "ClickHouseAntiAffinity"
@@ -554,6 +554,17 @@ spec:
554554
- "ReplicaAffinity"
555555
- "PreviousTailAffinity"
556556
- "CircularReplication"
557+
scope:
558+
type: string
559+
enum:
560+
# list PodDistributionScopeXXX constants
561+
- ""
562+
- "Unspecified"
563+
- "Shard"
564+
- "Replica"
565+
- "Cluster"
566+
- "ClickHouseInstallation"
567+
- "Namespace"
557568
number:
558569
type: integer
559570
minimum: 0
@@ -1155,7 +1166,7 @@ spec:
11551166
type:
11561167
type: string
11571168
enum:
1158-
# List podDistributionXXX constants
1169+
# List PodDistributionXXX constants
11591170
- ""
11601171
- "Unspecified"
11611172
- "ClickHouseAntiAffinity"
@@ -1172,6 +1183,17 @@ spec:
11721183
- "ReplicaAffinity"
11731184
- "PreviousTailAffinity"
11741185
- "CircularReplication"
1186+
scope:
1187+
type: string
1188+
enum:
1189+
# list PodDistributionScopeXXX constants
1190+
- ""
1191+
- "Unspecified"
1192+
- "Shard"
1193+
- "Replica"
1194+
- "Cluster"
1195+
- "ClickHouseInstallation"
1196+
- "Namespace"
11751197
number:
11761198
type: integer
11771199
minimum: 0

‎deploy/operator/clickhouse-operator-install-deployment.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Possible Template Parameters:
22
#
33
# -
4-
# altinity/clickhouse-operator:0.9.4
4+
# altinity/clickhouse-operator:0.9.5
55
# etc-clickhouse-operator-files
66
#
77
apiVersion: v1
@@ -127,7 +127,7 @@ data:
127127
# Possible Template Parameters:
128128
#
129129
# -
130-
# altinity/clickhouse-operator:0.9.4
130+
# altinity/clickhouse-operator:0.9.5
131131
# etc-clickhouse-operator-confd-files
132132
#
133133
apiVersion: v1
@@ -141,7 +141,7 @@ data:
141141
# Possible Template Parameters:
142142
#
143143
# -
144-
# altinity/clickhouse-operator:0.9.4
144+
# altinity/clickhouse-operator:0.9.5
145145
# etc-clickhouse-operator-configd-files
146146
#
147147
apiVersion: v1
@@ -186,7 +186,7 @@ data:
186186
# Possible Template Parameters:
187187
#
188188
# -
189-
# altinity/clickhouse-operator:0.9.4
189+
# altinity/clickhouse-operator:0.9.5
190190
# etc-clickhouse-operator-templatesd-files
191191
#
192192
apiVersion: v1
@@ -284,7 +284,7 @@ data:
284284
# Possible Template Parameters:
285285
#
286286
# -
287-
# altinity/clickhouse-operator:0.9.4
287+
# altinity/clickhouse-operator:0.9.5
288288
# etc-clickhouse-operator-usersd-files
289289
#
290290
apiVersion: v1
@@ -332,8 +332,8 @@ data:
332332
# Possible Template Parameters:
333333
#
334334
# -
335-
# altinity/clickhouse-operator:0.9.4
336-
# altinity/metrics-exporter:0.9.4
335+
# altinity/clickhouse-operator:0.9.5
336+
# altinity/metrics-exporter:0.9.5
337337
#
338338
# Setup Deployment for clickhouse-operator
339339
# Deployment would be created in kubectl-specified namespace
@@ -375,7 +375,7 @@ spec:
375375
name: etc-clickhouse-operator-usersd-files
376376
containers:
377377
- name: clickhouse-operator
378-
image: altinity/clickhouse-operator:0.9.4
378+
image: altinity/clickhouse-operator:0.9.5
379379
imagePullPolicy: Always
380380
volumeMounts:
381381
- name: etc-clickhouse-operator-folder
@@ -440,7 +440,7 @@ spec:
440440
resource: limits.memory
441441

442442
- name: metrics-exporter
443-
image: altinity/metrics-exporter:0.9.4
443+
image: altinity/metrics-exporter:0.9.5
444444
imagePullPolicy: Always
445445
volumeMounts:
446446
- name: etc-clickhouse-operator-folder

‎deploy/operator/clickhouse-operator-install-template-crd.yaml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ spec:
537537
type:
538538
type: string
539539
enum:
540-
# List podDistributionXXX constants
540+
# List PodDistributionXXX constants
541541
- ""
542542
- "Unspecified"
543543
- "ClickHouseAntiAffinity"
@@ -554,6 +554,17 @@ spec:
554554
- "ReplicaAffinity"
555555
- "PreviousTailAffinity"
556556
- "CircularReplication"
557+
scope:
558+
type: string
559+
enum:
560+
# list PodDistributionScopeXXX constants
561+
- ""
562+
- "Unspecified"
563+
- "Shard"
564+
- "Replica"
565+
- "Cluster"
566+
- "ClickHouseInstallation"
567+
- "Namespace"
557568
number:
558569
type: integer
559570
minimum: 0
@@ -1155,7 +1166,7 @@ spec:
11551166
type:
11561167
type: string
11571168
enum:
1158-
# List podDistributionXXX constants
1169+
# List PodDistributionXXX constants
11591170
- ""
11601171
- "Unspecified"
11611172
- "ClickHouseAntiAffinity"
@@ -1172,6 +1183,17 @@ spec:
11721183
- "ReplicaAffinity"
11731184
- "PreviousTailAffinity"
11741185
- "CircularReplication"
1186+
scope:
1187+
type: string
1188+
enum:
1189+
# list PodDistributionScopeXXX constants
1190+
- ""
1191+
- "Unspecified"
1192+
- "Shard"
1193+
- "Replica"
1194+
- "Cluster"
1195+
- "ClickHouseInstallation"
1196+
- "Namespace"
11751197
number:
11761198
type: integer
11771199
minimum: 0

0 commit comments

Comments
 (0)