Merge pull request #1054 from viccuad/fix-service-labels

fix: Correctly set service labels

Author: viccuad

internal/controller/policyserver_controller_service.go

@@ -38,7 +38,6 @@ func (r *PolicyServerReconciler) reconcilePolicyServerService(ctx context.Contex
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      policyServer.NameWithPrefix(),
 			Namespace: r.DeploymentsNamespace,
-			Labels:    policyServer.CommonLabels(),
 		},
 	}
 	_, err := controllerutil.CreateOrPatch(ctx, r.Client, &svc, func() error {
@@ -53,9 +52,14 @@ func (r *PolicyServerReconciler) reconcilePolicyServerService(ctx context.Contex
 func (r *PolicyServerReconciler) updateService(svc *corev1.Service, policyServer *policiesv1.PolicyServer) error {
 	svc.Name = policyServer.NameWithPrefix()
 	svc.Namespace = r.DeploymentsNamespace
-	svc.Labels = map[string]string{
-		constants.AppLabelKey: policyServer.AppLabel(),
+	templateLabels := map[string]string{
+		constants.AppLabelKey:          policyServer.AppLabel(),
+		constants.PolicyServerLabelKey: policyServer.Name,
 	}
+	for key, value := range policyServer.CommonLabels() {
+		templateLabels[key] = value
+	}
+	svc.Labels = templateLabels
 	svc.Spec = corev1.ServiceSpec{
 		Ports: []corev1.ServicePort{
 			{

internal/controller/policyserver_controller_test.go

@@ -608,7 +608,7 @@ var _ = Describe("PolicyServer controller", func() {
 			}).Should(Succeed())
 		})
 
-		It("should create service with owner reference", func() {
+		It("should create service with owner reference and correct labels", func() {
 			policyServer := policiesv1.NewPolicyServerFactory().WithName(policyServerName).Build()
 			createPolicyServerAndWaitForItsService(ctx, policyServer)
 
@@ -640,6 +640,11 @@ var _ = Describe("PolicyServer controller", func() {
 					"Port":       Equal(int32(constants.PolicyServerPort)),
 					"TargetPort": Equal(intstr.IntOrString{IntVal: int32(constants.PolicyServerPort)}),
 				})))
+				// This checks that the service has the legacy and recommended labels
+				// TODO simplify this with a future release
+				for k, v := range policyServer.CommonLabels() {
+					Expect(service.ObjectMeta.Labels).To(HaveKeyWithValue(k, v))
+				}
 				return nil
 			}).Should(Succeed())
 		})