Init job creates from PrimaryMasters.InstanceSpec image if specified

ytsaurus · Sep 9, 2024 · ee42949 · ee42949
1 parent 5863668
commit ee42949
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 1 deletion.
diff --git a/pkg/components/chyt.go b/pkg/components/chyt.go
@@ -54,6 +54,7 @@ func NewChyt(
 			"user",
 			consts.ClientConfigFileName,
 			ytsaurus.Spec.CoreImage,
+			&ytsaurus.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		initEnvironment: NewInitJob(
 			&l,
@@ -63,6 +64,7 @@ func NewChyt(
 			"release",
 			consts.ClientConfigFileName,
 			chyt.GetResource().Spec.Image,
+			&ytsaurus.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		initChPublicJob: NewInitJob(
 			&l,
@@ -72,6 +74,7 @@ func NewChyt(
 			"ch-public",
 			consts.ClientConfigFileName,
 			chyt.GetResource().Spec.Image,
+			&ytsaurus.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/init_job.go b/pkg/components/init_job.go
@@ -13,6 +13,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	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"
@@ -56,7 +57,12 @@ func NewInitJob(
 	conditionsManager apiproxy.ConditionManager,
 	imagePullSecrets []corev1.LocalObjectReference,
 	name, configFileName, image string,
+	instanceSpec *ytv1.InstanceSpec,
 	generator ytconfig.YsonGeneratorFunc) *InitJob {
+	trueImage := image
+	if instanceSpec.Image != nil {
+		trueImage = *instanceSpec.Image
+	}
 	return &InitJob{
 		baseComponent: baseComponent{
 			labeller: labeller,
@@ -65,7 +71,7 @@ func NewInitJob(
 		conditionsManager:      conditionsManager,
 		imagePullSecrets:       imagePullSecrets,
 		initCompletedCondition: fmt.Sprintf("%s%sInitJobCompleted", name, labeller.GetFullComponentName()),
-		image:                  image,
+		image:                  trueImage,
 		initJob: resources.NewJob(
 			labeller.GetInitJobName(name),
 			labeller,

diff --git a/pkg/components/init_job_test.go b/pkg/components/init_job_test.go
@@ -88,6 +88,7 @@ func newTestJob(ytsaurus *apiproxy.Ytsaurus) *InitJob {
 		"dummy",
 		consts.ClientConfigFileName,
 		"dummy-image",
+		&ytsaurus.GetResource().Spec.PrimaryMasters.InstanceSpec,
 		func() ([]byte, error) { return []byte("dummy-cfg"), nil },
 	)
 }

diff --git a/pkg/components/master.go b/pkg/components/master.go
@@ -70,6 +70,7 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		"default",
 		consts.ClientConfigFileName,
 		resource.Spec.CoreImage,
+		&resource.Spec.PrimaryMasters.InstanceSpec,
 		cfgen.GetNativeClientConfig)
 
 	exitReadOnlyJob := NewInitJob(
@@ -80,6 +81,7 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		"exit-read-only",
 		consts.ClientConfigFileName,
 		resource.Spec.CoreImage,
+		&resource.Spec.PrimaryMasters.InstanceSpec,
 		cfgen.GetNativeClientConfig,
 	)
 

diff --git a/pkg/components/query_tracker.go b/pkg/components/query_tracker.go
@@ -85,6 +85,7 @@ func NewQueryTracker(
 			"qt-state",
 			consts.ClientConfigFileName,
 			image,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/queue_agent.go b/pkg/components/queue_agent.go
@@ -88,6 +88,7 @@ func NewQueueAgent(
 			"qa-state",
 			consts.ClientConfigFileName,
 			image,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/scheduler.go b/pkg/components/scheduler.go
@@ -80,6 +80,7 @@ func NewScheduler(
 			"user",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		initOpArchive: NewInitJob(
 			&l,
@@ -89,6 +90,7 @@ func NewScheduler(
 			"op-archive",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/spyt.go b/pkg/components/spyt.go
@@ -52,6 +52,7 @@ func NewSpyt(
 			"user",
 			consts.ClientConfigFileName,
 			ytsaurus.Spec.CoreImage,
+			&ytsaurus.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		initEnvironment: NewInitJob(
 			&l,
@@ -61,6 +62,7 @@ func NewSpyt(
 			"spyt-environment",
 			consts.ClientConfigFileName,
 			spyt.GetResource().Spec.Image,
+			&ytsaurus.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/strawberry_controller.go b/pkg/components/strawberry_controller.go
@@ -82,6 +82,7 @@ func NewStrawberryController(
 			"user",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		initChytClusterJob: NewInitJob(
 			&l,
@@ -91,6 +92,7 @@ func NewStrawberryController(
 			"cluster",
 			ChytInitClusterJobConfigFileName,
 			image,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetChytInitClusterConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/ui.go b/pkg/components/ui.go
@@ -82,6 +82,7 @@ func NewUI(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus, master Compon
 			"default",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/yql_agent.go b/pkg/components/yql_agent.go
@@ -69,6 +69,7 @@ func NewYQLAgent(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus, master
 			"yql-agent-environment",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/ytsaurus_client.go b/pkg/components/ytsaurus_client.go
@@ -63,6 +63,7 @@ func NewYtsaurusClient(
 			"user",
 			consts.ClientConfigFileName,
 			resource.Spec.CoreImage,
+			&resource.Spec.PrimaryMasters.InstanceSpec,
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),