adding appProtocol to all services

Author: szelenka-cisco

.gitignore

@@ -3,3 +3,4 @@
 tools
 /testing/kuttl/e2e-generated/
 /testing/kuttl/e2e-generated-other/
+postgres_exporter.tar.gz

internal/controller/postgrescluster/cluster.go

@@ -142,11 +142,13 @@ func (r *Reconciler) generateClusterPrimaryService(
 	service.Spec.ClusterIP = corev1.ClusterIPNone
 	service.Spec.Selector = nil
 
+	appProtocol := naming.AppProtocolTCP
 	service.Spec.Ports = []corev1.ServicePort{{
 		Name:       naming.PortPostgreSQL,
 		Port:       *cluster.Spec.Port,
 		Protocol:   corev1.ProtocolTCP,
 		TargetPort: intstr.FromString(naming.PortPostgreSQL),
+		AppProtocol: &appProtocol,
 	}}
 
 	// Resolve to the ClusterIP for which Patroni has configured the Endpoints.
@@ -220,11 +222,13 @@ func (r *Reconciler) generateClusterReplicaService(
 	// The TargetPort must be the name (not the number) of the PostgreSQL
 	// ContainerPort. This name allows the port number to differ between Pods,
 	// which can happen during a rolling update.
+	appProtocol := naming.AppProtocolTCP
 	service.Spec.Ports = []corev1.ServicePort{{
 		Name:       naming.PortPostgreSQL,
 		Port:       *cluster.Spec.Port,
 		Protocol:   corev1.ProtocolTCP,
 		TargetPort: intstr.FromString(naming.PortPostgreSQL),
+		AppProtocol: &appProtocol,
 	}}
 
 	err := errors.WithStack(r.setControllerReference(cluster, service))

internal/controller/postgrescluster/cluster_test.go

@@ -634,7 +634,8 @@ ownerReferences:
   uid: ""
 		`))
 		assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   port: 2600
   protocol: TCP
   targetPort: postgres
@@ -753,7 +754,8 @@ ownerReferences:
 	`))
 	assert.Assert(t, marshalMatches(service.Spec, `
 ports:
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   port: 9876
   protocol: TCP
   targetPort: postgres

internal/controller/postgrescluster/patroni.go

@@ -261,11 +261,13 @@ func (r *Reconciler) generatePatroniLeaderLeaseService(
 	// The TargetPort must be the name (not the number) of the PostgreSQL
 	// ContainerPort. This name allows the port number to differ between
 	// instances, which can happen during a rolling update.
+	appProtocol := naming.AppProtocolTCP
 	servicePort := corev1.ServicePort{
 		Name:       naming.PortPostgreSQL,
 		Port:       *cluster.Spec.Port,
 		Protocol:   corev1.ProtocolTCP,
 		TargetPort: intstr.FromString(naming.PortPostgreSQL),
+		AppProtocol: &appProtocol,
 	}
 
 	if spec := cluster.Spec.Service; spec == nil {

internal/controller/postgrescluster/patroni_test.go

@@ -93,7 +93,8 @@ ownerReferences:
 		// Defaults to ClusterIP.
 		assert.Equal(t, service.Spec.Type, corev1.ServiceTypeClusterIP)
 		assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   port: 9876
   protocol: TCP
   targetPort: postgres
@@ -182,7 +183,8 @@ ownerReferences:
 			alwaysExpect(t, service)
 			test.Expect(t, service)
 			assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   port: 9876
   protocol: TCP
   targetPort: postgres
@@ -207,7 +209,8 @@ ownerReferences:
 				alwaysExpect(t, service)
 				assert.Equal(t, service.Spec.Type, corev1.ServiceTypeNodePort)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   nodePort: 32001
   port: 9876
   protocol: TCP
@@ -220,7 +223,8 @@ ownerReferences:
 				assert.NilError(t, err)
 				alwaysExpect(t, service)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: postgres
+- appProtocol: tcp
+  name: postgres
   nodePort: 32002
   port: 9876
   protocol: TCP

internal/controller/postgrescluster/pgadmin.go

@@ -166,11 +166,13 @@ func (r *Reconciler) generatePGAdminService(
 	//
 	// TODO(tjmoore4): A custom service port is not currently supported as this
 	// requires updates to the pgAdmin service configuration.
+	appProtocol := naming.AppProtocolTCP
 	servicePort := corev1.ServicePort{
 		Name:       naming.PortPGAdmin,
 		Port:       *initialize.Int32(5050),
 		Protocol:   corev1.ProtocolTCP,
 		TargetPort: intstr.FromString(naming.PortPGAdmin),
+		AppProtocol: &appProtocol,
 	}
 
 	if spec := cluster.Spec.UserInterface.PGAdmin.Service; spec == nil {

internal/controller/postgrescluster/pgadmin_test.go

@@ -266,7 +266,8 @@ ownerReferences:
 		// Defaults to ClusterIP.
 		assert.Equal(t, service.Spec.Type, corev1.ServiceTypeClusterIP)
 		assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgadmin
+- appProtocol: tcp
+  name: pgadmin
   port: 5050
   protocol: TCP
   targetPort: pgadmin
@@ -299,7 +300,8 @@ ownerReferences:
 			alwaysExpect(t, service)
 			test.Expect(t, service)
 			assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgadmin
+- appProtocol: tcp
+  name: pgadmin
   port: 5050
   protocol: TCP
   targetPort: pgadmin
@@ -324,7 +326,8 @@ ownerReferences:
 				assert.Equal(t, service.Spec.Type, corev1.ServiceTypeNodePort)
 				alwaysExpect(t, service)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgadmin
+- appProtocol: tcp
+  name: pgadmin
   nodePort: 32001
   port: 5050
   protocol: TCP
@@ -337,7 +340,8 @@ ownerReferences:
 				assert.Equal(t, service.Spec.Type, corev1.ServiceTypeLoadBalancer)
 				alwaysExpect(t, service)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgadmin
+- appProtocol: tcp
+  name: pgadmin
   nodePort: 32002
   port: 5050
   protocol: TCP

internal/controller/postgrescluster/pgbouncer.go

@@ -290,11 +290,13 @@ func (r *Reconciler) generatePGBouncerService(
 	// The TargetPort must be the name (not the number) of the PgBouncer
 	// ContainerPort. This name allows the port number to differ between Pods,
 	// which can happen during a rolling update.
+	appProtocol := naming.AppProtocolTCP
 	servicePort := corev1.ServicePort{
 		Name:       naming.PortPGBouncer,
 		Port:       *cluster.Spec.Proxy.PGBouncer.Port,
 		Protocol:   corev1.ProtocolTCP,
 		TargetPort: intstr.FromString(naming.PortPGBouncer),
+		AppProtocol: &appProtocol,
 	}
 
 	if spec := cluster.Spec.Proxy.PGBouncer.Service; spec == nil {

internal/controller/postgrescluster/pgbouncer_test.go

@@ -175,7 +175,8 @@ ownerReferences:
 		// Defaults to ClusterIP.
 		assert.Equal(t, service.Spec.Type, corev1.ServiceTypeClusterIP)
 		assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgbouncer
+- appProtocol: tcp
+  name: pgbouncer
   port: 9651
   protocol: TCP
   targetPort: pgbouncer
@@ -208,7 +209,8 @@ ownerReferences:
 			alwaysExpect(t, service)
 			test.Expect(t, service)
 			assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgbouncer
+- appProtocol: tcp
+  name: pgbouncer
   port: 9651
   protocol: TCP
   targetPort: pgbouncer
@@ -233,7 +235,8 @@ ownerReferences:
 				assert.Equal(t, service.Spec.Type, corev1.ServiceTypeNodePort)
 				alwaysExpect(t, service)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgbouncer
+- appProtocol: tcp
+  name: pgbouncer
   nodePort: 32001
   port: 9651
   protocol: TCP
@@ -246,7 +249,8 @@ ownerReferences:
 				assert.Equal(t, service.Spec.Type, corev1.ServiceTypeLoadBalancer)
 				alwaysExpect(t, service)
 				assert.Assert(t, marshalMatches(service.Spec.Ports, `
-- name: pgbouncer
+- appProtocol: tcp
+  name: pgbouncer
   nodePort: 32002
   port: 9651
   protocol: TCP

internal/naming/names.go

@@ -186,6 +186,11 @@ const (
 	RestoreConfigCopySuffix = "%s-restorecopy-%d"
 )
 
+const (
+	// AppProtocolTCP is the name of the appProtocol for the Service which use the tcp protocol
+	AppProtocolTCP = "tcp"
+)
+
 // AsObjectKey converts the ObjectMeta API type to a client.ObjectKey.
 // When you have a client.Object, use client.ObjectKeyFromObject() instead.
 func AsObjectKey(m metav1.ObjectMeta) client.ObjectKey {