Implement ReplicasAreReady (#614)

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Oct 8, 2020 · 057d3ae · 057d3ae
1 parent 3210511
commit 057d3ae
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 67 deletions.
diff --git a/apis/kubedb/v1alpha2/elasticsearch_helpers.go b/apis/kubedb/v1alpha2/elasticsearch_helpers.go
@@ -32,7 +32,6 @@ import (
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
-	apps_util "kmodules.xyz/client-go/apps/v1"
 	core_util "kmodules.xyz/client-go/core/v1"
 	meta_util "kmodules.xyz/client-go/meta"
 	appcat "kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1"
@@ -418,7 +417,7 @@ func (e *Elasticsearch) GetMatchExpressions() []metav1.LabelSelectorRequirement
 	}
 }
 
-func (e *ElasticsearchSpec) GetSecrets() []string {
+func (e *ElasticsearchSpec) GetPersistentSecrets() []string {
 	if e == nil {
 		return nil
 	}
@@ -430,22 +429,11 @@ func (e *ElasticsearchSpec) GetSecrets() []string {
 	return secrets
 }
 
-func (e *Elasticsearch) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	stsList, err := stsLister.StatefulSets(e.Namespace).List(labels.SelectorFromSet(e.OffshootLabels()))
-	if err != nil {
-		return false, "", err
-	}
-
-	// Desire number of statefulSet for Elasticsearch
-	numOfStatefulSet := 1
+func (e *Elasticsearch) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
 	if e.Spec.Topology != nil {
-		numOfStatefulSet = 3
+		expectedItems = 3
 	}
-	if len(stsList) != numOfStatefulSet {
-		return false, fmt.Sprintf("All StatefulSets are not available. Desire number of StatefulSet: %d, Available: %d", numOfStatefulSet, len(stsList)), nil
-	}
-
-	// return isReplicasReady, message, error
-	ready, msg := apps_util.StatefulSetsAreReady(stsList)
-	return ready, msg, nil
+	return checkReplicas(lister.StatefulSets(e.Namespace), labels.SelectorFromSet(e.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/etcd_helpers.go b/apis/kubedb/v1alpha2/etcd_helpers.go
@@ -24,6 +24,7 @@ import (
 	"kubedb.dev/apimachinery/crds"
 
 	"github.com/appscode/go/types"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -155,12 +156,12 @@ func (e *Etcd) SetDefaults() {
 	e.Spec.Monitor.SetDefaults()
 }
 
-func (e *EtcdSpec) GetSecrets() []string {
+func (e *EtcdSpec) GetPersistentSecrets() []string {
 	return nil
 }
 
-func (e *Etcd) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (e *Etcd) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(e.Namespace), labels.SelectorFromSet(e.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/helpers.go b/apis/kubedb/v1alpha2/helpers.go
@@ -0,0 +1,39 @@
+/*
+Copyright AppsCode Inc. and Contributors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha2
+
+import (
+	"fmt"
+
+	"k8s.io/apimachinery/pkg/labels"
+	appslister "k8s.io/client-go/listers/apps/v1"
+	apps_util "kmodules.xyz/client-go/apps/v1"
+)
+
+func checkReplicas(lister appslister.StatefulSetNamespaceLister, selector labels.Selector, expectedItems int) (bool, string, error) {
+	items, err := lister.List(selector)
+	if err != nil {
+		return false, "", err
+	}
+	if len(items) < expectedItems {
+		return false, fmt.Sprintf("All StatefulSets are not available. Desire number of StatefulSet: %d, Available: %d", expectedItems, len(items)), nil
+	}
+
+	// return isReplicasReady, message, error
+	ready, msg := apps_util.StatefulSetsAreReady(items)
+	return ready, msg, nil
+}
diff --git a/apis/kubedb/v1alpha2/mariadb_helpers.go b/apis/kubedb/v1alpha2/mariadb_helpers.go
@@ -24,6 +24,7 @@ import (
 	"kubedb.dev/apimachinery/crds"
 
 	"github.com/appscode/go/types"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -156,7 +157,7 @@ func (m *MariaDB) SetDefaults() {
 	m.Spec.Monitor.SetDefaults()
 }
 
-func (m *MariaDBSpec) GetSecrets() []string {
+func (m *MariaDBSpec) GetPersistentSecrets() []string {
 	if m == nil {
 		return nil
 	}
@@ -168,8 +169,8 @@ func (m *MariaDBSpec) GetSecrets() []string {
 	return secrets
 }
 
-func (m *MariaDB) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (m *MariaDB) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(m.Namespace), labels.SelectorFromSet(m.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/memcached_helpers.go b/apis/kubedb/v1alpha2/memcached_helpers.go
@@ -23,6 +23,7 @@ import (
 	"kubedb.dev/apimachinery/apis/kubedb"
 	"kubedb.dev/apimachinery/crds"
 
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -148,12 +149,12 @@ func (m *Memcached) SetDefaults() {
 	m.Spec.Monitor.SetDefaults()
 }
 
-func (m *MemcachedSpec) GetSecrets() []string {
+func (m *MemcachedSpec) GetPersistentSecrets() []string {
 	return nil
 }
 
-func (m *Memcached) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (m *Memcached) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(m.Namespace), labels.SelectorFromSet(m.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/mongodb_helpers.go b/apis/kubedb/v1alpha2/mongodb_helpers.go
@@ -29,6 +29,7 @@ import (
 	"gomodules.xyz/version"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
@@ -581,7 +582,7 @@ func (m *MongoDBSpec) SetSecurityContext(podTemplate *ofst.PodTemplateSpec) {
 	}
 }
 
-func (m *MongoDBSpec) GetSecrets() []string {
+func (m *MongoDBSpec) GetPersistentSecrets() []string {
 	if m == nil {
 		return nil
 	}
@@ -636,8 +637,11 @@ func (m *MongoDB) MustCertSecretName(alias MongoDBCertificateAlias, stsName stri
 	return name
 }
 
-func (m *MongoDB) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (m *MongoDB) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	if m.Spec.ShardTopology != nil {
+		expectedItems = 2 + int(m.Spec.ShardTopology.Shard.Shards)
+	}
+	return checkReplicas(lister.StatefulSets(m.Namespace), labels.SelectorFromSet(m.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/mysql_helpers.go b/apis/kubedb/v1alpha2/mysql_helpers.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/appscode/go/types"
 	core "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
@@ -224,7 +225,7 @@ mysql -h localhost -nsLNE -e "select member_state from performance_schema.replic
 	}
 }
 
-func (m *MySQLSpec) GetSecrets() []string {
+func (m *MySQLSpec) GetPersistentSecrets() []string {
 	if m == nil {
 		return nil
 	}
@@ -255,8 +256,8 @@ func (m *MySQL) MustCertSecretName(alias MySQLCertificateAlias) string {
 	return name
 }
 
-func (m *MySQL) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (m *MySQL) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(m.Namespace), labels.SelectorFromSet(m.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/perconaxtradb_helpers.go b/apis/kubedb/v1alpha2/perconaxtradb_helpers.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/appscode/go/types"
 	core "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -215,7 +216,7 @@ fi
 	}
 }
 
-func (p *PerconaXtraDBSpec) GetSecrets() []string {
+func (p *PerconaXtraDBSpec) GetPersistentSecrets() []string {
 	if p == nil {
 		return nil
 	}
@@ -227,8 +228,8 @@ func (p *PerconaXtraDBSpec) GetSecrets() []string {
 	return secrets
 }
 
-func (p *PerconaXtraDB) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (p *PerconaXtraDB) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(p.Namespace), labels.SelectorFromSet(p.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/pgbouncer_helpers.go b/apis/kubedb/v1alpha2/pgbouncer_helpers.go
@@ -23,6 +23,7 @@ import (
 	"kubedb.dev/apimachinery/apis/kubedb"
 	"kubedb.dev/apimachinery/crds"
 
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
@@ -174,8 +175,8 @@ func (p *PgBouncer) MustCertSecretName(alias PgBouncerCertificateAlias) string {
 	return name
 }
 
-func (p *PgBouncer) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (p *PgBouncer) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(p.Namespace), labels.SelectorFromSet(p.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/postgres_helpers.go b/apis/kubedb/v1alpha2/postgres_helpers.go
@@ -24,6 +24,7 @@ import (
 	"kubedb.dev/apimachinery/crds"
 
 	"github.com/appscode/go/types"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -174,7 +175,7 @@ func (p *Postgres) SetDefaults() {
 	p.Spec.Monitor.SetDefaults()
 }
 
-func (e *PostgresSpec) GetSecrets() []string {
+func (e *PostgresSpec) GetPersistentSecrets() []string {
 	if e == nil {
 		return nil
 	}
@@ -186,8 +187,8 @@ func (e *PostgresSpec) GetSecrets() []string {
 	return secrets
 }
 
-func (p *Postgres) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (p *Postgres) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(p.Namespace), labels.SelectorFromSet(p.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/proxysql_helpers.go b/apis/kubedb/v1alpha2/proxysql_helpers.go
@@ -24,6 +24,7 @@ import (
 	"kubedb.dev/apimachinery/crds"
 
 	"github.com/appscode/go/types"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	"kmodules.xyz/client-go/apiextensions"
 	meta_util "kmodules.xyz/client-go/meta"
@@ -149,7 +150,7 @@ func (p *ProxySQL) SetDefaults() {
 	p.Spec.Monitor.SetDefaults()
 }
 
-func (p *ProxySQLSpec) GetSecrets() []string {
+func (p *ProxySQLSpec) GetPersistentSecrets() []string {
 	if p == nil {
 		return nil
 	}
@@ -161,8 +162,8 @@ func (p *ProxySQLSpec) GetSecrets() []string {
 	return secrets
 }
 
-func (p *ProxySQL) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (p *ProxySQL) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	return checkReplicas(lister.StatefulSets(p.Namespace), labels.SelectorFromSet(p.OffshootLabels()), expectedItems)
 }
diff --git a/apis/kubedb/v1alpha2/redis_helpers.go b/apis/kubedb/v1alpha2/redis_helpers.go
@@ -26,6 +26,7 @@ import (
 	"github.com/appscode/go/types"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	appslister "k8s.io/client-go/listers/apps/v1"
 	kmapi "kmodules.xyz/client-go/api/v1"
 	"kmodules.xyz/client-go/apiextensions"
@@ -203,7 +204,7 @@ func (r *Redis) SetTLSDefaults() {
 	r.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(r.Spec.TLS.Certificates, string(RedisMetricsExporterCert), r.CertificateName(RedisMetricsExporterCert))
 }
 
-func (r *RedisSpec) GetSecrets() []string {
+func (r *RedisSpec) GetPersistentSecrets() []string {
 	return nil
 }
 
@@ -272,8 +273,11 @@ func (r *Redis) MustCertSecretName(alias RedisCertificateAlias) string {
 	return name
 }
 
-func (r *Redis) ReplicasAreReady(stsLister appslister.StatefulSetLister) (bool, string, error) {
-	// TODO: Implement database specific logic here
-	// return isReplicasReady, message, error
-	return false, "", nil
+func (r *Redis) ReplicasAreReady(lister appslister.StatefulSetLister) (bool, string, error) {
+	// Desire number of statefulSets
+	expectedItems := 1
+	if r.Spec.Cluster != nil {
+		expectedItems = int(types.Int32(r.Spec.Cluster.Master))
+	}
+	return checkReplicas(lister.StatefulSets(r.Namespace), labels.SelectorFromSet(r.OffshootLabels()), expectedItems)
 }