Support for Galera defaults (#2)

Author: mmontes11

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/go-logr/logr v1.2.4
 	github.com/mariadb-operator/agent v0.0.2-0.20230705212819-67aac2bf05b9
-	github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230702105210-e7121043bc33
+	github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230708114737-3113ca8f7467
 	github.com/sethvargo/go-envconfig v0.9.0
 	k8s.io/apimachinery v0.24.2
 	k8s.io/client-go v0.24.2

go.sum

@@ -320,8 +320,8 @@ github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mariadb-operator/agent v0.0.2-0.20230705212819-67aac2bf05b9 h1:NOnvXXDUSPNhe9OJfqn8kkTORplQIHxiqgShVwQ/3jk=
 github.com/mariadb-operator/agent v0.0.2-0.20230705212819-67aac2bf05b9/go.mod h1:UrpYUTpGuh8s1M5dpWLwRu8BSIMjswCBsXCQJaYuNlk=
-github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230702105210-e7121043bc33 h1:vsYIJc31saaSP/OiJln3NnhnEHtQWODdJej033f7x3c=
-github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230702105210-e7121043bc33/go.mod h1:83Yz2Jj63rO/Kq34JIVFYhpEJCNSsySiOesjDuQBDWI=
+github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230708114737-3113ca8f7467 h1:uadNpCjCKV8Qd6Dn9i9l68RYaFe4iN7i29QuPLeF0no=
+github.com/mariadb-operator/mariadb-operator v0.0.16-0.20230708114737-3113ca8f7467/go.mod h1:sGeSO4TzhA/sjYzcibLJeRvrAB6UJyPdHaHuzovyDwg=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

make/deploy.mk

@@ -3,7 +3,7 @@ CLUSTER ?= mdb
 ##@ Docker
 
 PLATFORM ?= linux/amd64,linux/arm64
-IMG ?= ghcr.io/mariadb-operator/init:v0.0.2
+IMG ?= ghcr.io/mariadb-operator/init:v0.0.3
 BUILDX ?= docker buildx build --platform $(PLATFORM) -t $(IMG) 
 BUILDER ?= init
 

pkg/config/config.go

@@ -32,6 +32,10 @@ func NewConfigFile(mariadb *mariadbv1alpha1.MariaDB) *ConfigFile {
 }
 
 func (c *ConfigFile) Marshal(podName, mariadbRootPassword string) ([]byte, error) {
+	galera := c.mariadb.Galera()
+	if !galera.Enabled {
+		return nil, errors.New("MariaDB Galera not enabled, unable to render config file")
+	}
 	tpl := createTpl("galera", `[mysqld]
 bind-address=0.0.0.0
 default_storage_engine=InnoDB
@@ -58,7 +62,7 @@ wsrep_sst_auth="root:{{ .RootPassword }}"
 	if err != nil {
 		return nil, fmt.Errorf("error getting cluster address: %v", err)
 	}
-	sst, err := c.mariadb.Spec.Galera.SST.MariaDBFormat()
+	sst, err := galera.SST.MariaDBFormat()
 	if err != nil {
 		return nil, fmt.Errorf("error getting SST: %v", err)
 	}
@@ -73,14 +77,14 @@ wsrep_sst_auth="root:{{ .RootPassword }}"
 		RootPassword   string
 	}{
 		ClusterAddress: clusterAddr,
-		Threads:        c.mariadb.Spec.Galera.ReplicaThreads,
+		Threads:        *galera.ReplicaThreads,
 		Pod:            podName,
 		Service: statefulset.ServiceFQDNWithService(
 			c.mariadb.ObjectMeta,
 			ctrlresources.InternalServiceKey(c.mariadb).Name,
 		),
 		SST:          sst,
-		SSTAuth:      c.mariadb.Spec.Galera.SST == mariadbv1alpha1.SSTMariaBackup || c.mariadb.Spec.Galera.SST == mariadbv1alpha1.SSTMysqldump,
+		SSTAuth:      *galera.SST == mariadbv1alpha1.SSTMariaBackup || *galera.SST == mariadbv1alpha1.SSTMysqldump,
 		RootPassword: mariadbRootPassword,
 	})
 	if err != nil {

pkg/config/config_test.go

@@ -25,8 +25,36 @@ func TestConfigMarshal(t *testing.T) {
 				},
 				Spec: mariadbv1alpha1.MariaDBSpec{
 					Galera: &mariadbv1alpha1.Galera{
-						SST:            mariadbv1alpha1.SSTRsync,
-						ReplicaThreads: 1,
+						Enabled: true,
+						GaleraSpec: mariadbv1alpha1.GaleraSpec{
+							SST: func() *mariadbv1alpha1.SST {
+								s := mariadbv1alpha1.SSTRsync
+								return &s
+							}(),
+							ReplicaThreads: func() *int {
+								r := 1
+								return &r
+							}(),
+						},
+					},
+					Replicas: 0,
+				},
+			},
+			podName:             "mariadb-galera-0",
+			mariadbRootPassword: "mariadb",
+			wantConfig:          "",
+			wantErr:             true,
+		},
+		{
+			name: "Galera not enabled",
+			mariadb: &mariadbv1alpha1.MariaDB{
+				ObjectMeta: v1.ObjectMeta{
+					Name:      "mariadb-galera",
+					Namespace: "default",
+				},
+				Spec: mariadbv1alpha1.MariaDBSpec{
+					Galera: &mariadbv1alpha1.Galera{
+						Enabled: false,
 					},
 					Replicas: 0,
 				},
@@ -45,8 +73,17 @@ func TestConfigMarshal(t *testing.T) {
 				},
 				Spec: mariadbv1alpha1.MariaDBSpec{
 					Galera: &mariadbv1alpha1.Galera{
-						SST:            mariadbv1alpha1.SSTRsync,
-						ReplicaThreads: 1,
+						Enabled: true,
+						GaleraSpec: mariadbv1alpha1.GaleraSpec{
+							SST: func() *mariadbv1alpha1.SST {
+								s := mariadbv1alpha1.SSTRsync
+								return &s
+							}(),
+							ReplicaThreads: func() *int {
+								r := 1
+								return &r
+							}(),
+						},
 					},
 					Replicas: 3,
 				},
@@ -83,8 +120,17 @@ wsrep_sst_method="rsync"
 				},
 				Spec: mariadbv1alpha1.MariaDBSpec{
 					Galera: &mariadbv1alpha1.Galera{
-						SST:            mariadbv1alpha1.SSTMariaBackup,
-						ReplicaThreads: 2,
+						Enabled: true,
+						GaleraSpec: mariadbv1alpha1.GaleraSpec{
+							SST: func() *mariadbv1alpha1.SST {
+								s := mariadbv1alpha1.SSTMariaBackup
+								return &s
+							}(),
+							ReplicaThreads: func() *int {
+								r := 2
+								return &r
+							}(),
+						},
 					},
 					Replicas: 3,
 				},