Skip to content

Commit

Permalink
Merge pull request #1049 from swordqiu/feature/qj-dameng-support
Browse files Browse the repository at this point in the history
Feature/qj dameng support
  • Loading branch information
swordqiu authored Feb 29, 2024
2 parents b56e9d8 + 12a4f52 commit d29a074
Show file tree
Hide file tree
Showing 201 changed files with 38,253 additions and 1,828 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ check: goimports-check

RELEASE_BRANCH:=master
mod:
GOPROXY=direct GOSUMDB=off go get yunion.io/x/onecloud@$(RELEASE_BRANCH)
#go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/onecloud$$'))
GOPROXY=direct GOSUMDB=off go get yunion.io/x/onecloud@$(RELEASE_BRANCH) yunion.io/x/cloudmux@$(RELEASE_BRANCH)
#go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/onecloud$$' | grep -v '/cloudmux$$'))
go mod tidy
go mod vendor -v

Expand Down
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module yunion.io/x/onecloud-operator
go 1.18

require (
gitee.com/chunanyong/dm v1.8.14
github.com/ClickHouse/clickhouse-go v1.5.4
github.com/coreos/go-semver v0.3.0
github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff
Expand All @@ -21,7 +22,7 @@ require (
k8s.io/klog v0.3.3
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
yunion.io/x/onecloud v0.0.0-20240217110032-450a27b8921e
yunion.io/x/onecloud v0.0.0-20240226121845-92ee483837c8
yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
)
Expand Down Expand Up @@ -51,6 +52,7 @@ require (
github.com/golang-plus/uuid v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
Expand Down Expand Up @@ -123,7 +125,7 @@ require (
moul.io/http2curl/v2 v2.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240205093912-f8af0aface0f // indirect
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240227041139-197cdc57e348 // indirect
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 // indirect
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e // indirect
yunion.io/x/sqlchemy v1.1.3-0.20240210161427-e48bb9a658b7 // indirect
Expand Down
12 changes: 8 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gitee.com/chunanyong/dm v1.8.14 h1:1S9+aD0fY/HXkcm8dKh2HjYsDlcdXNG+4IOX9JtrSjA=
gitee.com/chunanyong/dm v1.8.14/go.mod h1:EPRJnuPFgbyOFgJ0TRYCTGzhq+ZT4wdyaj/GW/LLcNg=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
Expand Down Expand Up @@ -263,6 +265,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Expand Down Expand Up @@ -1038,8 +1042,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240205093912-f8af0aface0f h1:InZD79uLl9SQNCrf2Pf8wpBpiDURsuRD3zEsZ3j7LDc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240205093912-f8af0aface0f/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240227041139-197cdc57e348 h1:ldJ+OMYBURUaqo7BD3DYBSJHnaYAJ3S73TT859ulvx4=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240227041139-197cdc57e348/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
Expand All @@ -1049,8 +1053,8 @@ yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXce
yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 h1:c5LyNdhbvBe/92pXs9jgXOU/S+RgYh/DHe538LpT/Mo=
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
yunion.io/x/onecloud v0.0.0-20240217110032-450a27b8921e h1:p/yBD+zqpEBN2vpprxcSvoWldq0u4OF2pnDVxyNVjSs=
yunion.io/x/onecloud v0.0.0-20240217110032-450a27b8921e/go.mod h1:YHn+Bu8YzZW1m2TUkhjPnustknRPcieTD47ZSZKZifg=
yunion.io/x/onecloud v0.0.0-20240226121845-92ee483837c8 h1:V4CfS2mbWnWQuMcIVkZN9dA/AFi7U2iGETjtlrH0ixI=
yunion.io/x/onecloud v0.0.0-20240226121845-92ee483837c8/go.mod h1:XThK1RX76EsGnHvq+xdqFoGa7eJN5Cs3aoIgtHx4bfc=
yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
yunion.io/x/pkg v1.10.1-0.20240127153242-cdf9dc071f4f h1:nLMBj8S3/ev2pB1wzGSi6hOM0aMK0DS2oyuQFzHbfkI=
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/onecloud/v1alpha1/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func clearContainerSpec(spec *ContainerSpec) {
func SetDefaults_OnecloudClusterSpec(obj *OnecloudClusterSpec, isEE bool) {
setDefaults_Mysql(&obj.Mysql)
setDefaults_Clickhouse(&obj.Clickhouse)
setDefaults_Dameng(&obj.Dameng)
if obj.ProductVersion == "" {
obj.ProductVersion = ProductVersionFullStack
}
Expand Down Expand Up @@ -467,6 +468,15 @@ func setDefaults_Clickhouse(obj *Clickhouse) {
}
}

func setDefaults_Dameng(obj *Dameng) {
if obj.Username == "" {
obj.Username = "sysdba"
}
if obj.Port == 0 {
obj.Port = 5236
}
}

func getHyperImageName(isEE bool) string {
if isEE {
return "cloudpods-ee"
Expand Down
39 changes: 38 additions & 1 deletion pkg/apis/onecloud/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,10 @@ type OnecloudClusterSpec struct {
Mysql Mysql `json:"mysql"`
// Clickhouse holds configuration for clickhouse
Clickhouse Clickhouse `json:"clickhouse"`
// Dameng holds configuration for dameng database
Dameng Dameng `json:"dameng"`
// db_engine holds the global db_engine setting
DbEngine TDBEngineType `json:"db_engine"`
// Version is onecloud components version
Version string `json:"version"`
// CertSANs sets extra Subject Alternative Names for the Cluster signing cert.
Expand Down Expand Up @@ -337,6 +341,17 @@ type OnecloudClusterSpec struct {
Extdb DeploymentServicePortSpec `json:"extdb"`
}

func (s OnecloudClusterSpec) GetDbEngine(srvSpec TDBEngineType) TDBEngineType {
if len(srvSpec) > 0 {
return srvSpec
}
if len(s.DbEngine) > 0 {
return s.DbEngine
}
// mysql is the default
return DBEngineMySQL
}

// OnecloudClusterStatus describes cluster status
type OnecloudClusterStatus struct {
ClusterID string `json:"clusterID,omitempty"`
Expand Down Expand Up @@ -556,6 +571,9 @@ type Mysql struct {
// Clickhouse describe a clickhouse server
type Clickhouse Mysql

// Dameng describe a DAMENG DB server
type Dameng Mysql

// Minio hols configration for minio S3 object storage backend
type Minio struct {
Enable bool `json:"enable"`
Expand Down Expand Up @@ -592,7 +610,8 @@ type WebconsoleSpec struct {

type DeploymentServicePortSpec struct {
DeploymentSpec
Service ServiceSpec `json:"service"`
Service ServiceSpec `json:"service"`
DbEngine TDBEngineType `json:"db_engine"`
}

type CronJobSpec struct {
Expand Down Expand Up @@ -620,6 +639,8 @@ type DaemonSetSpec struct {
type YunionagentSpec struct {
DaemonSetSpec
Service ServiceSpec `json:"service"`

DbEngine TDBEngineType `json:"db_engine"`
}

type StatefulDeploymentSpec struct {
Expand All @@ -630,6 +651,8 @@ type StatefulDeploymentSpec struct {
type MeterSpec struct {
StatefulDeploymentSpec
Service ServiceSpec `json:"service"`

DbEngine TDBEngineType `json:"db_engine"`
}

type InfluxdbSpec struct {
Expand Down Expand Up @@ -661,12 +684,16 @@ type KeystoneSpec struct {
PublicService ServiceSpec `json:"publicService"`
AdminService ServiceSpec `json:"adminService"`
BootstrapPassword string `json:"bootstrapPassword"`

DbEngine TDBEngineType `json:"db_engine"`
}

type GlanceSpec struct {
StatefulDeploymentSpec
Service ServiceSpec `json:"service"`
SwitchToS3 bool `json:"switchToS3"`

DbEngine TDBEngineType `json:"db_engine"`
}

type MinioMode string
Expand Down Expand Up @@ -922,6 +949,8 @@ type NotifySpec struct {
Service ServiceSpec `json:"service"`

Plugins ContainerSpec `json:"plugins"`

DbEngine TDBEngineType `json:"db_engine"`
}

type CloudmonSpec struct {
Expand Down Expand Up @@ -1072,6 +1101,14 @@ type ResourceRequirement struct {
Storage string `json:"storage,omitempty"`
}

type TDBEngineType string

const (
DBEngineMySQL = TDBEngineType("mysql")
DBEngineClickhouse = TDBEngineType("clickhouse")
DBEngineDameng = TDBEngineType("dameng")
)

type DBConfig struct {
Database string `json:"database"`
Username string `json:"username"`
Expand Down
4 changes: 4 additions & 0 deletions pkg/manager/component/ansibleserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ func (m *ansibleManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alp
return component.NewAnsibleServer().GetDefaultDBConfig(cfg)
}

func (m *ansibleManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.AnsibleServer.DbEngine)
}

func (m *ansibleManager) getCloudUser(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.CloudUser {
return component.NewAnsibleServer().GetDefaultCloudUser(cfg)
}
Expand Down
13 changes: 12 additions & 1 deletion pkg/manager/component/autoupdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func (m *autoUpdateManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1
return &cfg.AutoUpdate.DB
}

func (m *autoUpdateManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.AutoUpdate.DbEngine)
}

func (m *autoUpdateManager) getClickhouseConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.DBConfig {
return &cfg.RegionServer.ClickhouseConf
}
Expand Down Expand Up @@ -95,7 +99,14 @@ func (m *autoUpdateManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1al
return nil, false, err
}
config := cfg.AutoUpdate
option.SetDBOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
switch oc.Spec.GetDbEngine(oc.Spec.AutoUpdate.DbEngine) {
case v1alpha1.DBEngineDameng:
option.SetDamengOptions(&opt.DBOptions, oc.Spec.Dameng, config.DB)
case v1alpha1.DBEngineMySQL:
fallthrough
default:
option.SetMysqlOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
}
option.SetClickhouseOptions(&opt.DBOptions, oc.Spec.Clickhouse, config.ClickhouseConf)
option.SetOptionsServiceTLS(&opt.BaseOptions, false)
option.SetServiceCommonOptions(&opt.CommonOptions, oc, config.ServiceCommonOptions)
Expand Down
15 changes: 14 additions & 1 deletion pkg/manager/component/bastionhost.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func (m *bastionHostManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v
return &cfg.BastionHost.DB
}

func (m *bastionHostManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.BastionHost.DbEngine)
}

func (m *bastionHostManager) getCloudUser(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.CloudUser {
return &cfg.BastionHost.CloudUser
}
Expand All @@ -76,7 +80,16 @@ func (m *bastionHostManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1a
return nil, false, err
}
config := cfg.BastionHost
option.SetDBOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)

switch oc.Spec.GetDbEngine(oc.Spec.BastionHost.DbEngine) {
case v1alpha1.DBEngineDameng:
option.SetDamengOptions(&opt.DBOptions, oc.Spec.Dameng, config.DB)
case v1alpha1.DBEngineMySQL:
fallthrough
default:
option.SetMysqlOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
}

option.SetOptionsServiceTLS(&opt.BaseOptions, false)
option.SetServiceCommonOptions(&opt.CommonOptions, oc, config.ServiceCommonOptions)
opt.AutoSyncTable = true
Expand Down
15 changes: 14 additions & 1 deletion pkg/manager/component/billing.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ func (b *billingManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alp
return &cfg.Billing.DB
}

func (m *billingManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.Billing.DbEngine)
}

func (b *billingManager) getClickhouseConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.DBConfig {
return &cfg.Billing.ClickhouseConf
}
Expand Down Expand Up @@ -90,7 +94,16 @@ func (b *billingManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1alpha
}

config := cfg.Billing
option.SetDBOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)

switch oc.Spec.GetDbEngine(oc.Spec.Billing.DbEngine) {
case v1alpha1.DBEngineDameng:
option.SetDamengOptions(&opt.DBOptions, oc.Spec.Dameng, config.DB)
case v1alpha1.DBEngineMySQL:
fallthrough
default:
option.SetMysqlOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
}

option.SetClickhouseOptions(&opt.DBOptions, oc.Spec.Clickhouse, config.ClickhouseConf)
option.SetOptionsServiceTLS(&opt.BaseOptions, false)
option.SetServiceCommonOptions(&opt.CommonOptions, oc, config.ServiceCommonOptions)
Expand Down
15 changes: 14 additions & 1 deletion pkg/manager/component/cloudevent.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ func (m *cloudeventManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1
return &cfg.Cloudevent.DB
}

func (m *cloudeventManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.Cloudevent.DbEngine)
}

func (m *cloudeventManager) getClickhouseConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.DBConfig {
return &cfg.Cloudevent.ClickhouseConf
}
Expand All @@ -76,7 +80,16 @@ func (m *cloudeventManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1al
return nil, false, err
}
config := cfg.Cloudevent
option.SetDBOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)

switch oc.Spec.GetDbEngine(oc.Spec.Cloudevent.DbEngine) {
case v1alpha1.DBEngineDameng:
option.SetDamengOptions(&opt.DBOptions, oc.Spec.Dameng, config.DB)
case v1alpha1.DBEngineMySQL:
fallthrough
default:
option.SetMysqlOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
}

option.SetClickhouseOptions(&opt.DBOptions, oc.Spec.Clickhouse, config.ClickhouseConf)
option.SetOptionsServiceTLS(&opt.BaseOptions, false)
option.SetServiceCommonOptions(&opt.CommonOptions, oc, config.ServiceCommonOptions)
Expand Down
4 changes: 4 additions & 0 deletions pkg/manager/component/cloudid.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ func (m *cloudidManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1alp
return component.NewCloudId().GetDefaultDBConfig(cfg)
}

func (m *cloudidManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.CloudId.DbEngine)
}

func (m *cloudidManager) getCloudUser(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.CloudUser {
return component.NewCloudId().GetDefaultCloudUser(cfg)
}
Expand Down
15 changes: 14 additions & 1 deletion pkg/manager/component/cloudnetserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ func (m *cloudnetManager) getDBConfig(cfg *v1alpha1.OnecloudClusterConfig) *v1al
return &cfg.Cloudnet.DB
}

func (m *cloudnetManager) getDBEngine(oc *v1alpha1.OnecloudCluster) v1alpha1.TDBEngineType {
return oc.Spec.GetDbEngine(oc.Spec.Cloudnet.DbEngine)
}

func (m *cloudnetManager) getCloudUser(cfg *v1alpha1.OnecloudClusterConfig) *v1alpha1.CloudUser {
return &cfg.Cloudnet.CloudUser
}
Expand All @@ -74,7 +78,16 @@ func (m *cloudnetManager) getConfigMap(oc *v1alpha1.OnecloudCluster, cfg *v1alph
return nil, false, err
}
config := cfg.Cloudnet
option.SetDBOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)

switch oc.Spec.GetDbEngine(oc.Spec.Cloudnet.DbEngine) {
case v1alpha1.DBEngineDameng:
option.SetDamengOptions(&opt.DBOptions, oc.Spec.Dameng, config.DB)
case v1alpha1.DBEngineMySQL:
fallthrough
default:
option.SetMysqlOptions(&opt.DBOptions, oc.Spec.Mysql, config.DB)
}

option.SetOptionsServiceTLS(&opt.BaseOptions, false)
option.SetServiceCommonOptions(&opt.CommonOptions, oc, config.ServiceCommonOptions)
opt.AutoSyncTable = true
Expand Down
Loading

0 comments on commit d29a074

Please sign in to comment.