Skip to content

Commit 11537d7

Browse files
pooknullpooknull
committed
fix tests
1 parent 306f846 commit 11537d7

6 files changed

Lines changed: 38 additions & 23 deletions

File tree

‎internal/controller/postgrescluster/instance.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ func (r *Reconciler) reconcileInstanceCertificates(
14891489
rootCertificateAuth *pki.RootCertificateAuthority,
14901490
) (*corev1.Secret, error) {
14911491
if cluster.Spec.CustomTLSSecret == nil {
1492-
if cluster.Spec.TLS.CertManagementPolicy == v1beta1.CertManagementUserProvidedOnly {
1492+
if cluster.Spec.TLS.GetCertManagementPolicy() == v1beta1.CertManagementUserProvidedOnly {
14931493
existing := &corev1.Secret{ObjectMeta: naming.InstanceCertificates(instance)}
14941494
if err := r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing); err != nil {
14951495
return nil, errors.Wrapf(err, "get user-provided instance TLS secret %s", existing.Name)

‎internal/controller/postgrescluster/patroni.go‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ func (r *Reconciler) deletePatroniArtifacts(
3737
selector, err := naming.AsSelector(naming.ClusterPatronis(cluster))
3838
if err == nil {
3939
err = errors.WithStack(
40-
r.Client.DeleteAllOf(ctx, &corev1.Endpoints{},
40+
r.Client.DeleteAllOf(
41+
ctx, &corev1.Endpoints{},
4142
client.InNamespace(cluster.Namespace),
4243
client.MatchingLabelsSelector{Selector: selector},
43-
))
44+
),
45+
)
4446
}
4547

4648
return err
@@ -158,13 +160,15 @@ func (r *Reconciler) reconcilePatroniDistributedConfiguration(
158160
err := errors.WithStack(r.setControllerReference(cluster, dcsService))
159161

160162
dcsService.Annotations = naming.Merge(
161-
cluster.Spec.Metadata.GetAnnotationsOrNil())
163+
cluster.Spec.Metadata.GetAnnotationsOrNil(),
164+
)
162165
dcsService.Labels = naming.Merge(
163166
cluster.Spec.Metadata.GetLabelsOrNil(),
164167
naming.WithPerconaLabels(map[string]string{ // K8SPG-430
165168
naming.LabelCluster: cluster.Name,
166169
naming.LabelPatroni: naming.PatroniScope(cluster),
167-
}, cluster.Name, "", cluster.Labels[naming.LabelVersion]))
170+
}, cluster.Name, "", cluster.Labels[naming.LabelVersion]),
171+
)
168172

169173
// Allocate no IP address (headless) and create no Endpoints.
170174
// - https://docs.k8s.io/concepts/services-networking/service/#headless-services
@@ -225,7 +229,8 @@ func (r *Reconciler) reconcilePatroniDynamicConfiguration(
225229
logging.FromContext(ctx).V(1).Info("Replacing patroni dynamic configuration")
226230

227231
return errors.WithStack(
228-
patroni.Executor(exec).ReplaceConfiguration(ctx, configuration))
232+
patroni.Executor(exec).ReplaceConfiguration(ctx, configuration),
233+
)
229234
}
230235

231236
// generatePatroniLeaderLeaseService returns a v1.Service that exposes the
@@ -237,9 +242,11 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
237242
service.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Service"))
238243

239244
service.Annotations = naming.Merge(
240-
cluster.Spec.Metadata.GetAnnotationsOrNil())
245+
cluster.Spec.Metadata.GetAnnotationsOrNil(),
246+
)
241247
service.Labels = naming.Merge(
242-
cluster.Spec.Metadata.GetLabelsOrNil())
248+
cluster.Spec.Metadata.GetLabelsOrNil(),
249+
)
243250

244251
if spec := cluster.Spec.Service; spec != nil {
245252
service.Annotations = naming.Merge(service.Annotations,
@@ -338,7 +345,8 @@ func (r *Reconciler) reconcilePatroniStatus(
338345

339346
dcs := &corev1.Endpoints{ObjectMeta: naming.PatroniDistributedConfiguration(cluster)}
340347
err := errors.WithStack(client.IgnoreNotFound(
341-
r.Client.Get(ctx, client.ObjectKeyFromObject(dcs), dcs)))
348+
r.Client.Get(ctx, client.ObjectKeyFromObject(dcs), dcs),
349+
))
342350

343351
if err == nil {
344352
if dcs.Annotations["initialize"] != "" {
@@ -380,7 +388,7 @@ func (r *Reconciler) reconcileReplicationSecret(
380388
return custom, err
381389
}
382390

383-
if cluster.Spec.TLS.CertManagementPolicy == v1beta1.CertManagementUserProvidedOnly {
391+
if cluster.Spec.TLS.GetCertManagementPolicy() == v1beta1.CertManagementUserProvidedOnly {
384392
secret := &corev1.Secret{ObjectMeta: naming.ReplicationClientCertSecret(cluster)}
385393
if err := r.Client.Get(ctx, client.ObjectKeyFromObject(secret), secret); err != nil {
386394
return nil, errors.Wrapf(err, "get user-provided replication TLS secret %s", secret.Name)
@@ -417,7 +425,8 @@ func (r *Reconciler) reconcileInternalReplicationSecret(
417425
) (*corev1.Secret, error) {
418426
existing := &corev1.Secret{ObjectMeta: naming.ReplicationClientCertSecret(cluster)}
419427
err := errors.WithStack(client.IgnoreNotFound(
420-
r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing)))
428+
r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing),
429+
))
421430

422431
leaf := &pki.LeafCertificate{}
423432
commonName := postgres.ReplicationUser
@@ -440,14 +449,16 @@ func (r *Reconciler) reconcileInternalReplicationSecret(
440449

441450
// set labels and annotations
442451
intent.Annotations = naming.Merge(
443-
cluster.Spec.Metadata.GetAnnotationsOrNil())
452+
cluster.Spec.Metadata.GetAnnotationsOrNil(),
453+
)
444454
intent.Labels = naming.Merge(
445455
cluster.Spec.Metadata.GetLabelsOrNil(),
446456

447457
naming.WithPerconaLabels(map[string]string{
448458
naming.LabelCluster: cluster.Name,
449459
naming.LabelClusterCertificate: "replication-client-tls",
450-
}, cluster.Name, "", cluster.Labels[naming.LabelVersion]))
460+
}, cluster.Name, "", cluster.Labels[naming.LabelVersion]),
461+
)
451462

