Add DisableSecurity Support for ClickHouse

Signed-off-by: SK Ali Arman <[email protected]>

clickhouse/kubedb_client_builder.go

@@ -21,11 +21,11 @@ import (
 	"database/sql"
 	"fmt"
 
-	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
-
 	_ "github.com/ClickHouse/clickhouse-go/v2"
 	core "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
+	"kubedb.dev/apimachinery/apis/kubedb"
+	olddbapi "kubedb.dev/apimachinery/apis/kubedb/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -95,15 +95,17 @@ func (o *KubeDBClientBuilder) getURL() string {
 }
 
 func (o *KubeDBClientBuilder) getPort() *int {
-	chPort := 9000
+	chPort := kubedb.ClickHouseNativeTCP
 	return &chPort
 }
 
 func (o *KubeDBClientBuilder) getClickHouseRootCredentials() (string, string, error) {
 	db := o.db
 	var secretName string
-	if db.Spec.AuthSecret != nil {
+	if !db.Spec.DisableSecurity {
 		secretName = db.GetAuthSecretName()
+	} else {
+		return kubedb.ClickHouseDefaultUser, "", nil
 	}
 	var secret core.Secret
 	err := o.kc.Get(o.ctx, client.ObjectKey{Namespace: db.Namespace, Name: secretName}, &secret)

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/clickhouse_version_types.go

@@ -63,6 +63,9 @@ type ClickHouseVersionSpec struct {
 	// Database Image
 	InitContainer ClickHouseInitContainer `json:"initContainer"`
 
+	// ClickHouse Keeper Image
+	ClickHouseKeeper ClickHouseKeeperContainer `json:"clickHouseKeeper"`
+
 	// SecurityContext is for the additional config for the DB container
 	// +optional
 	SecurityContext SecurityContext `json:"securityContext"`
@@ -81,6 +84,11 @@ type ClickHouseInitContainer struct {
 	Image string `json:"image"`
 }
 
+// ClickHouseKeeperContainer is the ClickHouse keeper Container image
+type ClickHouseKeeperContainer struct {
+	Image string `json:"image"`
+}
+
 // ClickHouseVersionStatus defines the observed state of ClickHouseVersion
 type ClickHouseVersionStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster

vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go

@@ -1313,36 +1313,71 @@ const (
 	ClickHouseNativeTCP   = 9000
 	ClickHouseNativeTLS   = 9440
 	ClickhousePromethues  = 9363
+	ClickHouseRaftPort    = 9234
+
+	ClickHousePromethusEndpoint           = "/metrics"
+	ClickHouseDataDir                     = "/var/lib/clickhouse"
+	ClickHouseKeeperDataDir               = "/var/lib/clickhouse_keeper"
+	ClickHouseConfigDir                   = "/etc/clickhouse-server/config.d"
+	ClickHouseKeeperConfigDir             = "/etc/clickhouse-keeper"
+	ClickHouseCommonConfigDir             = "/etc/clickhouse-server/conf.d"
+	ClickHouseTempConfigDir               = "/ch-tmp"
+	ClickHouseInternalKeeperTempConfigDir = "/keeper"
+	ClickHouseTempDir                     = "/ch-tmp"
+	ClickHouseKeeperTempDir               = "/ch-tmp"
+	ClickHouseKeeperConfigPath            = "/etc/clickhouse-keeper"
+	ClickHouseUserConfigDir               = "/etc/clickhouse-server/user.d"
+	ClickHouseLogPath                     = "/var/log/clickhouse-server/clickhouse-server.log"
+	ClickHouseErrorLogPath                = "/var/log/clickhouse-server/clickhouse-server.err.log"
+
+	// keeper
+	ClickHouseKeeperDataPath     = "/var/lib/clickhouse_keeper"
+	ClickHouseKeeperLogPath      = "/var/lib/clickhouse_keeper/coordination/logs"
+	ClickHouseKeeperSnapshotPath = "/var/lib/clickhouse_keeper/coordination/snapshots"
+
+	ClickHouseInternalKeeperDataPath     = "/var/lib/clickhouse/coordination/log"
+	ClickHouseInternalKeeperSnapshotPath = "/var/lib/clickhouse/coordination/snapshots"
+
+	ComponentCoOrdinator  = "co-ordinator"
+	ClickHouseVolumeData  = "data"
+	ClickHouseDefaultUser = "default"
+
+	ClickHouseConfigVolumeName               = "clickhouse-config"
+	ClickHouseKeeperConfigVolumeName         = "clickhouse-keeper-config"
+	ClickHouseInternalKeeperConfigVolumeName = "clickhouse-internal-keeper-config"
 
-	ClickHouseVolumeData         = "data"
-	ClickHouseDataDir            = "/var/lib/clickhouse"
-	ClickHouseConfigVolName      = "clickhouse-config"
-	ClickHouseConfigDir          = "/etc/clickhouse-server/config.d"
 	ClickHouseDefaultStorageSize = "2Gi"
 
 	ClickHouseClusterConfigVolName = "cluster-config"
-	ClickHouseClusterConfigDir     = "/etc/clickhouse-server/conf.d"
 
-	ClickHouseTempClusterConfigVolName = "temp-cluster-config"
+	ClickHouseClusterTempConfigVolName = "temp-cluster-config"
 
 	ClickHouseContainerName     = "clickhouse"
 	ClickHouseInitContainerName = "clickhouse-init"
 
 	ClickHouseClusterConfigFile = "cluster-config.yaml"
-	ClickHouseTempConfigDir     = "/ch-tmp/config"
-	ClickHouseTempDir           = "/ch-tmp"
 
-	ClickHouseUserConfigDir  = "/etc/clickhouse-server/user.d"
 	ClickHouseMacrosFileName = "macros.yaml"
 
 	ClickHouseStandalone = "standalone"
 	ClickHouseCluster    = "cluster"
 
-	ClickHouseHealthCheckerDatabase = "kubedb_system_db"
-	ClickHouseHealthCheckerTable    = "kubedb_system_table"
-
-	ClickHouseServerConfigFile = "server-config.yaml"
-	ClickHouseKeeperFileConfig = "keeper-config.yaml"
+	ClickHouseHealthCheckerDatabase = "kubedb_system"
+	ClickHouseHealthCheckerTable    = "kubedb_write_check"
+
+	ClickHouseServerConfigFile   = "server-config.yaml"
+	ClickHouseKeeperFileConfig   = "keeper_config.yaml"
+	ClickHouseVolumeCustomConfig = "custom-config"
+
+	// keeper
+	ClickHouseKeeperContainerName        = "clickhouse-keeper"
+	ClickHouseKeeeprConfigFileName       = "keeper_config.xml"
+	ClickHOuseKeeeprConfigFileVolumeName = "keeper-config"
+	ClickHouseKeeperInitContainerName    = "clickhouse-keeper-init"
+	ClickHouseKeeperConfig               = "etc-clickhouse-keeper"
+	ClickHouseInternalServerListFile     = "server_list.yaml"
+	ClickHouseKeeperServerIdNo           = "serverid"
+	ClickHouseKeeperServerID             = "KEEPERID"
 )
 
 // =========================== Cassandra Constants ============================
@@ -1439,6 +1474,15 @@ var (
 			core.ResourceMemory: resource.MustParse("1024Mi"),
 		},
 	}
+	ClickHouseDefaultResources = core.ResourceRequirements{
+		Requests: core.ResourceList{
+			core.ResourceCPU:    resource.MustParse("1"),
+			core.ResourceMemory: resource.MustParse("3Gi"),
+		},
+		Limits: core.ResourceList{
+			core.ResourceMemory: resource.MustParse("6Gi"),
+		},
+	}
 	// CoordinatorDefaultResources must be used for raft backed coordinators to avoid unintended leader switches
 	CoordinatorDefaultResources = core.ResourceRequirements{
 		Requests: core.ResourceList{