Skip to content

Commit d71591f

Browse files
authored
Merge pull request #443 from Altinity/0.10.0
0.10.0
2 parents 0345b77 + 4340825 commit d71591f

File tree

1,209 files changed

+163870
-32513
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,209 files changed

+163870
-32513
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ ClickHouse Operator creates, configures and manages ClickHouse clusters running
77
[![issues](https://img.shields.io/github/issues/altinity/clickhouse-operator.svg)](https://github.com/altinity/clickhouse-operator/issues)
88
[![tags](https://img.shields.io/github/tag/altinity/clickhouse-operator.svg)](https://github.com/altinity/clickhouse-operator/tags)
99
[![Go Report Card](https://goreportcard.com/badge/github.com/altinity/clickhouse-operator)](https://goreportcard.com/report/github.com/altinity/clickhouse-operator)
10+
[![Docker Pulls](https://img.shields.io/docker/pulls/altinity/clickhouse-operator.svg)](https://hub.docker.com/r/altinity/clickhouse-operator)
11+
[![CircleCI](https://circleci.com/gh/Altinity/clickhouse-operator.svg?style=svg)](https://circleci.com/gh/Altinity/clickhouse-operator)
12+
1013

1114
## Features
1215

config/config-dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ chConfigUserDefaultNetworksIP:
7878
chConfigUserDefaultPassword: "default"
7979

8080
# Default host_regexp to limit network connectivity from outside
81-
ChConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
81+
chConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
8282

8383
################################################
8484
##
85-
## Operator's access to ClickHouse instances
85+
## Access to ClickHouse instances
8686
##
8787
################################################
8888

@@ -104,7 +104,7 @@ chPort: 8123
104104

105105
logtostderr: "true"
106106
alsologtostderr: "false"
107-
v: "100"
107+
v: "2"
108108
stderrthreshold: ""
109109
vmodule: ""
110110
log_backtrace_at: ""

config/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ chConfigUserDefaultNetworksIP:
7878
chConfigUserDefaultPassword: "default"
7979

8080
# Default host_regexp to limit network connectivity from outside
81-
ChConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
81+
chConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
8282

8383
################################################
8484
##

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

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ spec:
6969
# preserveUnknownFields: false
7070
validation:
7171
openAPIV3Schema:
72+
type: object
7273
properties:
7374
spec:
7475
type: object
76+
x-kubernetes-preserve-unknown-fields: true
7577
properties:
7678
# Need to be StringBool
7779
stop:
@@ -97,6 +99,8 @@ spec:
9799
- "disabled"
98100
- "Enabled"
99101
- "enabled"
102+
namespaceDomainPattern:
103+
type: string
100104
defaults:
101105
type: object
102106
properties:
@@ -185,6 +189,8 @@ spec:
185189
type: object
186190
files:
187191
type: object
192+
additionalProperties:
193+
type: string
188194
clusters:
189195
type: array
190196
items:
@@ -509,6 +515,8 @@ spec:
509515
properies:
510516
name:
511517
type: string
518+
generateName:
519+
type: string
512520
zone:
513521
type: object
514522
required:
@@ -698,9 +706,11 @@ spec:
698706
# preserveUnknownFields: false
699707
validation:
700708
openAPIV3Schema:
709+
type: object
701710
properties:
702711
spec:
703712
type: object
713+
x-kubernetes-preserve-unknown-fields: true
704714
properties:
705715
# Need to be StringBool
706716
stop:
@@ -726,6 +736,8 @@ spec:
726736
- "disabled"
727737
- "Enabled"
728738
- "enabled"
739+
namespaceDomainPattern:
740+
type: string
729741
defaults:
730742
type: object
731743
properties:
@@ -814,6 +826,8 @@ spec:
814826
type: object
815827
files:
816828
type: object
829+
additionalProperties:
830+
type: string
817831
clusters:
818832
type: array
819833
items:
@@ -1138,6 +1152,8 @@ spec:
11381152
properies:
11391153
name:
11401154
type: string
1155+
generateName:
1156+
type: string
11411157
zone:
11421158
type: object
11431159
required:
@@ -1282,9 +1298,11 @@ spec:
12821298
# preserveUnknownFields: false
12831299
validation:
12841300
openAPIV3Schema:
1301+
type: object
12851302
properties:
12861303
spec:
12871304
type: object
1305+
x-kubernetes-preserve-unknown-fields: true
12881306
properties:
12891307
watchNamespaces:
12901308
type: array
@@ -1371,7 +1389,7 @@ subjects:
13711389
# Possible Template Parameters:
13721390
#
13731391
# dev
1374-
# altinity/clickhouse-operator:0.9.9
1392+
# altinity/clickhouse-operator:0.10.0
13751393
# etc-clickhouse-operator-files
13761394
#
13771395
apiVersion: v1
@@ -1463,7 +1481,7 @@ data:
14631481
chConfigUserDefaultPassword: "default"
14641482
14651483
# Default host_regexp to limit network connectivity from outside
1466-
ChConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
1484+
chConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi})\\.{namespace}\\.svc\\.cluster\\.local$"
14671485
14681486
################################################
14691487
##
@@ -1507,7 +1525,7 @@ data:
15071525
# Possible Template Parameters:
15081526
#
15091527
# dev
1510-
# altinity/clickhouse-operator:0.9.9
1528+
# altinity/clickhouse-operator:0.10.0
15111529
# etc-clickhouse-operator-confd-files
15121530
#
15131531
apiVersion: v1
@@ -1522,7 +1540,7 @@ data:
15221540
# Possible Template Parameters:
15231541
#
15241542
# dev
1525-
# altinity/clickhouse-operator:0.9.9
1543+
# altinity/clickhouse-operator:0.10.0
15261544
# etc-clickhouse-operator-configd-files
15271545
#
15281546
apiVersion: v1
@@ -1569,7 +1587,7 @@ data:
15691587
# Possible Template Parameters:
15701588
#
15711589
# dev
1572-
# altinity/clickhouse-operator:0.9.9
1590+
# altinity/clickhouse-operator:0.10.0
15731591
# etc-clickhouse-operator-templatesd-files
15741592
#
15751593
apiVersion: v1
@@ -1668,7 +1686,7 @@ data:
16681686
# Possible Template Parameters:
16691687
#
16701688
# dev
1671-
# altinity/clickhouse-operator:0.9.9
1689+
# altinity/clickhouse-operator:0.10.0
16721690
# etc-clickhouse-operator-usersd-files
16731691
#
16741692
apiVersion: v1
@@ -1717,8 +1735,8 @@ data:
17171735
# Possible Template Parameters:
17181736
#
17191737
# dev
1720-
# altinity/clickhouse-operator:0.9.9
1721-
# altinity/metrics-exporter:0.9.9
1738+
# altinity/clickhouse-operator:0.10.0
1739+
# altinity/metrics-exporter:0.10.0
17221740
#
17231741
# Setup Deployment for clickhouse-operator
17241742
# Deployment would be created in kubectl-specified namespace
@@ -1761,7 +1779,7 @@ spec:
17611779
name: etc-clickhouse-operator-usersd-files
17621780
containers:
17631781
- name: clickhouse-operator
1764-
image: altinity/clickhouse-operator:0.9.9
1782+
image: altinity/clickhouse-operator:0.10.0
17651783
imagePullPolicy: Always
17661784
volumeMounts:
17671785
- name: etc-clickhouse-operator-folder
@@ -1826,7 +1844,7 @@ spec:
18261844
resource: limits.memory
18271845

18281846
- name: metrics-exporter
1829-
image: altinity/metrics-exporter:0.9.9
1847+
image: altinity/metrics-exporter:0.10.0
18301848
imagePullPolicy: Always
18311849
volumeMounts:
18321850
- name: etc-clickhouse-operator-folder

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ spec:
6969
# preserveUnknownFields: false
7070
validation:
7171
openAPIV3Schema:
72+
type: object
7273
properties:
7374
spec:
7475
type: object
76+
x-kubernetes-preserve-unknown-fields: true
7577
properties:
7678
# Need to be StringBool
7779
stop:
@@ -97,6 +99,8 @@ spec:
9799
- "disabled"
98100
- "Enabled"
99101
- "enabled"
102+
namespaceDomainPattern:
103+
type: string
100104
defaults:
101105
type: object
102106
properties:
@@ -185,6 +189,8 @@ spec:
185189
type: object
186190
files:
187191
type: object
192+
additionalProperties:
193+
type: string
188194
clusters:
189195
type: array
190196
items:
@@ -509,6 +515,8 @@ spec:
509515
properies:
510516
name:
511517
type: string
518+
generateName:
519+
type: string
512520
zone:
513521
type: object
514522
required:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ spec:
6969
# preserveUnknownFields: false
7070
validation:
7171
openAPIV3Schema:
72+
type: object
7273
properties:
7374
spec:
7475
type: object
76+
x-kubernetes-preserve-unknown-fields: true
7577
properties:
7678
# Need to be StringBool
7779
stop:
@@ -97,6 +99,8 @@ spec:
9799
- "disabled"
98100
- "Enabled"
99101
- "enabled"
102+
namespaceDomainPattern:
103+
type: string
100104
defaults:
101105
type: object
102106
properties:
@@ -185,6 +189,8 @@ spec:
185189
type: object
186190
files:
187191
type: object
192+
additionalProperties:
193+
type: string
188194
clusters:
189195
type: array
190196
items:
@@ -509,6 +515,8 @@ spec:
509515
properies:
510516
name:
511517
type: string
518+
generateName:
519+
type: string
512520
zone:
513521
type: object
514522
required:

deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-03-chopconf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ spec:
2424
# preserveUnknownFields: false
2525
validation:
2626
openAPIV3Schema:
27+
type: object
2728
properties:
2829
spec:
2930
type: object
31+
x-kubernetes-preserve-unknown-fields: true
3032
properties:
3133
watchNamespaces:
3234
type: array

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ spec:
6969
# preserveUnknownFields: false
7070
validation:
7171
openAPIV3Schema:
72+
type: object
7273
properties:
7374
spec:
7475
type: object
76+
x-kubernetes-preserve-unknown-fields: true
7577
properties:
7678
# Need to be StringBool
7779
stop:
@@ -97,6 +99,8 @@ spec:
9799
- "disabled"
98100
- "Enabled"
99101
- "enabled"
102+
namespaceDomainPattern:
103+
type: string
100104
defaults:
101105
type: object
102106
properties:
@@ -185,6 +189,8 @@ spec:
185189
type: object
186190
files:
187191
type: object
192+
additionalProperties:
193+
type: string
188194
clusters:
189195
type: array
190196
items:
@@ -509,6 +515,8 @@ spec:
509515
properies:
510516
name:
511517
type: string
518+
generateName:
519+
type: string
512520
zone:
513521
type: object
514522
required:
@@ -698,9 +706,11 @@ spec:
698706
# preserveUnknownFields: false
699707
validation:
700708
openAPIV3Schema:
709+
type: object
701710
properties:
702711
spec:
703712
type: object
713+
x-kubernetes-preserve-unknown-fields: true
704714
properties:
705715
# Need to be StringBool
706716
stop:
@@ -726,6 +736,8 @@ spec:
726736
- "disabled"
727737
- "Enabled"
728738
- "enabled"
739+
namespaceDomainPattern:
740+
type: string
729741
defaults:
730742
type: object
731743
properties:
@@ -814,6 +826,8 @@ spec:
814826
type: object
815827
files:
816828
type: object
829+
additionalProperties:
830+
type: string
817831
clusters:
818832
type: array
819833
items:
@@ -1138,6 +1152,8 @@ spec:
11381152
properies:
11391153
name:
11401154
type: string
1155+
generateName:
1156+
type: string
11411157
zone:
11421158
type: object
11431159
required:
@@ -1282,9 +1298,11 @@ spec:
12821298
# preserveUnknownFields: false
12831299
validation:
12841300
openAPIV3Schema:
1301+
type: object
12851302
properties:
12861303
spec:
12871304
type: object
1305+
x-kubernetes-preserve-unknown-fields: true
12881306
properties:
12891307
watchNamespaces:
12901308
type: array

0 commit comments

Comments
 (0)