Fix fetch

ytsaurus · Jan 9, 2025 · 8e15756 · 8e15756
1 parent d7d7827
commit 8e15756
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/pkg/components/master.go b/pkg/components/master.go
@@ -55,17 +55,20 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		}),
 	)
 
+	jobImage := getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage)
+	jobTolerations := getTolerationsWithDefault(resource.Spec.PrimaryMasters.Tolerations, resource.Spec.Tolerations)
+	jobNodeSelector := getNodeSelectorWithDefault(resource.Spec.PrimaryMasters.NodeSelector, resource.Spec.NodeSelector)
 	initJob := NewInitJob(
 		l,
 		ytsaurus.APIProxy(),
 		ytsaurus,
 		resource.Spec.ImagePullSecrets,
 		"default",
 		consts.ClientConfigFileName,
-		getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage),
+		jobImage,
 		cfgen.GetNativeClientConfig,
-		getTolerationsWithDefault(resource.Spec.PrimaryMasters.Tolerations, resource.Spec.Tolerations),
-		getNodeSelectorWithDefault(resource.Spec.PrimaryMasters.NodeSelector, resource.Spec.NodeSelector),
+		jobTolerations,
+		jobNodeSelector,
 	)
 
 	enableRealChunksJob := NewInitJob(
@@ -75,10 +78,10 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		resource.Spec.ImagePullSecrets,
 		"enable-real-chunks",
 		consts.ClientConfigFileName,
-		getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage),
+		jobImage,
 		cfgen.GetNativeClientConfig,
-		getTolerationsWithDefault(resource.Spec.PrimaryMasters.Tolerations, resource.Spec.Tolerations),
-		getNodeSelectorWithDefault(resource.Spec.PrimaryMasters.NodeSelector, resource.Spec.NodeSelector),
+		jobTolerations,
+		jobNodeSelector,
 	)
 
 	exitReadOnlyJob := NewInitJob(
@@ -88,10 +91,10 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		resource.Spec.ImagePullSecrets,
 		"exit-read-only",
 		consts.ClientConfigFileName,
-		getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage),
+		jobImage,
 		cfgen.GetNativeClientConfig,
-		getTolerationsWithDefault(resource.Spec.PrimaryMasters.Tolerations, resource.Spec.Tolerations),
-		getNodeSelectorWithDefault(resource.Spec.PrimaryMasters.NodeSelector, resource.Spec.NodeSelector),
+		jobTolerations,
+		jobNodeSelector,
 	)
 
 	return &Master{
@@ -121,6 +124,7 @@ func (m *Master) Fetch(ctx context.Context) error {
 	return resources.Fetch(ctx,
 		m.server,
 		m.initJob,
+		m.enableRealChunksJob,
 		m.exitReadOnlyJob,
 	)
 }