feat:

Author: Jorres

api/v1alpha1/const.go

@@ -9,11 +9,12 @@ const (
 	DefaultDomainName   = "cluster.local"
 	DNSDomainAnnotation = "dns.domain"
 
-	GRPCPort              = 2135
-	GRPCServicePortName   = "grpc"
-	GRPCProto             = "grpc://"
-	GRPCSProto            = "grpcs://"
-	GRPCServiceFQDNFormat = "%s-grpc.%s.svc.%s"
+	GRPCPort                      = 2135
+	GRPCServicePortName           = "grpc"
+	GRPCServiceAdditionalPortName = "additional-grpc"
+	GRPCProto                     = "grpc://"
+	GRPCSProto                    = "grpcs://"
+	GRPCServiceFQDNFormat         = "%s-grpc.%s.svc.%s"
 
 	InterconnectPort              = 19001
 	InterconnectServicePortName   = "interconnect"

api/v1alpha1/service_types.go

@@ -20,6 +20,8 @@ type TLSConfiguration struct {
 type GRPCService struct {
 	Service `json:""`
 
+	AdditionalPort int32 `json:"additionalPort,omitempty"`
+
 	TLSConfiguration *TLSConfiguration `json:"tls,omitempty"`
 	ExternalHost     string            `json:"externalHost,omitempty"`
 	ExternalPort     int32             `json:"externalPort,omitempty"`

deploy/ydb-operator/crds/database.yaml

@@ -4073,6 +4073,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

deploy/ydb-operator/crds/databasenodeset.yaml

@@ -2685,6 +2685,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

deploy/ydb-operator/crds/remotedatabasenodeset.yaml

@@ -2686,6 +2686,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

deploy/ydb-operator/crds/remotestoragenodeset.yaml

@@ -2713,6 +2713,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

deploy/ydb-operator/crds/storage.yaml

@@ -5214,6 +5214,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

deploy/ydb-operator/crds/storagenodeset.yaml

@@ -2712,6 +2712,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      additionalPort:
+                        format: int32
+                        type: integer
                       externalHost:
                         type: string
                       externalPort:

internal/controllers/storage/controller_test.go

@@ -97,8 +97,38 @@ var _ = Describe("Storage controller medium tests", func() {
 			},
 		})
 
+		storageSample.Spec.Service.GRPC.AdditionalPort = 2136
+
 		Expect(k8sClient.Create(ctx, storageSample)).Should(Succeed())
 
+		By("Check grpc service has an additional port...", func() {
+			var svc corev1.Service
+			serviceName := fmt.Sprintf("%v-grpc", testobjects.StorageName)
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx,
+					client.ObjectKey{
+						Name:      serviceName,
+						Namespace: testobjects.YdbNamespace,
+					},
+					&svc,
+				)
+				if err != nil {
+					return false
+				}
+				return true
+			}, test.Timeout, test.Interval).Should(BeTrue(),
+				"Service %s/%s should eventually exist", testobjects.YdbNamespace, serviceName,
+			)
+
+			ports := svc.Spec.Ports
+			Expect(len(ports)).To(Equal(2), "expected 2 ports but got %d", len(ports))
+			Expect(ports[0].Port).To(Equal(int32(2135)))
+			Expect(ports[0].Name).To(Equal(v1alpha1.GRPCServicePortName))
+			Expect(ports[1].Port).To(Equal(int32(2136)))
+			Expect(ports[1].Name).To(Equal(v1alpha1.GRPCServiceAdditionalPortName))
+			Expect(ports[1].TargetPort.IntVal).To(Equal(int32(2136)))
+		})
+
 		By("Check volume has been propagated to pods...")
 		storageStatefulSets := appsv1.StatefulSetList{}
 		Eventually(func() bool {

internal/resources/storage.go

@@ -177,10 +177,7 @@ func (b *StorageClusterBuilder) GetResourceBuilders(restConfig *rest.Config) []R
 			Labels:         grpcServiceLabels,
 			SelectorLabels: storageSelectorLabels,
 			Annotations:    b.Spec.Service.GRPC.AdditionalAnnotations,
-			Ports: []corev1.ServicePort{{
-				Name: api.GRPCServicePortName,
-				Port: api.GRPCPort,
-			}},
+			Ports:          b.buildGrpcServicePorts(),
 			IPFamilies:     b.Spec.Service.GRPC.IPFamilies,
 			IPFamilyPolicy: b.Spec.Service.GRPC.IPFamilyPolicy,
 		},
@@ -214,6 +211,22 @@ func (b *StorageClusterBuilder) GetResourceBuilders(restConfig *rest.Config) []R
 	)
 }
 
+func (b *StorageClusterBuilder) buildGrpcServicePorts() []corev1.ServicePort {
+	ports := []corev1.ServicePort{{
+		Name: api.GRPCServicePortName,
+		Port: api.GRPCPort,
+	}}
+
+	if b.Spec.Service.GRPC.AdditionalPort != 0 {
+		ports = append(ports, corev1.ServicePort{
+			Name: api.GRPCServiceAdditionalPortName,
+			Port: b.Spec.Service.GRPC.AdditionalPort,
+		})
+	}
+
+	return ports
+}
+
 func (b *StorageClusterBuilder) getNodeSetBuilders() []ResourceBuilder {
 	var nodeSetBuilders []ResourceBuilder