From f6358331ec6ba297427e4808b7a814df4646eb22 Mon Sep 17 00:00:00 2001 From: Senyo Simpson Date: Thu, 4 Sep 2025 12:48:03 +0200 Subject: [PATCH 1/2] use annotations set in spec --- internal/controller/postgrescluster/cluster.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index 32140faee9..fb9a97f9c5 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -104,16 +104,24 @@ func (r *Reconciler) generateClusterPrimaryService( service := &corev1.Service{ObjectMeta: naming.ClusterPrimaryService(cluster)} service.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Service")) - - service.Annotations = naming.Merge( - cluster.Spec.Metadata.GetAnnotationsOrNil()) + service.Annotations = cluster.Spec.Metadata.GetAnnotationsOrNil() service.Labels = naming.Merge( cluster.Spec.Metadata.GetLabelsOrNil(), // K8SPG-430 naming.WithPerconaLabels(map[string]string{ naming.LabelCluster: cluster.Name, naming.LabelRole: naming.RolePrimary, - }, cluster.Name, "pg", cluster.Labels[naming.LabelVersion])) + }, cluster.Name, "pg", cluster.Labels[naming.LabelVersion]), + ) + + if spec := cluster.Spec.Service; spec != nil { + service.Annotations = naming.Merge( + service.Annotations, + spec.Metadata.GetAnnotationsOrNil()) + service.Labels = naming.Merge( + service.Labels, + spec.Metadata.GetLabelsOrNil()) + } err := errors.WithStack(r.setControllerReference(cluster, service)) From 4991fc804958e5d1a492fc52df0f9999f60600b0 Mon Sep 17 00:00:00 2001 From: Senyo Simpson Date: Thu, 4 Sep 2025 12:58:56 +0200 Subject: [PATCH 2/2] formatting --- internal/controller/postgrescluster/cluster.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/controller/postgrescluster/cluster.go b/internal/controller/postgrescluster/cluster.go index fb9a97f9c5..54fda70bc5 100644 --- a/internal/controller/postgrescluster/cluster.go +++ b/internal/controller/postgrescluster/cluster.go @@ -117,10 +117,12 @@ func (r *Reconciler) generateClusterPrimaryService( if spec := cluster.Spec.Service; spec != nil { service.Annotations = naming.Merge( service.Annotations, - spec.Metadata.GetAnnotationsOrNil()) + spec.Metadata.GetAnnotationsOrNil(), + ) service.Labels = naming.Merge( service.Labels, - spec.Metadata.GetLabelsOrNil()) + spec.Metadata.GetLabelsOrNil(), + ) } err := errors.WithStack(r.setControllerReference(cluster, service))