fix: Set appProtocol for service resources (#797)

Signed-off-by: Vasileios Pallas <vasileios.pallas@flyr.com>
Co-authored-by: Vasileios Pallas <vasileios.pallas@flyr.com>

Author: vspallas-flyr

internal/common/flagdproxy/flagdproxy.go

@@ -16,6 +16,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/util/retry"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -179,9 +180,10 @@ func (f *FlagdProxyHandler) newFlagdProxyService(ownerReference *metav1.OwnerRef
 			},
 			Ports: []corev1.ServicePort{
 				{
-					Name:       "flagd-proxy",
-					Port:       int32(f.config.Port),
-					TargetPort: intstr.FromInt(f.config.Port),
+					AppProtocol: ptr.To("grpc"),
+					Name:        "flagd-proxy",
+					Port:        int32(f.config.Port),
+					TargetPort:  intstr.FromInt(f.config.Port),
 				},
 			},
 		},

internal/common/flagdproxy/flagdproxy_test.go

@@ -158,9 +158,10 @@ var (
 			},
 			Ports: []corev1.ServicePort{
 				{
-					Name:       "flagd-proxy",
-					Port:       int32(testPort),
-					TargetPort: intstr.FromInt(testPort),
+					AppProtocol: ptr.To("grpc"),
+					Name:        "flagd-proxy",
+					Port:        int32(testPort),
+					TargetPort:  intstr.FromInt(testPort),
 				},
 			},
 		},

internal/controller/core/flagd/resources/service.go

@@ -10,6 +10,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -56,29 +57,33 @@ func (r FlagdService) GetResource(_ context.Context, flagd *api.Flagd) (client.O
 			},
 			Ports: []v1.ServicePort{
 				{
-					Name: "flagd",
-					Port: int32(r.FlagdConfig.FlagdPort),
+					AppProtocol: ptr.To("grpc"),
+					Name:        "flagd",
+					Port:        int32(r.FlagdConfig.FlagdPort),
 					TargetPort: intstr.IntOrString{
 						IntVal: int32(r.FlagdConfig.FlagdPort),
 					},
 				},
 				{
-					Name: "ofrep",
-					Port: int32(r.FlagdConfig.OFREPPort),
+					AppProtocol: ptr.To("http"),
+					Name:        "ofrep",
+					Port:        int32(r.FlagdConfig.OFREPPort),
 					TargetPort: intstr.IntOrString{
 						IntVal: int32(r.FlagdConfig.OFREPPort),
 					},
 				},
 				{
-					Name: "sync",
-					Port: int32(r.FlagdConfig.SyncPort),
+					AppProtocol: ptr.To("grpc"),
+					Name:        "sync",
+					Port:        int32(r.FlagdConfig.SyncPort),
 					TargetPort: intstr.IntOrString{
 						IntVal: int32(r.FlagdConfig.SyncPort),
 					},
 				},
 				{
-					Name: "metrics",
-					Port: int32(r.FlagdConfig.ManagementPort),
+					AppProtocol: ptr.To("http"),
+					Name:        "metrics",
+					Port:        int32(r.FlagdConfig.ManagementPort),
 					TargetPort: intstr.IntOrString{
 						IntVal: int32(r.FlagdConfig.ManagementPort),
 					},

internal/controller/core/flagd/resources/service_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -30,6 +31,27 @@ func TestFlagdService_getService(t *testing.T) {
 	require.Nil(t, err)
 	require.NotNil(t, svc)
 	require.IsType(t, &v1.Service{}, svc)
+
+	expectedPorts := map[string]struct {
+		appProtocol string
+		port        int32
+	}{
+		"flagd":   {"grpc", 8013},
+		"ofrep":   {"http", 8016},
+		"sync":    {"grpc", 8015},
+		"metrics": {"http", 8014},
+	}
+
+	ports := svc.(*v1.Service).Spec.Ports
+	require.Len(t, ports, len(expectedPorts), "unexpected number of ports")
+
+	for _, port := range ports {
+		expected, ok := expectedPorts[port.Name]
+		require.True(t, ok, "unexpected port: %s", port.Name)
+		require.Equal(t, expected.appProtocol, *port.AppProtocol)
+		require.Equal(t, expected.port, port.Port)
+		require.Equal(t, intstr.FromInt(int(expected.port)), port.TargetPort)
+	}
 }
 
 func Test_areServicesEqual(t *testing.T) {