Avoid unnecessary object updates (#438)

* Avoid unnecessary update for headless service

Before this commit the headless service was updated unnecessarily in
every reconile loop.

* Avoid unnecessary update for client service

Before this commit the client service was updated unnecessarily in
every reconile loop.

* Avoid unnecessary update for StatefulSet

Before this commit the stateful set was updated unnecessarily in
every reconile loop.

* Revert "Avoid unnecessary update for StatefulSet"

This reverts commit 3c28bc5.

Author: ansd

docs/examples/additionalPorts/rabbitmq.yaml

@@ -11,6 +11,7 @@ spec:
           - name: additional-port # adds an additional port on the service
             protocol: TCP
             port: 12345
+            targetPort: 12345
     statefulSet:
       spec:
         template:

internal/resource/headless_service.go

@@ -11,11 +11,13 @@ package resource
 
 import (
 	"fmt"
+
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/internal/metadata"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
@@ -49,18 +51,22 @@ func (builder *HeadlessServiceBuilder) Update(object runtime.Object) error {
 	service.Labels = metadata.GetLabels(builder.Instance.Name, builder.Instance.Labels)
 	service.Annotations = metadata.ReconcileAndFilterAnnotations(service.GetAnnotations(), builder.Instance.Annotations)
 	service.Spec = corev1.ServiceSpec{
-		ClusterIP: "None",
-		Selector:  metadata.LabelSelector(builder.Instance.Name),
+		Type:            corev1.ServiceTypeClusterIP,
+		ClusterIP:       "None",
+		SessionAffinity: corev1.ServiceAffinityNone,
+		Selector:        metadata.LabelSelector(builder.Instance.Name),
 		Ports: []corev1.ServicePort{
 			{
-				Protocol: corev1.ProtocolTCP,
-				Port:     4369,
-				Name:     "epmd",
+				Protocol:   corev1.ProtocolTCP,
+				Port:       4369,
+				TargetPort: intstr.FromInt(4369),
+				Name:       "epmd",
 			},
 			{
-				Protocol: corev1.ProtocolTCP,
-				Port:     25672,
-				Name:     "cluster-rpc", // aka distribution port
+				Protocol:   corev1.ProtocolTCP,
+				Port:       25672,
+				TargetPort: intstr.FromInt(25672),
+				Name:       "cluster-rpc", // aka distribution port
 			},
 		},
 		PublishNotReadyAddresses: true,

internal/resource/headless_service_test.go

@@ -17,6 +17,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
 
@@ -175,20 +176,24 @@ var _ = Describe("HeadlessService", func() {
 
 		It("sets the required Spec", func() {
 			expectedSpec := corev1.ServiceSpec{
+				Type:      corev1.ServiceTypeClusterIP,
 				ClusterIP: "None",
 				Selector: map[string]string{
 					"app.kubernetes.io/name": "rabbit-spec",
 				},
+				SessionAffinity: corev1.ServiceAffinityNone,
 				Ports: []corev1.ServicePort{
 					{
-						Protocol: corev1.ProtocolTCP,
-						Port:     4369,
-						Name:     "epmd",
+						Protocol:   corev1.ProtocolTCP,
+						Port:       4369,
+						TargetPort: intstr.FromInt(4369),
+						Name:       "epmd",
 					},
 					{
-						Protocol: corev1.ProtocolTCP,
-						Port:     25672,
-						Name:     "cluster-rpc",
+						Protocol:   corev1.ProtocolTCP,
+						Port:       25672,
+						TargetPort: intstr.FromInt(25672),
+						Name:       "cluster-rpc",
 					},
 				},
 				PublishNotReadyAddresses: true,

internal/resource/service.go

@@ -13,6 +13,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
@@ -111,49 +112,56 @@ func applySvcOverride(svc *corev1.Service, override *rabbitmqv1beta1.Service) er
 func (builder *ServiceBuilder) updatePorts(servicePorts []corev1.ServicePort) []corev1.ServicePort {
 	servicePortsMap := map[string]corev1.ServicePort{
 		"amqp": {
-			Protocol: corev1.ProtocolTCP,
-			Port:     5672,
-			Name:     "amqp",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       5672,
+			TargetPort: intstr.FromInt(5672),
+			Name:       "amqp",
 		},
 		"management": {
-			Protocol: corev1.ProtocolTCP,
-			Port:     15672,
-			Name:     "management",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       15672,
+			TargetPort: intstr.FromInt(15672),
+			Name:       "management",
 		},
 	}
 	if builder.Instance.AdditionalPluginEnabled("rabbitmq_mqtt") {
 		servicePortsMap["mqtt"] = corev1.ServicePort{
-			Protocol: corev1.ProtocolTCP,
-			Port:     1883,
-			Name:     "mqtt",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       1883,
+			TargetPort: intstr.FromInt(1883),
+			Name:       "mqtt",
 		}
 	}
 	if builder.Instance.AdditionalPluginEnabled("rabbitmq_web_mqtt") {
 		servicePortsMap["web-mqtt"] = corev1.ServicePort{
-			Protocol: corev1.ProtocolTCP,
-			Port:     15675,
-			Name:     "web-mqtt",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       15675,
+			TargetPort: intstr.FromInt(15675),
+			Name:       "web-mqtt",
 		}
 	}
 	if builder.Instance.AdditionalPluginEnabled("rabbitmq_stomp") {
 		servicePortsMap["stomp"] = corev1.ServicePort{
-			Protocol: corev1.ProtocolTCP,
-			Port:     61613,
-			Name:     "stomp",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       61613,
+			TargetPort: intstr.FromInt(61613),
+			Name:       "stomp",
 		}
 	}
 	if builder.Instance.AdditionalPluginEnabled("rabbitmq_web_stomp") {
 		servicePortsMap["web-stomp"] = corev1.ServicePort{
-			Protocol: corev1.ProtocolTCP,
-			Port:     15674,
-			Name:     "web-stomp",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       15674,
+			TargetPort: intstr.FromInt(15674),
+			Name:       "web-stomp",
 		}
 	}
 	if builder.Instance.TLSEnabled() {
 		servicePortsMap["amqps"] = corev1.ServicePort{
-			Protocol: corev1.ProtocolTCP,
-			Port:     5671,
-			Name:     "amqps",
+			Protocol:   corev1.ProtocolTCP,
+			Port:       5671,
+			TargetPort: intstr.FromInt(5671),
+			Name:       "amqps",
 		}
 	}