Skip to content

Commit 924dcbc

Browse files
committed
cr: remove log and remove already exists handling which is not triggered anymore
1 parent 578c453 commit 924dcbc

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

  • internal/controller/postgrescluster

internal/controller/postgrescluster/pki.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,11 @@ func (r *Reconciler) reconcileCertManagerRootCertificate(
185185
}
186186
c := r.CertManagerCtrlFunc(r.Client, r.Scheme, false)
187187
err = c.ApplyCAIssuer(ctx, cluster)
188-
if err != nil && !k8serrors.IsAlreadyExists(err) {
188+
if err != nil {
189189
return nil, errors.Wrap(err, "error applying CA issuer")
190190
}
191191
err = c.ApplyCACertificate(ctx, cluster)
192-
if err != nil && !k8serrors.IsAlreadyExists(err) {
192+
if err != nil {
193193
return nil, errors.Wrap(err, "error applying CA certificate")
194194
}
195195

@@ -331,12 +331,10 @@ func (r *Reconciler) reconcileCertManagerClusterCertificate(
331331
) (
332332
*corev1.SecretProjection, error,
333333
) {
334-
log := logging.FromContext(ctx)
335-
336334
c := r.CertManagerCtrlFunc(r.Client, r.Scheme, false)
337335

338336
err := c.ApplyIssuer(ctx, cluster)
339-
if err != nil && !k8serrors.IsAlreadyExists(err) {
337+
if err != nil {
340338
return nil, errors.Wrap(err, "failed to apply TLS issuer")
341339
}
342340

@@ -351,12 +349,10 @@ func (r *Reconciler) reconcileCertManagerClusterCertificate(
351349
dnsNames := append(primaryDNSNames, replicaDNSNames...)
352350

353351
err = c.ApplyClusterCertificate(ctx, cluster, dnsNames)
354-
if err != nil && !k8serrors.IsAlreadyExists(err) {
352+
if err != nil {
355353
return nil, errors.Wrap(err, "failed to apply cluster certificate")
356354
}
357355

358-
log.V(1).Info("cert-manager cluster certificate applied", "secret", naming.PostgresTLSSecret(cluster).Name)
359-
360356
return clusterCertSecretProjection(&corev1.Secret{
361357
ObjectMeta: naming.PostgresTLSSecret(cluster),
362358
}), nil

0 commit comments

Comments
 (0)