Refactor labeller (#394)

Highlight some mess with "ClusterName" and "ResourceName".
They might be different for for chyt, spyt, and remote nodes.

api/v1/ytsaurus_types.go

@@ -593,9 +593,12 @@ type CommonSpec struct {
 	//+optional
 	ForceTCP *bool `json:"forceTcp,omitempty"`
 
+	// Do not add resource name into names of resources under control.
+	// When enabled resource should not share namespace with other Ytsaurus.
 	//+kubebuilder:default:=true
 	//+optional
 	UseShortNames bool `json:"useShortNames"`
+
 	// Use the host's network namespace for all components.
 	//+kubebuilder:default:=false
 	//+optional

config/crd/bases/cluster.ytsaurus.tech_remotedatanodes.yaml

@@ -1068,6 +1068,8 @@ spec:
                 type: boolean
               useShortNames:
                 default: true
+                description: Do not add resource name into names of resources under
+                  control.
                 type: boolean
               volumeClaimTemplates:
                 items:

config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml

@@ -1261,6 +1261,8 @@ spec:
                 type: boolean
               useShortNames:
                 default: true
+                description: Do not add resource name into names of resources under
+                  control.
                 type: boolean
               volumeClaimTemplates:
                 items:

config/crd/bases/cluster.ytsaurus.tech_remotetabletnodes.yaml

@@ -1068,6 +1068,8 @@ spec:
                 type: boolean
               useShortNames:
                 default: true
+                description: Do not add resource name into names of resources under
+                  control.
                 type: boolean
               volumeClaimTemplates:
                 items:

config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml

@@ -34680,6 +34680,8 @@ spec:
                 type: boolean
               useShortNames:
                 default: true
+                description: Do not add resource name into names of resources under
+                  control.
                 type: boolean
               yqlAgents:
                 properties:

controllers/chyt_sync.go

@@ -17,7 +17,7 @@ func (r *ChytReconciler) Sync(ctx context.Context, resource *ytv1.Chyt, ytsaurus
 
 	chyt := apiproxy.NewChyt(resource, r.Client, r.Recorder, r.Scheme)
 
-	cfgen := ytconfig.NewGenerator(ytsaurus, getClusterDomain(chyt.APIProxy().Client()))
+	cfgen := ytconfig.NewLocalNodeGenerator(ytsaurus, resource.Name, getClusterDomain(chyt.APIProxy().Client()))
 
 	component := components.NewChyt(cfgen, chyt, ytsaurus)
 

controllers/component_manager.go

@@ -10,7 +10,6 @@ import (
 
 	apiProxy "github.com/ytsaurus/ytsaurus-k8s-operator/pkg/apiproxy"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/components"
-	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/labeller"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/ytconfig"
 )
 
@@ -38,6 +37,7 @@ func NewComponentManager(
 
 	clusterDomain := getClusterDomain(ytsaurus.APIProxy().Client())
 	cfgen := ytconfig.NewGenerator(resource, clusterDomain)
+	nodeCfgGen := &cfgen.NodeGenerator
 
 	d := components.NewDiscovery(cfgen, ytsaurus)
 	m := components.NewMaster(cfgen, ytsaurus)
@@ -48,7 +48,6 @@ func NewComponentManager(
 	yc := components.NewYtsaurusClient(cfgen, ytsaurus, hps[0])
 
 	var dnds []components.Component
-	nodeCfgGen := ytconfig.NewLocalNodeGenerator(ytsaurus.GetResource(), clusterDomain)
 	if len(resource.Spec.DataNodes) > 0 {
 		for _, dndSpec := range ytsaurus.GetResource().Spec.DataNodes {
 			dnds = append(dnds, components.NewDataNode(nodeCfgGen, ytsaurus, m, dndSpec))
@@ -265,5 +264,5 @@ func (cm *ComponentManager) arePodsRemoved() bool {
 }
 
 func (cm *ComponentManager) areComponentPodsRemoved(component components.Component) bool {
-	return cm.ytsaurus.IsUpdateStatusConditionTrue(labeller.GetPodsRemovedCondition(component.GetName()))
+	return cm.ytsaurus.IsUpdateStatusConditionTrue(component.GetLabeller().GetPodsRemovedCondition())
 }

controllers/remotedatanodes_sync.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"context"
 
-	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -21,13 +20,7 @@ func (r *RemoteDataNodesReconciler) Sync(
 	logger := log.FromContext(ctx).WithValues("component", "remoteDatanodes")
 	apiProxy := apiproxy.NewAPIProxy(resource, r.Client, r.Recorder, r.Scheme)
 
-	cfgen := ytconfig.NewRemoteNodeGenerator(
-		types.NamespacedName{Name: resource.Name, Namespace: resource.Namespace},
-		getClusterDomain(r.Client),
-		resource.Spec.CommonSpec,
-		remoteYtsaurus.Spec.MasterConnectionSpec,
-		&remoteYtsaurus.Spec.MasterCachesSpec,
-	)
+	cfgen := ytconfig.NewRemoteNodeGenerator(remoteYtsaurus, resource.GetName(), getClusterDomain(r.Client), &resource.Spec.CommonSpec)
 
 	component := components.NewRemoteDataNodes(
 		cfgen,

controllers/remoteexecnodes_sync.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"context"
 
-	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -21,13 +20,7 @@ func (r *RemoteExecNodesReconciler) Sync(
 	logger := log.FromContext(ctx).WithValues("component", "remoteexecnodes")
 	apiProxy := apiproxy.NewAPIProxy(resource, r.Client, r.Recorder, r.Scheme)
 
-	cfgen := ytconfig.NewRemoteNodeGenerator(
-		types.NamespacedName{Name: resource.Name, Namespace: resource.Namespace},
-		getClusterDomain(r.Client),
-		resource.Spec.CommonSpec,
-		remoteYtsaurus.Spec.MasterConnectionSpec,
-		&remoteYtsaurus.Spec.MasterCachesSpec,
-	)
+	cfgen := ytconfig.NewRemoteNodeGenerator(remoteYtsaurus, resource.GetName(), getClusterDomain(r.Client), &resource.Spec.CommonSpec)
 
 	component := components.NewRemoteExecNodes(
 		cfgen,

controllers/remotetabletnodes_sync.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"context"
 
-	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -21,13 +20,7 @@ func (r *RemoteTabletNodesReconciler) Sync(
 	logger := log.FromContext(ctx).WithValues("component", "remoteTabletNodes")
 	apiProxy := apiproxy.NewAPIProxy(resource, r.Client, r.Recorder, r.Scheme)
 
-	cfgen := ytconfig.NewRemoteNodeGenerator(
-		types.NamespacedName{Name: resource.Name, Namespace: resource.Namespace},
-		getClusterDomain(r.Client),
-		resource.Spec.CommonSpec,
-		remoteYtsaurus.Spec.MasterConnectionSpec,
-		&remoteYtsaurus.Spec.MasterCachesSpec,
-	)
+	cfgen := ytconfig.NewRemoteNodeGenerator(remoteYtsaurus, resource.GetName(), getClusterDomain(r.Client), &resource.Spec.CommonSpec)
 
 	component := components.NewRemoteTabletNodes(
 		cfgen,

controllers/spyt_sync.go

@@ -17,7 +17,7 @@ func (r *SpytReconciler) Sync(ctx context.Context, resource *ytv1.Spyt, ytsaurus
 
 	spyt := apiproxy.NewSpyt(resource, r.Client, r.Recorder, r.Scheme)
 
-	cfgen := ytconfig.NewGenerator(ytsaurus, getClusterDomain(spyt.APIProxy().Client()))
+	cfgen := ytconfig.NewLocalNodeGenerator(ytsaurus, resource.Name, getClusterDomain(spyt.APIProxy().Client()))
 
 	component := components.NewSpyt(cfgen, spyt, ytsaurus)
 

docs/api.md

@@ -319,7 +319,7 @@ _Appears in:_
 | `useIpv4` _boolean_ |  | false |  |
 | `keepSocket` _boolean_ |  |  |  |
 | `forceTcp` _boolean_ |  |  |  |
-| `useShortNames` _boolean_ |  | true |  |
+| `useShortNames` _boolean_ | Do not add resource name into names of resources under control.<br />When enabled resource should not share namespace with other Ytsaurus. | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
 | `extraPodAnnotations` _object (keys:string, values:string)_ |  |  |  |
@@ -1306,7 +1306,7 @@ _Appears in:_
 | `useIpv4` _boolean_ |  | false |  |
 | `keepSocket` _boolean_ |  |  |  |
 | `forceTcp` _boolean_ |  |  |  |
-| `useShortNames` _boolean_ |  | true |  |
+| `useShortNames` _boolean_ | Do not add resource name into names of resources under control.<br />When enabled resource should not share namespace with other Ytsaurus. | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
 | `extraPodAnnotations` _object (keys:string, values:string)_ |  |  |  |
@@ -1400,7 +1400,7 @@ _Appears in:_
 | `useIpv4` _boolean_ |  | false |  |
 | `keepSocket` _boolean_ |  |  |  |
 | `forceTcp` _boolean_ |  |  |  |
-| `useShortNames` _boolean_ |  | true |  |
+| `useShortNames` _boolean_ | Do not add resource name into names of resources under control.<br />When enabled resource should not share namespace with other Ytsaurus. | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
 | `extraPodAnnotations` _object (keys:string, values:string)_ |  |  |  |
@@ -1539,7 +1539,7 @@ _Appears in:_
 | `useIpv4` _boolean_ |  | false |  |
 | `keepSocket` _boolean_ |  |  |  |
 | `forceTcp` _boolean_ |  |  |  |
-| `useShortNames` _boolean_ |  | true |  |
+| `useShortNames` _boolean_ | Do not add resource name into names of resources under control.<br />When enabled resource should not share namespace with other Ytsaurus. | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
 | `extraPodAnnotations` _object (keys:string, values:string)_ |  |  |  |
@@ -2193,7 +2193,7 @@ _Appears in:_
 | `useIpv4` _boolean_ |  | false |  |
 | `keepSocket` _boolean_ |  |  |  |
 | `forceTcp` _boolean_ |  |  |  |
-| `useShortNames` _boolean_ |  | true |  |
+| `useShortNames` _boolean_ | Do not add resource name into names of resources under control.<br />When enabled resource should not share namespace with other Ytsaurus. | true |  |
 | `hostNetwork` _boolean_ | Use the host's network namespace for all components. | false |  |
 | `usePorto` _boolean_ |  | false |  |
 | `extraPodAnnotations` _object (keys:string, values:string)_ |  |  |  |

pkg/components/chyt.go

@@ -19,7 +19,7 @@ import (
 type Chyt struct {
 	labeller *labeller.Labeller
 	chyt     *apiproxy.Chyt
-	cfgen    *ytconfig.Generator
+	cfgen    *ytconfig.NodeGenerator
 	ytsaurus *ytv1.Ytsaurus
 
 	secret *resources.StringSecret
@@ -29,25 +29,15 @@ type Chyt struct {
 	initChPublicJob *InitJob
 }
 
-func NewChyt(
-	cfgen *ytconfig.Generator,
-	chyt *apiproxy.Chyt,
-	ytsaurus *ytv1.Ytsaurus) *Chyt {
-	l := labeller.Labeller{
-		ObjectMeta:        &chyt.GetResource().ObjectMeta,
-		APIProxy:          chyt.APIProxy(),
-		ComponentType:     consts.ChytType,
-		ComponentNamePart: chyt.GetResource().Name,
-		Annotations:       ytsaurus.Spec.ExtraPodAnnotations,
-	}
-
+func NewChyt(cfgen *ytconfig.NodeGenerator, chyt *apiproxy.Chyt, ytsaurus *ytv1.Ytsaurus) *Chyt {
+	l := cfgen.GetComponentLabeller(consts.ChytType, chyt.GetResource().Name)
 	return &Chyt{
-		labeller: &l,
+		labeller: l,
 		chyt:     chyt,
 		cfgen:    cfgen,
 		ytsaurus: ytsaurus,
 		initUser: NewInitJob(
-			&l,
+			l,
 			chyt.APIProxy(),
 			chyt,
 			ytsaurus.Spec.ImagePullSecrets,
@@ -59,7 +49,7 @@ func NewChyt(
 			ytsaurus.Spec.NodeSelector,
 		),
 		initEnvironment: NewInitJob(
-			&l,
+			l,
 			chyt.APIProxy(),
 			chyt,
 			ytsaurus.Spec.ImagePullSecrets,
@@ -71,7 +61,7 @@ func NewChyt(
 			ytsaurus.Spec.NodeSelector,
 		),
 		initChPublicJob: NewInitJob(
-			&l,
+			l,
 			chyt.APIProxy(),
 			chyt,
 			ytsaurus.Spec.ImagePullSecrets,
@@ -84,7 +74,7 @@ func NewChyt(
 		),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),
-			&l,
+			l,
 			chyt.APIProxy()),
 	}
 }
@@ -113,7 +103,9 @@ func (c *Chyt) createInitScript() string {
 func (c *Chyt) createInitChPublicScript() string {
 	script := []string{
 		initJobPrologue,
-		fmt.Sprintf("export YT_PROXY=%v CHYT_CTL_ADDRESS=%v YT_LOG_LEVEL=debug", c.cfgen.GetHTTPProxiesAddress(consts.DefaultHTTPProxyRole), c.cfgen.GetStrawberryControllerServiceAddress()),
+		fmt.Sprintf("export YT_PROXY=%v CHYT_CTL_ADDRESS=%v YT_LOG_LEVEL=debug",
+			c.cfgen.GetHTTPProxiesAddress(consts.DefaultHTTPProxyRole),
+			c.cfgen.GetStrawberryControllerServiceAddress()),
 		"yt create scheduler_pool --attributes '{name=chyt; pool_tree=default}' --ignore-existing",
 		"yt clickhouse ctl create ch_public || true",
 		"yt clickhouse ctl set-option --alias ch_public pool chyt",

pkg/components/component.go

@@ -52,6 +52,8 @@ type Component interface {
 
 	// TODO(nadya73): refactor it
 	IsUpdatable() bool
+
+	GetLabeller() *labeller.Labeller
 }
 
 // Following structs are used as a base for implementing YTsaurus components objects.
@@ -69,6 +71,14 @@ func (c *baseComponent) GetName() string {
 	return c.labeller.GetFullComponentName()
 }
 
+func (c *baseComponent) GetType() consts.ComponentType {
+	return c.labeller.ComponentType
+}
+
+func (c *baseComponent) GetLabeller() *labeller.Labeller {
+	return c.labeller
+}
+
 // localComponent is a base structs for components which have access to ytsaurus resource,
 // but don't depend on server. Example: UI, Strawberry.
 type localComponent struct {

pkg/components/controller_agent.go

@@ -9,7 +9,6 @@ import (
 	ytv1 "github.com/ytsaurus/ytsaurus-k8s-operator/api/v1"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/apiproxy"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/consts"
-	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/labeller"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/resources"
 	"github.com/ytsaurus/ytsaurus-k8s-operator/pkg/ytconfig"
 )
@@ -21,25 +20,19 @@ type ControllerAgent struct {
 }
 
 func NewControllerAgent(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus, master Component) *ControllerAgent {
+	l := cfgen.GetComponentLabeller(consts.ControllerAgentType, "")
 	resource := ytsaurus.GetResource()
-	l := labeller.Labeller{
-		ObjectMeta:    &resource.ObjectMeta,
-		APIProxy:      ytsaurus.APIProxy(),
-		ComponentType: consts.ControllerAgentType,
-	}
 
 	if resource.Spec.ControllerAgents.InstanceSpec.MonitoringPort == nil {
 		resource.Spec.ControllerAgents.InstanceSpec.MonitoringPort = ptr.To(int32(consts.ControllerAgentMonitoringPort))
 	}
 
 	srv := newServer(
-		&l,
+		l,
 		ytsaurus,
 		&resource.Spec.ControllerAgents.InstanceSpec,
 		"/usr/bin/ytserver-controller-agent",
 		"ytserver-controller-agent.yson",
-		"ca",
-		"controller-agents",
 		func() ([]byte, error) { return cfgen.GetControllerAgentConfig(resource.Spec.ControllerAgents) },
 		WithContainerPorts(corev1.ContainerPort{
 			Name:          consts.YTRPCPortName,
@@ -49,7 +42,7 @@ func NewControllerAgent(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus,
 	)
 
 	return &ControllerAgent{
-		localServerComponent: newLocalServerComponent(&l, ytsaurus, srv),
+		localServerComponent: newLocalServerComponent(l, ytsaurus, srv),
 		cfgen:                cfgen,
 		master:               master,
 	}
@@ -59,8 +52,6 @@ func (ca *ControllerAgent) IsUpdatable() bool {
 	return true
 }
 
-func (ca *ControllerAgent) GetType() consts.ComponentType { return consts.ControllerAgentType }
-
 func (ca *ControllerAgent) Fetch(ctx context.Context) error {
 	return resources.Fetch(ctx, ca.server)
 }