allow to customize readiness probe path

pkg/components/httpproxy.go

@@ -56,6 +56,19 @@ func NewHTTPProxy(
 		func() ([]byte, error) {
 			return cfgen.GetHTTPProxyConfig(spec)
 		},
+		WithComponentContainerPorts([]corev1.ContainerPort{
+			{
+				Name:          "http-proxy-http",
+				ContainerPort: consts.HTTPProxyHTTPPort,
+				Protocol:      corev1.ProtocolTCP,
+			},
+			{
+				Name:          "http-proxy-https",
+				ContainerPort: consts.HTTPProxyHTTPSPort,
+				Protocol:      corev1.ProtocolTCP,
+			},
+		}),
+		WithReadinessProbeHTTPPath("/ping"),
 	)
 
 	var httpsSecret *resources.TLSSecret

pkg/components/rpcproxy.go

@@ -53,6 +53,13 @@ func NewRPCProxy(
 		func() ([]byte, error) {
 			return cfgen.GetRPCProxyConfig(spec)
 		},
+		WithComponentContainerPorts([]corev1.ContainerPort{
+			{
+				Name:          "rpc-proxy",
+				ContainerPort: consts.RPCProxyRPCPort,
+				Protocol:      corev1.ProtocolTCP,
+			},
+		}),
 	)
 
 	var balancingService *resources.RPCService = nil

pkg/components/server.go

@@ -55,6 +55,9 @@ type serverImpl struct {
 	configHelper      *ConfigHelper
 
 	builtStatefulSet *appsv1.StatefulSet
+
+	readinessProbeHTTPPath  string
+	componentContainerPorts []corev1.ContainerPort
 }
 
 func newServer(
@@ -63,6 +66,7 @@ func newServer(
 	instanceSpec *ytv1.InstanceSpec,
 	binaryPath, configFileName, statefulSetName, serviceName string,
 	generator ytconfig.YsonGeneratorFunc,
+	options ...Option,
 ) server {
 	proxy := ytsaurus.APIProxy()
 	commonSpec := ytsaurus.GetCommonSpec()
@@ -73,6 +77,7 @@ func newServer(
 		instanceSpec,
 		binaryPath, configFileName, statefulSetName, serviceName,
 		generator,
+		options...,
 	)
 }
 
@@ -83,6 +88,7 @@ func newServerConfigured(
 	instanceSpec *ytv1.InstanceSpec,
 	binaryPath, configFileName, statefulSetName, serviceName string,
 	generator ytconfig.YsonGeneratorFunc,
+	options ...Option,
 ) server {
 	image := commonSpec.CoreImage
 	if instanceSpec.Image != nil {
@@ -107,7 +113,7 @@ func newServerConfigured(
 			consts.BusSecretMountPoint)
 	}
 
-	return &serverImpl{
+	srv := &serverImpl{
 		labeller:     l,
 		image:        image,
 		proxy:        proxy,
@@ -143,7 +149,22 @@ func newServerConfigured(
 					Fmt: ytconfig.ConfigFormatYson,
 				},
 			}),
+
+		readinessProbeHTTPPath: readinessProbeHTTPPath,
+		componentContainerPorts: []corev1.ContainerPort{
+			{
+				Name:          serverAPIPortName,
+				ContainerPort: *instanceSpec.MonitoringPort,
+				Protocol:      corev1.ProtocolTCP,
+			},
+		},
 	}
+
+	for _, opt := range options {
+		opt.apply(srv)
+	}
+
+	return srv
 }
 
 func (s *serverImpl) Fetch(ctx context.Context) error {
@@ -272,19 +293,13 @@ func (s *serverImpl) rebuildStatefulSet() *appsv1.StatefulSet {
 				Name:         consts.YTServerContainerName,
 				Command:      command,
 				VolumeMounts: volumeMounts,
-				Ports: []corev1.ContainerPort{
-					{
-						Name:          serverAPIPortName,
-						ContainerPort: *s.instanceSpec.MonitoringPort,
-						Protocol:      corev1.ProtocolTCP,
-					},
-				},
-				Resources: s.instanceSpec.Resources,
+				Ports:        s.componentContainerPorts,
+				Resources:    s.instanceSpec.Resources,
 				ReadinessProbe: &corev1.Probe{
 					ProbeHandler: corev1.ProbeHandler{
 						HTTPGet: &corev1.HTTPGetAction{
 							Port: intstr.FromString(serverAPIPortName),
-							Path: readinessProbeHTTPPath,
+							Path: s.readinessProbeHTTPPath,
 						},
 					},
 					InitialDelaySeconds: readinessProbeParams.InitialDelaySeconds,

pkg/components/serveroptions.go

@@ -0,0 +1,42 @@
+package components
+
+import corev1 "k8s.io/api/core/v1"
+
+type Option interface {
+	apply(srv *serverImpl)
+}
+
+var (
+	_ Option = &ReadinessProbeHTTPPath{}
+	_ Option = &ComponentContainerPorts{}
+)
+
+type ReadinessProbeHTTPPath struct {
+	path string
+}
+
+func (r ReadinessProbeHTTPPath) apply(srv *serverImpl) {
+	srv.readinessProbeHTTPPath = r.path
+}
+
+func WithReadinessProbeHTTPPath(path string) Option {
+	return ReadinessProbeHTTPPath{
+		path: path,
+	}
+}
+
+type ComponentContainerPorts struct {
+	ports []corev1.ContainerPort
+}
+
+func (c ComponentContainerPorts) apply(srv *serverImpl) {
+	for _, port := range c.ports {
+		srv.componentContainerPorts = append(srv.componentContainerPorts, port)
+	}
+}
+
+func WithComponentContainerPorts(ports []corev1.ContainerPort) Option {
+	return ComponentContainerPorts{
+		ports: ports,
+	}
+}