8000 0.15.0 by alex-zaitsev · Pull Request #743 · Altinity/clickhouse-operator · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
656adda
fixes according to https://github.com/Altinity/infra/compare/5cf0de38…
Slach Feb 17, 2021
a4362bf
Merge branch 'master' of github.com:Altinity/clickhouse-operator into…
Slach Mar 2, 2021
8275726
altinity/clickhouse-backup:0.21.0 from master current backup alerts …
Slach Mar 5, 2021
65586cb
altinity/clickhouse-backup:1.0.1 from dev current backup improved al…
Slach Mar 5, 2021
2d5e00f
tested `altinity/clickhouse-backup:1.0.2`
Slach Mar 18, 2021
e960b8c
add ClickhouseDoesntRunTooLong tested `altinity/clickhouse-backup:1.0…
Slach Mar 22, 2021
d051c14
rename alert to ClickhouseBackupDoesntRunTooLong
Slach Mar 22, 2021
6fd796c
fix alert expressions for ClickHouseBackupTooShort
Slach Mar 23, 2021
4f378da
fix corner cases for ClickHouseBackupSizeChanged
Slach Mar 24, 2021
2c8b250
Merge branch 'master' of github.com:Altinity/clickhouse-operator into…
Slach Mar 26, 2021
84e5c74
fix ClickHouseBackupSizeChanged expression and template, fix security…
Slach Mar 26, 2021
6470e5e
increase ClickhouseBackupDoesntRunTooLong threshold to 36 hours
Slach Mar 28, 2021
41ef0cc
1.0.4 released tested with securityContext, fix ClickHouseBackupTooSh…
Slach Mar 30, 2021
53364cf
1.0.4 tested, some tests configs fixed
Slach Mar 30, 2021
9645936
1.0.5 test passes, also API_CREATE_INTEGRATION_TABLES tested
Slach Apr 4, 2021
b0bb70f
0.15.0
sunsingerus Apr 26, 2021
fd4aaff
env:manifests 0.15.0
sunsingerus Apr 26, 2021
3b98d78
Merge branch 'master' of github.com:Altinity/clickhouse-operator into…
Slach Apr 26, 2021
78dfdb6
test_backup_alerts.py passed on `altinity/clickhouse-backup:1.0.6`
Slach Apr 26, 2021
b1ec97a
update clickhouse-backup image in documentation to 1.0.6
Slach Apr 26, 2021
7f4cb0d
Extra delay to slow down pod startup
alex-zaitsev Apr 29, 2021
e9f7a70
Allow mntr command for zookeeper
filimonov May 6, 2021
4378422
Merge pull request #693 from filimonov/zookeeper_add_mntr
Slach May 6, 2021
7dfa75b
add ClickHouseRemoteBackupSizeZero
Slach May 10, 2021
742d55a
0.14.1
sunsingerus May 11, 2021
d5cb1f0
env: rebuild manifests
sunsingerus May 11, 2021
4e8c9f8
dev: switch to cluster('all-sharded')
sunsingerus May 11, 2021
b99e77e
test: migrate from 0.14.0
sunsingerus May 11, 2021
34518b7
dev: typo
sunsingerus May 11, 2021
398b357
chop config watchNamespaces supports regexp
TCeason May 12, 2021
7638f0a
Merge pull request #699 from TCeason/watchns_support_regexp
Slach May 12, 2021
6029054
Better tests for volume rescale
alex-zaitsev May 14, 2021
95ecad5
Test for loosing the volume during scaling down and up
alex-zaitsev May 15, 2021
0e12a23
dev: merge with 0.14.1
sunsingerus May 25, 2021
1649f45
dev: query_log
sunsingerus May 25, 2021 10BC8
760b962
dev: part_log
sunsingerus May 25, 2021
934558e
env: max_table_size_to_drop
sunsingerus May 25, 2021
49221b7
dev: rename config files
sunsingerus May 25, 2021
c08a157
env: rebuild manifests with updated config
sunsingerus May 25, 2021
08b61b5
dev: extract unzipper into query and simplify schemer
sunsingerus May 25, 2021
57e8c08
dev: fix column unzipper
sunsingerus May 25, 2021
d0f4b82
env: config files
sunsingerus May 25, 2021
05f1b81
test: rearrange while test 21 failing
sunsingerus May 27, 2021
b138659
dev: extract cluster from schemer
sunsingerus May 27, 2021
d0e550f
dev: extract query all
sunsingerus May 27, 2021
268ff3f
dev: schemer functions
sunsingerus May 27, 2021
292f4b9
dev: simplify replicas search in cluster
sunsingerus May 27, 2021
ebfca3d
upgrade grafana-operator to 3.10.1
Slach May 27, 2021
0be40c8
dev: cluster sql functions
sunsingerus May 27, 2021
f410efc
dev: move nil logger
sunsingerus May 27, 2021
0fbd14c
dev: use nil logger in retrier
sunsingerus May 27, 2021
f068d4c
split zookeeper and clickhouse alert rules to separate yaml manifests…
Slach May 27, 2021
b4c0e05
dev: exec vx query
sunsingerus May 27, 2021
70290db
dev: verbocity
sunsingerus May 27, 2021
5dd630a
dev: extract retrier
sunsingerus May 27, 2021
087e3b1
dev: introduce silent announcer
sunsingerus May 27, 2021
540e595
dev: slicent CHI annopuncer
sunsingerus May 27, 2021
035619d
dev: localize logger for connector
sunsingerus May 27, 2021
2f5c4fd
dev: localize logger for cluster
sunsingerus May 27, 2021
17467ec
dev: silent calls
sunsingerus May 27, 2021
8a0687f
replace .pod to .pod_name
Slach May 28, 2021
51aff0b
Merge pull request #707 from Altinity/improve_prometheus_alerts
Slach May 28, 2021
74d4a46
Merge pull request #706 from Altinity/update_grafana_operator
Slach May 28, 2021
3d23f11
fixes for exported_namespace in all ClickHouse panels, and little bit…
Slach May 28, 2021
3d22644
Merge pull request #710 from Altinity/improve_grafana_dashboards
Slach May 28, 2021
27f210a
rollback grafana-operator to 3.9.0
Slach May 31, 2021
2e4792b
Merge pull request #712 from Altinity/improve_monitoring_deploy
Slach May 31, 2021
531932a
dev: clarify retrier
sunsingerus May 31, 2021
e1506dc
dev: include new fields in code generator
sunsingerus May 31, 2021
aa02e5c
dev: cluster endpoint credentials
sunsingerus May 31, 2021
668b51a
dev: endpoint credentials
sunsingerus May 31, 2021
1756d24
dev: introduce timeouts as separate entity
sunsingerus May 31, 2021
65a721e
dev: adopt new retrier in cluter
sunsingerus May 31, 2021
5778af6
dev: minor
sunsingerus May 31, 2021
696f837
dev: ConnectionParams are a wrapper now
sunsingerus May 31, 2021
b4653ec
dev: adopt new connection in poool
sunsingerus May 31, 2021
5370d01
dev: clarify connection entity
sunsingerus May 31, 2021
dfedbd8
dev: adopt schemer for new connection
sunsingerus May 31, 2021
e31809a
dev: adopt fetcher
sunsingerus May 31, 2021
7d9be41
Merge remote-tracking branch 'altinity/0.15.0' into 0.15.0
sunsingerus May 31, 2021
209bef0
dev: minor SQLs
sunsingerus May 31, 2021
884911a
dev: clarify SQL
sunsingerus May 31, 2021
73e636b
dev: introduce cluster name
sunsingerus Jun 1, 2021
09fd4ab
dev: exctract runner func
sunsingerus Jun 1, 2021
2eb672f
dev: introduce query options
sunsingerus Jun 1, 2021
5e20997
dev: continue schemer simplifications
sunsingerus Jun 1, 2021
3ed038a
dev: extract replica name as separate Namer function
sunsingerus Jun 1, 2021
e6de931
dev: introduce sync replica table schemer
sunsingerus Jun 1, 2021
28d2e1c
switch to k8s 1.17.x and increase scrape_interval try to fix https://…
Slach Jun 1, 2021
f7b15df
Merge pull request #713 from Altinity/improve_monitoring_deploy
Slach Jun 1, 2021
6b94679
dev: unify CreateFQDNs function to simplify FQDN operations
sunsingerus Jun 1, 2021
3743568
fix namespace in quick start
orginux Jun 1, 2021
4bf35c9
Merge branch '0.15.0' of github.com:Altinity/clickhouse-operator into…
Slach Jun 3, 2021
36ec88c
fix altinity/clickhouse-backup version in config files
Slach Jun 3, 2021
48988b0
restore OpenAPIv2.pb.go
Slach Jun 3, 2021
dc611b9
fix altinity/clickhouse-backup version in config files
Slach Jun 3, 2021
64bcd14
return default clickhouse version to latest altinity stable
Slach Jun 3, 2021
1bfa163
Merge pull request #652 from Altinity/add_backup_alerts
Slach Jun 3, 2021
bb1cc23
dev: retrier
sunsingerus Jun 7, 2021
4ce33aa
dev: troubleshhot
sunsingerus Jun 7, 2021
d218cf5
dev: yaml teplates for troubleshhot
sunsingerus Jun 7, 2021
d2cff44
env: manifests
sunsingerus Jun 7, 2021
8f60906
Merge remote-tracking branch 'altinity/0.15.0' into 0.15.0
sunsingerus Jun 7, 2021
818dfae
dev: clarify pod personalization
sunsingerus Jun 7, 2021
24825a0
dev: enhance stringbool
sunsingerus Jun 7, 2021
0bdb158
dev: new balues for stringbool in manifest templates
sunsingerus Jun 7, 2021
56dd3e7
env: generate manifests
sunsingerus Jun 7, 2021
6f167dd
dev: replica nmaer
sunsingerus Jun 7, 2021
3de23bd
example for https://t.me/clickhouse_en/34449
Slach Jun 11, 2021
02df59b
worked approach with initContainer
Slach Jun 11, 2021
845fcea
Merge pull request #720 from Altinity/add_protobuf_schema_example
Slach Jun 11, 2021
9312088
dev: introduce QueryResult
sunsingerus Jun 11, 2021
16bd4e5
dev: duration helpers
sunsingerus Jun 11, 2021
582f8e1
dev: introduce timouts to query options
sunsingerus Jun 11, 2021
45cdb28
dev: query result
sunsingerus Jun 11, 2021
8e0cd92
dev: introduce timeouts per query
sunsingerus Jun 11, 2021
c3ce746
dev: propagate options
sunsingerus Jun 11, 2021
9a03474
dev: exlude replica from naming
sunsingerus Jun 11, 2021
061deb6
dev: introduce silent mode in query options
sunsingerus Jun 11, 2021
6f49ae1
dev: clarify schemer
sunsingerus Jun 11, 2021
63a8630
dev: introduce number of entities
sunsingerus Jun 11, 2021
74ae831
dev: reconcile chi shrink protocol
sunsingerus Jun 11, 2021
f5b4f5b
Merge remote-tracking branch 'altinity/0.15.0' into 0.15.0
sunsingerus Jun 11, 2021
a062f9e
dev: skip err
sunsingerus Jun 11, 2021
932e67c
dev: minor
sunsingerus Jun 11, 2021
c373ee8
dev: poller options
sunsingerus Jun 14, 2021
3e3d325
dev: remove queues
sunsingerus Jun 14, 2021
cb23d95
dev: minor
sunsingerus Jun 14, 2021
7e75718
minor
sunsingerus Jun 14, 2021
abf9a9d
dev: clarify
sunsingerus Jun 14, 2021
55b474a
dev: affinity
sunsingerus Jun 14, 2021
eed5030
dev: clusters
sunsingerus Jun 14, 2021
0b8b660
dev: reclaim labeler is not object-related
sunsingerus Jun 14, 2021
54d7af7
dev: unbound functions
sunsingerus Jun 14, 2021
f1af05d
clarification
sunsingerus Jun 14, 2021
1191809
dev: move funcs to statuc
sunsingerus Jun 14, 2021
c2acf5f
dev: prepare chop for globals
sunsingerus Jun 14, 2021
be7f721
dev: reuse chop
sunsingerus Jun 14, 2021
95f9e4e
dev: localise affinity
sunsingerus Jun 14, 2021
982e08f
dev: extract chop normalizer
sunsingerus Jun 14, 2021
bfc1b48
dev: create two global namers
sunsingerus Jun 14, 2021
1cc0bb2
dev: extract chop from creator
sunsingerus Jun 14, 2021
2355071
dev: simplify labeler
sunsingerus Jun 14, 2021
1e9c2b2
dev: adopt simplified models
sunsingerus Jun 14, 2021
82cd660
dev: clear rnd
sunsingerus Jun 14, 2021
274fa8a
Example for schema bootstraping Clickhouse cluster were added in docs
solyard Jun 15, 2021
e404462
small fixes in test to allow test pass
Slach Jun 18, 2021
da27791
Merge branch '0.15.0' of github.com:Altinity/clickhouse-operator into…
Slach Jun 18, 2021
c884c48
fix Replication queue panel (replace metric gauge to event counter fo…
Slach Jun 18, 2021
3f5860b
Merge pull request #724 from Altinity/improve_grafana_dashboards
Slach Jun 18, 2021
b015810
clean quick_start.md for clarify https://github.com/Altinity/clickhou…
Slach Jun 20, 2021
0109563
Merge pull request #726 from Altinity/improve_docs
Slach Jun 20, 2021
9e62093
dev: extract namers
sunsingerus Jun 21, 2021
10b59c2
fixes for Zookeeper Cache Hit Rate alerts
Slach Jun 23, 2021
31ac961
Merge branch '0.15.0' of github.com:Altinity/clickhouse-operator into…
Slach Jun 23, 2021
f2ef962
Merge pull request #728 from Altinity/improve_prometheus_alerts
Slach Jun 23, 2021
42cbeeb
Merge remote-tracking branch 'altinity/0.15.0' into 0.15.0
sunsingerus Jun 25, 2021
d254b4c
dev: extract reconcilling from chi
sunsingerus Jun 25, 2021
d3f8d48
dev: introduce propagation timeout
sunsingerus Jun 25, 2021
a5eb2ac
dev: defaults
sunsingerus Jun 25, 2021
ac92477
dev: reconcile cm with to
sunsingerus Jun 25, 2021
055fe64
minor
sunsingerus Jun 25, 2021
3a95e0d
env: timoeut vlidation
sunsingerus Jun 25, 2021
92ebb70
env: generate manifests
sunsingerus Jun 25, 2021
69185ef
introduce reconciling opts
sunsingerus Jun 25, 2021
d2fcb7c
normalize cleanup config
sunsingerus Jun 25, 2021
2109fcd
intrdocue separated Reconciled and Failed registries
sunsingerus Jun 25, 2021
ca434f5
dev: introduce has family functions into registry
sunsingerus Jun 25, 2021
f1ec170
unify error handling
sunsingerus Jun 25, 2021
7a5466b
dev: purge objects with reconciling properties
sunsingerus Jun 25, 2021
6e8601b
generator
sunsingerus Jun 25, 2021
10c71ea
env reconcile opts in main manifest
sunsingerus Jun 25, 2021
a53fc50
reconcile opts template verification
sunsingerus Jun 25, 2021
791c897
env: manifests
sunsingerus Jun 25, 2021
ff7a2b4
explicit defaults
sunsingerus Jun 25, 2021
8fb812d
normalize cleanupsd
sunsingerus Jun 25, 2021
6e29540
IsNil() should check Kind()
sunsingerus Jun 25, 2021
239823e
elem on ptr
sunsingerus Jun 25, 2021
fc4bad3
dev: polish announcer
sunsingerus Jun 28, 2021
c7a05db
dev: extract registries from context
sunsingerus Jun 28, 2021
faa34b9
test: move test 21 back into line
sunsingerus Jun 28, 2021
6481f1b
dev: mergers
sunsingerus Jun 28, 2021
0ee3603
docs: reconcililng in descripiton
sunsingerus Jun 28, 2021
d714a68
dev: nillable
sunsingerus Jun 28, 2021
6849d31
dev: mergers
sunsingerus Jun 28, 2021
d88d6f0
dev: move action plan
sunsingerus Jun 28, 2021
29c8e74
Merge pull request #722 from solyard/master
sunsingerus Jun 29, 2021
76218a8
env: include gocard checker
sunsingerus Jun 29, 2021
5086507
test_014
alex-zaitsev Jul 7, 2021
1647b07
rename `ClickHouseServerDown` to `ClickHouseServerPossibleDown` and r…
Slach Jul 8, 2021
e6a1841
simplify
sunsingerus Jul 8, 2021
6b66fa7
dev: reference the same host getter
sunsingerus Jul 8, 2021
0048f6f
fix review comments https://github.com/Altinity/clickhouse-operator/p…
Slach Jul 8, 2021
56ff6a6
Merge pull request #736 from Altinity/improve_prometheus_alerts
Slach Jul 8, 2021
2e291d7
dev: env log operator
sunsingerus Jul 8, 2021
3911785
linter
sunsingerus Jul 8, 2021
7c55935
return back action plan and drop replica on prev cluster
sunsingerus Jul 8, 2021
86ecd40
description
sunsingerus Jul 8, 2021
93aa58b
env: skip operator output files
sunsingerus Jul 8, 2021
b587d08
Merge remote-tracking branch 'altinity/0.15.0' into 0.15.0
sunsingerus Jul 8, 2021
57fa9a1
dev: fix options normalizer
sunsingerus Jul 8, 2021
57e310a
dev: enhance connection params
sunsingerus Jul 8, 2021
694b506
dev: enhance kube machinery
sunsingerus Jul 8, 2021
157ed2d
use formatter for sql
sunsingerus Jul 8, 2021
e75a972
dev: linter complains
sunsingerus Jul 8, 2021
fcd1902
dev: linter
sunsingerus Jul 8, 2021
4de01c7
dev: enhanse for linter
sunsingerus Jul 8, 2021
b22daba
dev: separate drop replica host and dropped host
sunsingerus Jul 8, 2021
a22cb09
dev: fix first host
sunsingerus Jul 8, 2021
7ba5fd5
dev: linter suggestions
sunsingerus Jul 8, 2021
d4569c4
test: move test 21
sunsingerus Jul 8, 2021
6b9caa7
dev: linter
sunsingerus Jul 8, 2021
22af31e
dev: linter
sunsingerus Jul 8, 2021
2e79861
added OwnerReferences field into generated objects
preved911 Jul 11, 2021
4423657
dev: CHI templates
sunsingerus Jul 12, 2021
e5a41de
dev: linter
sunsingerus Jul 12, 2021
24bf0fe
dev: troubleshoot should be ||
sunsingerus Jul 12, 2021
45db744
fix namespace in quick start
orginux Jul 12, 2021
d3577c3
Merge branch '0.15.0' into fix-namspace-in-quick-start
orginux Jul 12, 2021
9c35567
fix namespace `kube-system`
orginux Jul 12, 2021
0621b26
Merge pull request #715 from orginux/fix-namspace-in-quick-start
Slach Jul 13, 2021
553ff8d
Troubleshooting test
alex-zaitsev Jul 13, 2021
b0f3d04
update zookeeper to 3.7.0 and improve installation standaloneEnabled,…
Slach Jul 13, 2021
09066fc
dev: robust StatefulSet reconciler
sunsingerus Jul 13, 2021
24af1d5
dev: troubleshooter can insert command, not update it
sunsingerus Jul 13, 2021
d79ed37
dev: rollback strategy from stat failed update
sunsingerus Jul 13, 2021
04a7a16
dev: make dev comfig more production-like
sunsingerus Jul 13, 2021
be3b506
dev: minor
sunsingerus Jul 13, 2021
d282ce5
Test configmap deployment
alex-zaitsev Jul 14, 2021
9e441df
dev: report ConfigMap propagation timeout
sunsingerus Jul 14, 2021
0529386
dev: explicitly log timeouts and fix duration
sunsingerus Jul 14, 2021
c295416
test: name clearer
sunsingerus Jul 14, 2021
3886180
Better tests
alex-zaitsev Jul 14, 2021
8d931fc
Merge branch '0.15.0' of https://github.com/Altinity/clickhouse-opera…
alex-zaitsev Jul 14, 2021
2b31c29
dev: return delete tables to delete process
sunsingerus Jul 14, 2021
ec1252b
dev: in troubleshooting mode append sleep to existing command and hop…
sunsingerus Jul 14, 2021
62f655f
test: fix test troubleshooting
sunsingerus Jul 14, 2021
ee0bb00
minor
sunsingerus Jul 14, 2021
105780c
test: 27 should wait until operator completed with initial CHI
sunsingerus Jul 14, 2021
daa7d2d
dev: exit on ctx closed
sunsingerus Jul 14, 2021
6d05692
update tests
alex-zaitsev Jul 15, 2021
d5b820f
dev: add trace for cluster check
sunsingerus Jul 15, 2021
9e4e896
dev: silence host cluster poll error
sunsingerus Jul 15, 2021
548c8f6
test; use short notation
sunsingerus Jul 15, 2021
b09c6cb
dev: introduce dns cache drop
sunsingerus Jul 15, 2021
0927fe5
dev: return back one sql
sunsingerus Jul 15, 2021
a98b768
Merge pull request #737 from preved911/dev/add_ownerreferences_field_…
sunsingerus Jul 15, 2021
a6f8629
rollback zookeeper to 3.6.3 and setup standaloneEnabled=false and add…
Slach Jul 16, 2021
762621d
rollback zookeeper to 3.6.3 and setup standaloneEnabled=false and add…
Slach Jul 16, 2021
be4ffc9
Merge pull request #740 from Altinity/improve_zookeeper_scaleout
Slach Jul 19, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ dev/log
.vagrant
/.DS_Store

operator_output
48 changes: 29 additions & 19 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Vagrant.configure(2) do |config|
config.vm.box_check_update = false

if get_provider == "hyperv"
config.vm.synced_folder ".", "/vagrant", type: "smb", smb_username: ENV['USERNAME'], smb_password: ENV['PASSWORD'], mount_options: ["domain="+ENV['USERDOMAIN'], "user="+ENV['USERNAME'], "vers=3.0"," mfsymlinks"]
config.vm.synced_folder ".", "/vagrant", type: "smb", smb_username: ENV['USERNAME'], smb_password: ENV['PASSWORD'], mount_options: ["vers=3.0"]
else
config.vm.synced_folder ".", "/vagrant"
end
Expand All @@ -35,7 +35,6 @@ Vagrant.configure(2) do |config|
config.timezone.value = "UTC"
end


config.vm.provider "virtualbox" do |vb|
vb.gui = false
vb.cpus = total_cpus
Expand All @@ -53,7 +52,7 @@ Vagrant.configure(2) do |config|
# hv.default_nic_type = "virtio"
hv.cpus = total_cpus
hv.maxmemory = "6144"
hv.memory = "2048"
hv.memory = "6144"
hv.enable_virtualization_extensions = true
hv.linked_clone = true
hv.vm_integration_services = {
Expand Down Expand Up @@ -92,7 +91,7 @@ Vagrant.configure(2) do |config|

apt-get update
apt-get install --no-install-recommends -y apt-transport-https ca-certificates software-properties-common curl
apt-get install --no-install-recommends -y htop ethtool mc curl wget jq socat git
apt-get install --no-install-recommends -y htop ethtool mc curl wget jq socat git make gcc g++

# yq
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CC86BB64
Expand Down Expand Up @@ -138,8 +137,10 @@ Vagrant.configure(2) do |config|
curl -sL https://github.com/liggitt/audit2rbac/releases/download/v${AUDIT2RBAC_VERSION}/audit2rbac-linux-amd64.tar.gz | tar -zxvf - -C /usr/local/bin

# minikube
MINIKUBE_VERSION=1.18.1
# MINIKUBE_VERSION=1.18.1
# MINIKUBE_VERSION=1.19.0
# MINIKUBE_VERSION=1.20.0
MINIKUBE_VERSION=1.22.0
wget -c --progress=bar:force:noscroll -O /usr/local/bin/minikube https://github.com/kubernetes/minikube/releases/download/v${MINIKUBE_VERSION}/minikube-linux-amd64
chmod +x /usr/local/bin/minikube
# required for k8s 1.18+
Expand All @@ -150,9 +151,12 @@ Vagrant.configure(2) do |config|
# K8S_VERSION=${K8S_VERSION:-1.15.12}
# K8S_VERSION=${K8S_VERSION:-1.16.15}
# K8S_VERSION=${K8S_VERSION:-1.17.17}
# K8S_VERSION=${K8S_VERSION:-1.18.18}
# K8S_VERSION=${K8S_VERSION:-1.19.10}
K8S_VERSION=${K8S_VERSION:-1.20.6}
# K8S_VERSION=${K8S_VERSION:-1.18.19}
# K8S_VERSION=${K8S_VERSION:-1.19.13}
# performance issue 1.20.x, 1.21.x, only 1.22 will good to start
# https://github.com/kubernetes/kubeadm/issues/2395
# K8S_VERSION=${K8S_VERSION:-1.20.9}
K8S_VERSION=${K8S_VERSION:-1.21.3}
export VALIDATE_YAML=true

killall kubectl || true
Expand Down Expand Up @@ -187,15 +191,6 @@ EOF
sudo -H -u vagrant minikube addons enable ingress-dns
sudo -H -u vagrant minikube addons enable metrics-server

# minikube delete
# rm -rf /tmp/juju*
# minikube config set vm-driver none
# minikube config set kubernetes-version ${K8S_VERSION}
# minikube start
# minikube addons enable ingress
# minikube addons enable ingress-dns
# minikube addons enable metrics-server

#krew
(
curl -fsSLO "https://github.com/kubernetes-sigs/krew/releases/latest/download/krew.tar.gz" &&
Expand All @@ -213,9 +208,11 @@ EOF
kubectl krew install minio
# look to https://kubernetes.io/docs/tasks/debug-application-cluster/debug-running-pod/#ephemeral-container
# kubectl krew install debug
chown -R vagrant:vagrant /home/vagrant/.krew

cd /vagrant/
git_branch=$(git rev-parse --abbrev-ref HEAD /vagrant/)

git_branch=$(git rev-parse --abbrev-ref HEAD)
export OPERATOR_RELEASE=$(cat release)
export BRANCH=${BRANCH:-$git_branch}
export OPERATOR_NAMESPACE=${OPERATOR_NAMESPACE:-kube-system}
Expand All @@ -234,6 +231,17 @@ EOF
bash -xe ./create-prometheus.sh
cd /vagrant/

export MINIO_NAMESPACE=${MINIO_NAMESPACE:-minio}
cd /vagrant/deploy/minio/
kubectl delete ns ${MINIO_NAMESPACE} || true
bash -xe ./install-minio-operator.sh
bash -xe ./install-minio.sh
# kubectl create ns ${MINIO_NAMESPACE}
# kubectl minio init --namespace ${MINIO_NAMESPACE}
# kubectl minio tenant create --name minio --namespace ${MINIO_NAMESPACE} --servers 1 --volumes 4 --capacity 10Gi --storage-class standard

cd /vagrant/

export GRAFANA_NAMESPACE=${GRAFANA_NAMESPACE:-grafana}
cd /vagrant/deploy/grafana/grafana-with-grafana-operator/
kubectl delete ns ${GRAFANA_NAMESPACE} || true
Expand Down Expand Up @@ -267,9 +275,11 @@ EOF
pip3 install -r /vagrant/tests/requirements.txt

python3 /vagrant/tests/test_metrics_alerts.py
python3 /vagrant/tests/test.py -->
python3 /vagrant/tests/test_zookeeper.py
python3 /vagrant/tests/test_backup_alerts.py
python3 /vagrant/tests/test_examples.py
python3 /vagrant/tests/test_metrics_exporter.py
python3 /vagrant/tests/test.py

# audit2rbac
kubectl logs kube-apiserver-minikube -n kube-system | grep audit.k8s.io/v1 > /tmp/audit2rbac.log
Expand Down
5 changes: 2 additions & 3 deletions cmd/metrics_exporter/app/metrics_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ func Run() {
kubeClient, chopClient := chop.GetClientset(kubeConfigFile, masterURL)

// Create operator instance
chop := chop.GetCHOp(kubeClient, chopClient, chopConfigFile)
chop.SetupLog()
chop.New(kubeClient, chopClient, chopConfigFile)
log.Info(chop.Config().String(true))

exporter := metrics.StartMetricsREST(
Expand All @@ -111,7 +110,7 @@ func Run() {
chiListPath,
)

exporter.DiscoveryWatchedCHIs(chop, chopClient)
exporter.DiscoveryWatchedCHIs(chopClient)

<-ctx.Done()
}
4 changes: 1 addition & 3 deletions cmd/operator/app/clickhouse_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ func Run() {
kubeClient, chopClient := chop.GetClientset(kubeConfigFile, masterURL)

// Create operator instance
chop := chop.GetCHOp(kubeClient, chopClient, chopConfigFile)
chop.SetupLog()
chop.New(kubeClient, chopClient, chopConfigFile)
log.V(1).A().Info("Log options parsed")
log.Info(chop.Config().String(true))

Expand All @@ -117,7 +116,6 @@ func Run() {

// Create Controller
chiController := chi.NewController(
chop,
chopClient,
kubeClient,
chopInformerFactory,
Expand Down
5 changes: 3 additions & 2 deletions config/config-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ chiTemplatesPath: templates.d
################################################

# How many seconds to wait for created/updated StatefulSet to be Ready
statefulSetUpdateTimeout: 600
statefulSetUpdateTimeout: 300

# How many seconds to wait between checks for created/updated StatefulSet status
statefulSetUpdatePollPeriod: 10
Expand All @@ -49,7 +49,7 @@ statefulSetUpdatePollPeriod: 10
# 1. abort - do nothing, just break the process and wait for admin
# 2. delete - delete newly created problematic StatefulSet
# 3. ignore - ignore error, pretend nothing happened and move on to the next StatefulSet
onStatefulSetCreateFailureAction: delete
onStatefulSetCreateFailureAction: ignore

# What to do in case updated StatefulSet is not in Ready after `statefulSetUpdateTimeout` seconds
# Possible options:
Expand Down Expand Up @@ -87,6 +87,7 @@ chConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi
################################################

# ClickHouse credentials (username, password and port) to be used by operator to connect to ClickHouse instances for:
# for:
# 1. Metrics requests
# 2. Schema maintenance
# 3. DROP DNS CACHE
Expand Down
9 changes: 9 additions & 0 deletions config/config.d/01-clickhouse-03-query_log.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<yandex>
<query_log replace="1">
<database>system</database>
<table>query_log</table>
<engine>Engine = MergeTree PARTITION BY event_date ORDER BY event_time TTL event_date + interval 30 day</engine>
<flush_interval_milliseconds>7500</flush_interval_milliseconds>
</query_log>
<query_thread_log remove="1"/>
</yandex>
8 changes: 8 additions & 0 deletions config/config.d/01-clickhouse-04-part_log.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<yandex>
<part_log replace="1">
<database>system</database>
<table>part_log</table>
<engine>Engine = MergeTree PARTITION BY event_date ORDER BY event_time TTL event_date + interval 30 day</engine>
<flush_interval_milliseconds>7500</flush_interval_milliseconds>
</part_log>
</yandex>
9 changes: 0 additions & 9 deletions config/config.d/03-clickhouse-querylog.xml

This file was deleted.

8 changes: 0 additions & 8 deletions config/config.d/04-clickhouse-partlog.xml

This file was deleted.

Loading
0