refactor: remove pg health check

Signed-off-by: zhuhuijun <zhuhuijunzhj@gmail.com>
goharbor · Mar 2, 2021 · 6be5508 · 6be5508
1 parent eb5d993
commit 6be5508
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 83 deletions.
diff --git a/pkg/cluster/controllers/database/healthchecker.go b/pkg/cluster/controllers/database/healthchecker.go
diff --git a/pkg/cluster/controllers/database/postgresql.go b/pkg/cluster/controllers/database/postgresql.go
@@ -35,10 +35,6 @@ type Connect struct {
 	Database string
 }
 
-func (p *PostgreSQLController) HealthChecker() lcm.HealthChecker {
-	return &PostgreSQLHealthChecker{}
-}
-
 func (p *PostgreSQLController) Apply(ctx context.Context, harborcluster *goharborv1alpha2.HarborCluster) (*lcm.CRStatus, error) {
 	p.DClient.WithContext(ctx)
 	p.Client.WithContext(ctx)

diff --git a/pkg/cluster/controllers/database/readiness.go b/pkg/cluster/controllers/database/readiness.go
@@ -43,28 +43,17 @@ const (
 // - return postgre properties if postgre has available.
 func (p *PostgreSQLController) Readiness(ctx context.Context) (*lcm.CRStatus, error) {
 	var (
-		conn   *Connect
-		client *pgx.Conn
-		err    error
+		conn *Connect
+		err  error
 	)
 
 	name := p.HarborCluster.Name
 
-	conn, client, err = p.GetInClusterDatabaseInfo(ctx)
+	conn, _, err = p.GetInClusterDatabaseInfo(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	defer client.Close(ctx)
-
-	if err := client.Ping(ctx); err != nil {
-		p.Log.Error(err, "Fail to check Database.",
-			"namespace", p.HarborCluster.Namespace,
-			"name", p.HarborCluster.Name)
-
-		return nil, err
-	}
-
 	p.Log.Info("Database already ready.",
 		"namespace", p.HarborCluster.Namespace,
 		"name", p.HarborCluster.Name)