Add MariaDBVersionCoordinator field in MariaDBVersions (#763)

Signed-off-by: Md. Alif Biswas <alif@appscode.com>
kubedb · Sep 9, 2021 · 1f545e6 · 1f545e6
1 parent ca19310
commit 1f545e6
Show file tree

Hide file tree

Showing 9 changed files with 499 additions and 223 deletions.
diff --git a/apis/catalog/v1alpha1/generated.pb.go b/apis/catalog/v1alpha1/generated.pb.go
diff --git a/apis/catalog/v1alpha1/generated.proto b/apis/catalog/v1alpha1/generated.proto
diff --git a/apis/catalog/v1alpha1/mariadb_version_types.go b/apis/catalog/v1alpha1/mariadb_version_types.go
@@ -56,17 +56,19 @@ type MariaDBVersionSpec struct {
 	DB MariaDBVersionDatabase `json:"db" protobuf:"bytes,2,opt,name=db"`
 	// Exporter Image
 	Exporter MariaDBVersionExporter `json:"exporter" protobuf:"bytes,3,opt,name=exporter"`
+	// Coordinator Image
+	Coordinator MariaDBVersionCoordinator `json:"coordinator,omitempty" protobuf:"bytes,4,opt,name=coordinator"`
 	// Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded.
 	// +optional
-	Deprecated bool `json:"deprecated,omitempty" protobuf:"varint,4,opt,name=deprecated"`
+	Deprecated bool `json:"deprecated,omitempty" protobuf:"varint,5,opt,name=deprecated"`
 	// Init container Image
 	// TODO: remove if not needed
-	InitContainer MariaDBVersionInitContainer `json:"initContainer" protobuf:"bytes,5,opt,name=initContainer"`
+	InitContainer MariaDBVersionInitContainer `json:"initContainer" protobuf:"bytes,6,opt,name=initContainer"`
 	// PSP names
-	PodSecurityPolicies MariaDBVersionPodSecurityPolicy `json:"podSecurityPolicies" protobuf:"bytes,6,opt,name=podSecurityPolicies"`
+	PodSecurityPolicies MariaDBVersionPodSecurityPolicy `json:"podSecurityPolicies" protobuf:"bytes,7,opt,name=podSecurityPolicies"`
 	// Stash defines backup and restore task definitions.
 	// +optional
-	Stash appcat.StashAddonSpec `json:"stash,omitempty" protobuf:"bytes,7,opt,name=stash"`
+	Stash appcat.StashAddonSpec `json:"stash,omitempty" protobuf:"bytes,8,opt,name=stash"`
 }
 
 // MariaDBVersionDatabase is the mariadb image
@@ -84,6 +86,11 @@ type MariaDBVersionInitContainer struct {
 	Image string `json:"image" protobuf:"bytes,1,opt,name=image"`
 }
 
+// MariaDBVersionCoordinator is the MariaDB Coordinator image
+type MariaDBVersionCoordinator struct {
+	Image string `json:"image" protobuf:"bytes,1,opt,name=image"`
+}
+
 // MariaDBVersionPodSecurityPolicy is the MariaDB pod security policies
 type MariaDBVersionPodSecurityPolicy struct {
 	DatabasePolicyName string `json:"databasePolicyName" protobuf:"bytes,1,opt,name=databasePolicyName"`

diff --git a/apis/catalog/v1alpha1/openapi_generated.go b/apis/catalog/v1alpha1/openapi_generated.go
diff --git a/apis/catalog/v1alpha1/zz_generated.deepcopy.go b/apis/catalog/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -203,6 +203,7 @@ const (
 	MariaDBCustomConfigVolumeName       = "custom-config"
 	MariaDBTLSConfigCustom              = "custom"
 	MariaDBInitContainerName            = "mariadb-init"
+	MariaDBCoordinatorContainerName     = "md-coordinator"
 
 	// =========================== PostgreSQL Constants ============================
 	PostgresDatabasePortName         = "db"

diff --git a/apis/kubedb/v1alpha2/mariadb_helpers.go b/apis/kubedb/v1alpha2/mariadb_helpers.go
@@ -234,7 +234,7 @@ func (m *MariaDB) SetTLSDefaults() {
 		return
 	}
 	m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MariaDBServerCert), m.CertificateName(MariaDBServerCert))
-	m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MariaDBArchiverCert), m.CertificateName(MariaDBArchiverCert))
+	m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MariaDBClientCert), m.CertificateName(MariaDBClientCert))
 	m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MariaDBMetricsExporterCert), m.CertificateName(MariaDBMetricsExporterCert))
 }
 

diff --git a/apis/kubedb/v1alpha2/mariadb_types.go b/apis/kubedb/v1alpha2/mariadb_types.go
@@ -108,7 +108,7 @@ type MariaDBCertificateAlias string
 
 const (
 	MariaDBServerCert          MariaDBCertificateAlias = "server"
-	MariaDBArchiverCert        MariaDBCertificateAlias = "archiver"
+	MariaDBClientCert          MariaDBCertificateAlias = "client"
 	MariaDBMetricsExporterCert MariaDBCertificateAlias = "metrics-exporter"
 )
 

diff --git a/crds/catalog.kubedb.com_mariadbversions.yaml b/crds/catalog.kubedb.com_mariadbversions.yaml
@@ -45,6 +45,13 @@ spec:
             type: object
           spec:
             properties:
+              coordinator:
+                properties:
+                  image:
+                    type: string
+                required:
+                - image
+                type: object
               db:
                 properties:
                   image: