From ad8c1f78783f40180edea6b15689a86bb244257a Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sun, 10 Oct 2021 03:32:41 -0700 Subject: [PATCH] Update MySQLClusterMode constants (#808) Signed-off-by: Tamal Saha --- apis/kubedb/v1alpha2/mysql_helpers.go | 4 ++-- apis/kubedb/v1alpha2/mysql_types.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apis/kubedb/v1alpha2/mysql_helpers.go b/apis/kubedb/v1alpha2/mysql_helpers.go index 2bb72c6e14..da2de6bb24 100644 --- a/apis/kubedb/v1alpha2/mysql_helpers.go +++ b/apis/kubedb/v1alpha2/mysql_helpers.go @@ -196,13 +196,13 @@ func (m MySQL) StatsServiceLabels() map[string]string { func (m *MySQL) UsesGroupReplication() bool { return m.Spec.Topology != nil && m.Spec.Topology.Mode != nil && - *m.Spec.Topology.Mode == MySQLClusterModeGroup + *m.Spec.Topology.Mode == MySQLClusterModeGroupReplication } func (m *MySQL) IsInnoDBCluster() bool { return m.Spec.Topology != nil && m.Spec.Topology.Mode != nil && - *m.Spec.Topology.Mode == InnoDBClusterModeGroup + *m.Spec.Topology.Mode == MySQLClusterModeInnoDBCluster } func (m *MySQL) SetDefaults(topology *core_util.Topology) { diff --git a/apis/kubedb/v1alpha2/mysql_types.go b/apis/kubedb/v1alpha2/mysql_types.go index fa1a361e9b..e2914b98bd 100644 --- a/apis/kubedb/v1alpha2/mysql_types.go +++ b/apis/kubedb/v1alpha2/mysql_types.go @@ -35,8 +35,8 @@ const ( type MySQLClusterMode string const ( - MySQLClusterModeGroup MySQLClusterMode = "GroupReplication" - InnoDBClusterModeGroup MySQLClusterMode = "InnoDBCluster" + MySQLClusterModeGroupReplication MySQLClusterMode = "GroupReplication" + MySQLClusterModeInnoDBCluster MySQLClusterMode = "InnoDBCluster" ) // +kubebuilder:validation:Enum=Single-Primary