Merge pull request #363 from Altinity/0.9.8

0.9.8
Altinity · Apr 27, 2020 · 69f093f · 69f093f
2 parents 13c343e + a7b7735
commit 69f093f
Show file tree

Hide file tree

Showing 31 changed files with 439 additions and 165 deletions.
diff --git a/cmd/operator/app/clickhouse_operator.go b/cmd/operator/app/clickhouse_operator.go
@@ -44,12 +44,6 @@ const (
 	defaultInformerFactoryResyncDebugPeriod = 60 * time.Second
 )
 
-const (
-	// TODO probably this should be added as a CLI/Config param
-	// Default number of controller threads running concurrently (used in case no other specified in config)
-	defaultControllerThreadsNum = 1
-)
-
 // CLI parameter variables
 var (
 	// versionRequest defines request for clickhouse-operator version report. Operator should exit after version printed
@@ -76,10 +70,6 @@ var (
 	chopInformerFactoryResyncPeriod = defaultInformerFactoryResyncPeriod
 )
 
-var (
-	controllerThreadsNum = defaultControllerThreadsNum
-)
-
 func init() {
 	flag.BoolVar(&versionRequest, "version", false, "Display clickhouse-operator version and exit")
 	flag.BoolVar(&debugRequest, "debug", false, "Debug run")
@@ -160,7 +150,7 @@ func Run() {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		chiController.Run(ctx, controllerThreadsNum)
+		chiController.Run(ctx)
 	}()
 	<-ctx.Done()
 	wg.Wait()

diff --git a/config/config-dev.yaml b/config/config-dev.yaml
@@ -108,3 +108,12 @@ v: "100"
 stderrthreshold: ""
 vmodule: ""
 log_backtrace_at: ""
+
+################################################
+##
+## Runtime parameters
+##
+################################################
+
+# Max number of concurrent reconciles in progress
+reconcileThreadsNumber: 5
diff --git a/config/config.d/03-clickhouse-querylog.xml b/config/config.d/03-clickhouse-querylog.xml
@@ -5,4 +5,5 @@
     <partition_by>toMonday(event_date)</partition_by>
     <flush_interval_milliseconds>7500</flush_interval_milliseconds>
 </query_log>
+<query_thread_log remove="1"/>
 </yandex>
diff --git a/config/config.yaml b/config/config.yaml
@@ -82,7 +82,7 @@ ChConfigNetworksHostRegexpTemplate: "(chi-{chi}-[^.]+\\d+-\\d+|clickhouse\\-{chi
 
 ################################################
 ##
-## Operator's access to ClickHouse instances
+## Access to ClickHouse instances
 ##
 ################################################
 
@@ -108,3 +108,12 @@ v: "1"
 stderrthreshold: ""
 vmodule: ""
 log_backtrace_at: ""
+
+################################################
+##
+## Runtime parameters
+##
+################################################
+
+# Max number of concurrent reconciles in progress
+reconcileThreadsNumber: 10
diff --git a/deploy/dev/clickhouse-operator-install-dev.yaml b/deploy/dev/clickhouse-operator-install-dev.yaml
@@ -1336,6 +1336,10 @@ spec:
               type: string
             log_backtrace_at:
               type: string
+            reconcileThreadsNumber:
+              type: integer
+              minimum: 1
+              maximum: 65535
 ---
 # Possible Template Parameters:
 #
@@ -1367,7 +1371,7 @@ subjects:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-files
 #
 apiVersion: v1
@@ -1463,7 +1467,7 @@ data:
     
     ################################################
     ##
-    ## Operator's access to ClickHouse instances
+    ## Access to ClickHouse instances
     ##
     ################################################
     
@@ -1489,12 +1493,21 @@ data:
     stderrthreshold: ""
     vmodule: ""
     log_backtrace_at: ""
+    
+    ################################################
+    ##
+    ## Runtime parameters
+    ##
+    ################################################
+    
+    # Max number of concurrent reconciles in progress
+    reconcileThreadsNumber: 10
 
 ---
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-confd-files
 #
 apiVersion: v1
@@ -1509,7 +1522,7 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-configd-files
 #
 apiVersion: v1
@@ -1550,12 +1563,14 @@ data:
         <partition_by>toMonday(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_log>
+    <query_thread_log remove="1"/>
     </yandex>
+
 ---
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-templatesd-files
 #
 apiVersion: v1
@@ -1632,6 +1647,7 @@ data:
         podTemplates:
           - name: default-oneperhost-pod-template
             distribution: "OnePerHost"
+
   default-storage-template.yaml.example: |
     apiVersion: "clickhouse.altinity.com/v1"
     kind: "ClickHouseInstallationTemplate"
@@ -1650,11 +1666,12 @@ data:
 
   readme: |
     Templates in this folder are packaged with an operator and available via 'useTemplate'
+
 ---
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-usersd-files
 #
 apiVersion: v1
@@ -1699,12 +1716,13 @@ data:
         </default>
       </profiles>
     </yandex>
+
 ---
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.7
-# altinity/metrics-exporter:0.9.7
+# altinity/clickhouse-operator:0.9.8
+# altinity/metrics-exporter:0.9.8
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -1747,7 +1765,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.9.7
+          image: altinity/clickhouse-operator:0.9.8
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -1812,7 +1830,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.9.7
+          image: altinity/metrics-exporter:0.9.8
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder

diff --git a/deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-03-chopconf.yaml b/deploy/dev/clickhouse-operator-install-yaml-template-01-section-crd-03-chopconf.yaml
@@ -78,3 +78,7 @@ spec:
               type: string
             log_backtrace_at:
               type: string
+            reconcileThreadsNumber:
+              type: integer
+              minimum: 1
+              maximum: 65535
diff --git a/deploy/operator/clickhouse-operator-install-crd.yaml b/deploy/operator/clickhouse-operator-install-crd.yaml
@@ -1336,3 +1336,7 @@ spec:
               type: string
             log_backtrace_at:
               type: string
+            reconcileThreadsNumber:
+              type: integer
+              minimum: 1
+              maximum: 65535
diff --git a/deploy/operator/clickhouse-operator-install-deployment.yaml b/deploy/operator/clickhouse-operator-install-deployment.yaml
@@ -1,7 +1,7 @@
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-files
 #
 apiVersion: v1
@@ -96,7 +96,7 @@ data:
     
     ################################################
     ##
-    ## Operator's access to ClickHouse instances
+    ## Access to ClickHouse instances
     ##
     ################################################
     
@@ -122,12 +122,21 @@ data:
     stderrthreshold: ""
     vmodule: ""
     log_backtrace_at: ""
+    
+    ################################################
+    ##
+    ## Runtime parameters
+    ##
+    ################################################
+    
+    # Max number of concurrent reconciles in progress
+    reconcileThreadsNumber: 10
 
 ---
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-confd-files
 #
 apiVersion: v1
@@ -141,7 +150,7 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-configd-files
 #
 apiVersion: v1
@@ -181,12 +190,14 @@ data:
         <partition_by>toMonday(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_log>
+    <query_thread_log remove="1"/>
     </yandex>
+
 ---
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-templatesd-files
 #
 apiVersion: v1
@@ -262,6 +273,7 @@ data:
         podTemplates:
           - name: default-oneperhost-pod-template
             distribution: "OnePerHost"
+
   default-storage-template.yaml.example: |
     apiVersion: "clickhouse.altinity.com/v1"
     kind: "ClickHouseInstallationTemplate"
@@ -280,11 +292,12 @@ data:
 
   readme: |
     Templates in this folder are packaged with an operator and available via 'useTemplate'
+
 ---
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
+# altinity/clickhouse-operator:0.9.8
 # etc-clickhouse-operator-usersd-files
 #
 apiVersion: v1
@@ -328,12 +341,13 @@ data:
         </default>
       </profiles>
     </yandex>
+
 ---
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.7
-# altinity/metrics-exporter:0.9.7
+# altinity/clickhouse-operator:0.9.8
+# altinity/metrics-exporter:0.9.8
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -375,7 +389,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.9.7
+          image: altinity/clickhouse-operator:0.9.8
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -440,7 +454,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.9.7
+          image: altinity/metrics-exporter:0.9.8
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder

diff --git a/deploy/operator/clickhouse-operator-install-template-crd.yaml b/deploy/operator/clickhouse-operator-install-template-crd.yaml
@@ -1336,3 +1336,7 @@ spec:
               type: string
             log_backtrace_at:
               type: string
+            reconcileThreadsNumber:
+              type: integer
+              minimum: 1
+              maximum: 65535