change helper image func specification

ytsaurus · Sep 12, 2024 · ae5ddb0 · ae5ddb0
1 parent f38c084
commit ae5ddb0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 24 deletions.
diff --git a/pkg/components/helpers.go b/pkg/components/helpers.go
@@ -228,9 +228,9 @@ func AddInitContainersToPodSpec(initContainers []string, podSpec *corev1.PodSpec
 	return nil
 }
 
-func SelectTrueImage(coreImage string, instanceImage *string) string {
-	if instanceImage != nil {
-		return *instanceImage
+func getImageWithDefault(componentImage *string, defaultImage string) string {
+	if componentImage != nil {
+		return *componentImage
 	}
-	return coreImage
+	return defaultImage
 }
diff --git a/pkg/components/master.go b/pkg/components/master.go
@@ -69,7 +69,7 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		resource.Spec.ImagePullSecrets,
 		"default",
 		consts.ClientConfigFileName,
-		SelectTrueImage(resource.Spec.CoreImage, resource.Spec.PrimaryMasters.InstanceSpec.Image),
+		getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage),
 		cfgen.GetNativeClientConfig)
 
 	exitReadOnlyJob := NewInitJob(
@@ -79,7 +79,7 @@ func NewMaster(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus) *Master {
 		resource.Spec.ImagePullSecrets,
 		"exit-read-only",
 		consts.ClientConfigFileName,
-		SelectTrueImage(resource.Spec.CoreImage, resource.Spec.PrimaryMasters.InstanceSpec.Image),
+		getImageWithDefault(resource.Spec.PrimaryMasters.InstanceSpec.Image, resource.Spec.CoreImage),
 		cfgen.GetNativeClientConfig,
 	)
 

diff --git a/pkg/components/query_tracker.go b/pkg/components/query_tracker.go
@@ -66,11 +66,6 @@ func NewQueryTracker(
 		}),
 	)
 
-	image := ytsaurus.GetResource().Spec.CoreImage
-	if resource.Spec.QueryTrackers.InstanceSpec.Image != nil {
-		image = *resource.Spec.QueryTrackers.InstanceSpec.Image
-	}
-
 	return &QueryTracker{
 		localServerComponent: newLocalServerComponent(&l, ytsaurus, srv),
 		cfgen:                cfgen,
@@ -84,7 +79,7 @@ func NewQueryTracker(
 			resource.Spec.ImagePullSecrets,
 			"qt-state",
 			consts.ClientConfigFileName,
-			SelectTrueImage(image, resource.Spec.QueryTrackers.InstanceSpec.Image),
+			getImageWithDefault(resource.Spec.QueryTrackers.InstanceSpec.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/queue_agent.go b/pkg/components/queue_agent.go
@@ -68,11 +68,6 @@ func NewQueueAgent(
 		}),
 	)
 
-	image := ytsaurus.GetResource().Spec.CoreImage
-	if resource.Spec.QueueAgents.InstanceSpec.Image != nil {
-		image = *resource.Spec.QueueAgents.InstanceSpec.Image
-	}
-
 	return &QueueAgent{
 		localServerComponent: newLocalServerComponent(&l, ytsaurus, srv),
 		cfgen:                cfgen,
@@ -87,7 +82,7 @@ func NewQueueAgent(
 			resource.Spec.ImagePullSecrets,
 			"qa-state",
 			consts.ClientConfigFileName,
-			SelectTrueImage(image, resource.Spec.QueueAgents.InstanceSpec.Image),
+			getImageWithDefault(resource.Spec.QueueAgents.InstanceSpec.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/scheduler.go b/pkg/components/scheduler.go
@@ -79,7 +79,7 @@ func NewScheduler(
 			resource.Spec.ImagePullSecrets,
 			"user",
 			consts.ClientConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.Schedulers.InstanceSpec.Image),
+			getImageWithDefault(resource.Spec.Schedulers.InstanceSpec.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		initOpArchive: NewInitJob(
 			&l,
@@ -88,7 +88,7 @@ func NewScheduler(
 			resource.Spec.ImagePullSecrets,
 			"op-archive",
 			consts.ClientConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.Schedulers.InstanceSpec.Image),
+			getImageWithDefault(resource.Spec.Schedulers.InstanceSpec.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/strawberry_controller.go b/pkg/components/strawberry_controller.go
@@ -81,7 +81,7 @@ func NewStrawberryController(
 			ytsaurus.GetResource().Spec.ImagePullSecrets,
 			"user",
 			consts.ClientConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.StrawberryController.Image),
+			getImageWithDefault(resource.Spec.StrawberryController.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		initChytClusterJob: NewInitJob(
 			&l,
@@ -90,7 +90,7 @@ func NewStrawberryController(
 			resource.Spec.ImagePullSecrets,
 			"cluster",
 			ChytInitClusterJobConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.StrawberryController.Image),
+			getImageWithDefault(resource.Spec.StrawberryController.Image, resource.Spec.CoreImage),
 			cfgen.GetChytInitClusterConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/ui.go b/pkg/components/ui.go
@@ -81,7 +81,7 @@ func NewUI(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus, master Compon
 			resource.Spec.ImagePullSecrets,
 			"default",
 			consts.ClientConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.UI.Image),
+			getImageWithDefault(resource.Spec.UI.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),

diff --git a/pkg/components/yql_agent.go b/pkg/components/yql_agent.go
@@ -68,7 +68,7 @@ func NewYQLAgent(cfgen *ytconfig.Generator, ytsaurus *apiproxy.Ytsaurus, master
 			resource.Spec.ImagePullSecrets,
 			"yql-agent-environment",
 			consts.ClientConfigFileName,
-			SelectTrueImage(resource.Spec.CoreImage, resource.Spec.YQLAgents.Image),
+			getImageWithDefault(resource.Spec.YQLAgents.Image, resource.Spec.CoreImage),
 			cfgen.GetNativeClientConfig),
 		secret: resources.NewStringSecret(
 			l.GetSecretName(),