Skip to content

Commit

Permalink
fix(database) set ref pg secret owner (#662)
Browse files Browse the repository at this point in the history
fixed #660

Signed-off-by: zhuhuijun <zhuhuijunzhj@gmail.com>
  • Loading branch information
Ghostbaby committed Jun 2, 2021
1 parent 9d72fe0 commit 055b6b5
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions pkg/cluster/controllers/database/readiness.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ func (p *PostgreSQLController) Readiness(ctx context.Context, harborcluster *goh
return nil, err
}

if err := p.SetRefSecretOwner(ctx, "postgres", harborcluster); err != nil {
return nil, err
}

if err := p.SetRefSecretOwner(ctx, "standby", harborcluster); err != nil {
return nil, err
}

p.Log.Info("Database is ready.", "namespace", harborcluster.Namespace, "name", name)

properties := &lcm.Properties{}
Expand Down Expand Up @@ -104,6 +112,31 @@ func getDatabasePasswordRefName(name string) string {
return fmt.Sprintf("%s-%s-%s", name, "database", "password")
}

// SetRefSecretOwner set owner to pg operator created secrets.
func (p *PostgreSQLController) SetRefSecretOwner(ctx context.Context, dbName string, harborcluster *goharborv1.HarborCluster) error {
ns := harborcluster.Namespace
secretName := GenInClusterPasswordSecretName(dbName, p.resourceName(harborcluster.Namespace, harborcluster.Name))

secret := &corev1.Secret{}
if err := p.Client.Get(ctx, types.NamespacedName{Name: secretName, Namespace: ns}, secret); err != nil {
if kerr.IsNotFound(err) {
return nil
}

return err
}

if err := controllerutil.SetControllerReference(harborcluster, secret, p.Scheme); err != nil {
return err
}

if err := p.Client.Update(ctx, secret); err != nil {
return err
}

return nil
}

// DeployComponentSecret deploy harbor component database secret.
func (p *PostgreSQLController) DeployComponentSecret(ctx context.Context, conn *Connect, secretName string, harborcluster *goharborv1.HarborCluster) error {
ns := harborcluster.Namespace
Expand Down

0 comments on commit 055b6b5

Please sign in to comment.