Merge pull request #229 from Altinity/0.8.0

0.8.0

Author: alex-zaitsev

cmd/metrics_exporter/app/metrics_exporter.go

@@ -18,13 +18,15 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/altinity/clickhouse-operator/pkg/apis/metrics"
-	chopconfig "github.com/altinity/clickhouse-operator/pkg/config"
-	"github.com/altinity/clickhouse-operator/pkg/version"
-	"github.com/golang/glog"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"github.com/golang/glog"
+
+	"github.com/altinity/clickhouse-operator/pkg/apis/metrics"
+	"github.com/altinity/clickhouse-operator/pkg/chop"
+	"github.com/altinity/clickhouse-operator/pkg/version"
 )
 
 // Prometheus exporter defaults
@@ -77,20 +79,26 @@ func Run() {
 	}()
 
 	//
-	// Create operator config
+	// Create operator instance
 	//
-	chopConfigManager := chopconfig.NewConfigManager(nil, chopConfigFile)
-	if err := chopConfigManager.Init(); err != nil {
-		glog.Fatalf("Unable to build config file %v\n", err)
+	chop := chop.NewChop(version.Version, nil, chopConfigFile)
+	if err := chop.Init(); err != nil {
+		glog.Fatalf("Unable to init CHOP instance %v\n", err)
 		os.Exit(1)
 	}
 
 	glog.V(1).Info("Starting metrics exporter\n")
 
 	metrics.StartMetricsREST(
-		chopConfigManager.Config().ChUsername, chopConfigManager.Config().ChPassword, chopConfigManager.Config().ChPort,
-		metricsEP, metricsPath,
-		chiListEP, chiListPath,
+		chop.Config().ChUsername,
+		chop.Config().ChPassword,
+		chop.Config().ChPort,
+
+		metricsEP,
+		metricsPath,
+
+		chiListEP,
+		chiListPath,
 	)
 
 	<-ctx.Done()

cmd/operator/app/clickhouse_operator.go

@@ -26,12 +26,13 @@ import (
 	"syscall"
 	"time"
 
-	chopconfig "github.com/altinity/clickhouse-operator/pkg/config"
+	"github.com/altinity/clickhouse-operator/pkg/chop"
+	"github.com/altinity/clickhouse-operator/pkg/controller/chi"
 	"github.com/altinity/clickhouse-operator/pkg/version"
 
 	chopclientset "github.com/altinity/clickhouse-operator/pkg/client/clientset/versioned"
 	chopinformers "github.com/altinity/clickhouse-operator/pkg/client/informers/externalversions"
-	"github.com/altinity/clickhouse-operator/pkg/controller/chi"
+
 	kubeinformers "k8s.io/client-go/informers"
 	kube "k8s.io/client-go/kubernetes"
 	kuberest "k8s.io/client-go/rest"
@@ -45,7 +46,7 @@ const (
 	defaultMetricsEndpoint                  = ":8888"
 	metricsPath                             = "/metrics"
 	defaultInformerFactoryResyncPeriod      = 60 * time.Second
-	defaultInformerFactoryResyncDebugPeriod = 600 * time.Second
+	defaultInformerFactoryResyncDebugPeriod = 60 * time.Second
 )
 
 const (
@@ -167,11 +168,11 @@ func Run() {
 	kubeClient, chopClient := createClientsets(kubeConfig)
 
 	//
-	// Create operator config
+	// Create operator instance
 	//
-	chopConfigManager := chopconfig.NewConfigManager(chopClient, chopConfigFile)
-	if err := chopConfigManager.Init(); err != nil {
-		glog.Fatalf("Unable to build config file %v\n", err)
+	chop := chop.NewChop(version.Version, chopClient, chopConfigFile)
+	if err := chop.Init(); err != nil {
+		glog.Fatalf("Unable to init CHOP instance %v\n", err)
 		os.Exit(1)
 	}
 
@@ -181,20 +182,19 @@ func Run() {
 	kubeInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(
 		kubeClient,
 		kubeInformerFactoryResyncPeriod,
-		kubeinformers.WithNamespace(chopConfigManager.Config().GetInformerNamespace()),
+		kubeinformers.WithNamespace(chop.Config().GetInformerNamespace()),
 	)
 	chopInformerFactory := chopinformers.NewSharedInformerFactoryWithOptions(
 		chopClient,
 		chopInformerFactoryResyncPeriod,
-		chopinformers.WithNamespace(chopConfigManager.Config().GetInformerNamespace()),
+		chopinformers.WithNamespace(chop.Config().GetInformerNamespace()),
 	)
 
 	//
 	// Create Controller
 	//
 	chiController := chi.NewController(
-		version.Version,
-		chopConfigManager,
+		chop,
 		chopClient,
 		kubeClient,
 		chopInformerFactory,

config/config-dev.yaml

@@ -8,6 +8,7 @@
 # Concurrently running operators should watch on different namespaces
 watchNamespaces:
   - dev
+  - test
 #  - info
 #  - onemore
 
@@ -47,13 +48,15 @@ statefulSetUpdatePollPeriod: 10
 # Possible options:
 # 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
 
 # What to do in case updated StatefulSet is not in Ready after `statefulSetUpdateTimeout` seconds
 # Possible options:
 # 1. abort - do nothing, just break the process and wait for admin
 # 2. rollback - delete Pod and rollback StatefulSet to previous Generation.
 # Pod would be recreated by StatefulSet based on rollback-ed configuration
+# 3. ignore - ignore error, pretend nothing happened and move on to the next StatefulSet
 onStatefulSetUpdateFailureAction: rollback
 
 ################################################
@@ -70,9 +73,13 @@ onStatefulSetUpdateFailureAction: rollback
 chConfigUserDefaultProfile: default
 chConfigUserDefaultQuota: default
 chConfigUserDefaultNetworksIP:
-  - "::/0"
+  - "::1"
+  - "127.0.0.1"
 chConfigUserDefaultPassword: "default"
 
+# Default host_regexp to limit network connectivity from outside
+ChConfigNetworksHostRegexpTemplate: "chi-{chi}-[^.]+\\d+-\\d+\\.{namespace}.svc.cluster.local$"
+
 ################################################
 ##
 ## Operator's access to ClickHouse instances

config/config.yaml

@@ -47,13 +47,15 @@ statefulSetUpdatePollPeriod: 10
 # Possible options:
 # 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
 
 # What to do in case updated StatefulSet is not in Ready after `statefulSetUpdateTimeout` seconds
 # Possible options:
 # 1. abort - do nothing, just break the process and wait for admin
 # 2. rollback - delete Pod and rollback StatefulSet to previous Generation.
 # Pod would be recreated by StatefulSet based on rollback-ed configuration
+# 3. ignore - ignore error, pretend nothing happened and move on to the next StatefulSet
 onStatefulSetUpdateFailureAction: rollback
 
 ################################################
@@ -70,9 +72,13 @@ onStatefulSetUpdateFailureAction: rollback
 chConfigUserDefaultProfile: default
 chConfigUserDefaultQuota: default
 chConfigUserDefaultNetworksIP:
-  - "::/0"
+  - "::1"
+  - "127.0.0.1"
 chConfigUserDefaultPassword: "default"
 
+# Default host_regexp to limit network connectivity from outside
+ChConfigNetworksHostRegexpTemplate: "chi-{chi}-[^.]+\\d+-\\d+\\.{namespace}.svc.cluster.local$"
+
 ################################################
 ##
 ## Operator's access to ClickHouse instances

config/users.d/01-clickhouse-user.xml

@@ -6,9 +6,14 @@
                 <ip>0.0.0.0/0</ip>
                 <ip>::/0</ip>
             </networks>
-            <password>clickhouse_operator_password</password>
-            <profile>default</profile>
+            <password_sha256_hex>716b36073a90c6fe1d445ac1af85f4777c5b7a155cea359961826a030513e448</password_sha256_hex>
+            <profile>clickhouse_operator</profile>
             <quota>default</quota>
         </clickhouse_operator>
     </users>
+    <profiles>
+        <clickhouse_operator>
+            <log_queries>0</log_queries>
+        </clickhouse_operator>
+    </profiles>
 </yandex>