452463
// K8SPG-330: Keep this commented in case of conflicts.
453464
// We don't want to delete TLS secrets on cluster deletion.
@@ -572,7 +583,8 @@ func (r *Reconciler) reconcilePatroniSwitchover(ctx context.Context,
572583
if len(targetInstance.Pods) != 1 {
573584
// We expect that a target instance should have one associated pod.
574585
return errors.Errorf(
575-
"TargetInstance should have one pod. Pods (%d)", len(targetInstance.Pods))
586+
"TargetInstance should have one pod. Pods (%d)", len(targetInstance.Pods),
587+
)
576588
}
577589
} else {
578590
log.V(1).Info("TargetInstance not provided")

‎internal/controller/postgrescluster/pgbackrest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,7 @@ func (r *Reconciler) reconcilePGBackRestSecret(ctx context.Context,
22222222
r.Client.Get(ctx, client.ObjectKeyFromObject(intent), existing),
22232223
))
22242224

2225-
if err == nil && cluster.Spec.TLS.CertManagementPolicy == v1beta1.CertManagementUserProvidedOnly {
2225+
if err == nil && cluster.Spec.TLS.GetCertManagementPolicy() == v1beta1.CertManagementUserProvidedOnly {
22262226
if repoHost != nil && len(existing.Name) == 0 {
22272227
return errors.Errorf("user-provided pgBackRest secret %q is missing", intent.Name)
22282228
}

‎internal/controller/postgrescluster/pgbouncer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ func (r *Reconciler) reconcilePGBouncerSecret(
266266

267267
err = client.IgnoreNotFound(err)
268268

269-
if cluster.Spec.TLS.CertManagementPolicy == v1beta1.CertManagementUserProvidedOnly {
269+
if cluster.Spec.TLS.GetCertManagementPolicy() == v1beta1.CertManagementUserProvidedOnly {
270270
if !secretFound {
271271
return nil, errors.Errorf("user-provided PgBouncer secret %q is missing", naming.ClusterPGBouncer(cluster).Name)
272272
}

‎internal/controller/postgrescluster/pki.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,9 @@ func (r *Reconciler) reconcileTLSCertManagementPolicy(ctx context.Context, clust
3939
Reason: "TLSSecretsFound",
4040
ObservedGeneration: cluster.GetGeneration(),
4141
}
42-
policy := v1beta1.CertManagementAuto
43-
if cluster.Spec.TLS != nil && cluster.Spec.TLS.CertManagementPolicy != "" {
44-
policy = cluster.Spec.TLS.CertManagementPolicy
45-
}
4642

47-
if policy != v1beta1.CertManagementUserProvidedOnly {
48-
cond.Message = "certManagementPolicy is " + string(policy)
43+
if cluster.Spec.TLS.GetCertManagementPolicy() != v1beta1.CertManagementUserProvidedOnly {
44+
cond.Message = "certManagementPolicy is " + string(cluster.Spec.TLS.GetCertManagementPolicy())
4945
meta.SetStatusCondition(&cluster.Status.Conditions, cond)
5046
return nil
5147
}
@@ -184,7 +180,7 @@ func (r *Reconciler) reconcileRootCertificate(
184180
}
185181
}
186182

187-
if cluster.Spec.TLS.CertManagementPolicy == v1beta1.CertManagementUserProvidedOnly {
183+
if cluster.Spec.TLS.GetCertManagementPolicy() == v1beta1.CertManagementUserProvidedOnly {
188184
if err != nil {
189185
return nil, errors.Wrap(err, "get user-provided root CA secret")
190186
}

‎pkg/apis/upstream.pgv2.percona.com/v1beta1/postgrescluster_types.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,13 @@ type TLSSpec struct {
233233
CertManagementPolicy CertManagementPolicy `json:"certManagementPolicy,omitempty"`
234234
}
235235

236+
func (s *TLSSpec) GetCertManagementPolicy() CertManagementPolicy {
237+
if s == nil || s.CertManagementPolicy == "" {
238+
return CertManagementAuto
239+
}
240+
return s.CertManagementPolicy
241+
}
242+
236243
type CertManagementPolicy string
237244

238245
const (

0 commit comments

Comments
 (0)