From 393c03dbc78f4cb8b2dfdd555cf480b70f8b5eb0 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:28:15 +0100
Subject: [PATCH 1/5] feat(apm-server): use default image for ubi

in 9.x ubi is the default and there's no -ubi image

use a switch so other images can be added in a flexible way
---
 pkg/controller/common/container/container.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/controller/common/container/container.go b/pkg/controller/common/container/container.go
index 235fc5d311..a5a6928d28 100644
--- a/pkg/controller/common/container/container.go
+++ b/pkg/controller/common/container/container.go
@@ -86,6 +86,13 @@ func ImageRepository(img Image, ver version.Version) string {
 	if useUBISuffix || isOlderMapsServerImg(img, ver) {
 		suffix = getUBISuffix(ver)
 	}
+	// on 9.x ubi is the default and there's no -ubi image
+	if useUBISuffix && ver.Major == 9 {
+		switch img {
+		case APMServerImage:
+			suffix = ""
+		}
+	}
 	// use the global container suffix in non-UBI mode
 	if !useUBISuffix {
 		suffix += containerSuffix

From e991b76318c711713995fbbd0b806fa45c116c30 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:56:40 +0100
Subject: [PATCH 2/5] Update container.go

---
 pkg/controller/common/container/container.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/controller/common/container/container.go b/pkg/controller/common/container/container.go
index a5a6928d28..d5520e2dfb 100644
--- a/pkg/controller/common/container/container.go
+++ b/pkg/controller/common/container/container.go
@@ -88,8 +88,7 @@ func ImageRepository(img Image, ver version.Version) string {
 	}
 	// on 9.x ubi is the default and there's no -ubi image
 	if useUBISuffix && ver.Major == 9 {
-		switch img {
-		case APMServerImage:
+		if img == APMServerImage {
 			suffix = ""
 		}
 	}

From e3baf24ec7df20e381bd9578b03ed8840a685f0c Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Tue, 7 Jan 2025 13:38:12 +0100
Subject: [PATCH 3/5] test: add apm-server ubi versiion test cases

---
 pkg/controller/common/container/container_test.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkg/controller/common/container/container_test.go b/pkg/controller/common/container/container_test.go
index e2c0883262..3a1e969de6 100644
--- a/pkg/controller/common/container/container_test.go
+++ b/pkg/controller/common/container/container_test.go
@@ -28,6 +28,20 @@ func TestImageRepository(t *testing.T) {
 			version: "7.5.2",
 			want:    testRegistry + "/apm/apm-server:7.5.2",
 		},
+		{
+			name:    "APM server UBI image before 9.x",
+			image:   APMServerImage,
+			version: "8.99.99",
+			suffix:  "-ubi",
+			want:    testRegistry + "/apm/apm-server-ubi:8.99.99",
+		},
+		{
+			name:    "APM server UBI image since 9.x",
+			image:   APMServerImage,
+			version: "9.0.0",
+			suffix:  "-ubi",
+			want:    testRegistry + "/apm/apm-server:9.0.0",
+		},
 		{
 			name:    "Kibana image",
 			image:   KibanaImage,

From 95b91ca2a93fa3d13271517b03c945f8d220f86a Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Tue, 7 Jan 2025 15:41:38 +0100
Subject: [PATCH 4/5] Update container.go

---
 pkg/controller/common/container/container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/controller/common/container/container.go b/pkg/controller/common/container/container.go
index d5520e2dfb..1c37039e83 100644
--- a/pkg/controller/common/container/container.go
+++ b/pkg/controller/common/container/container.go
@@ -87,7 +87,7 @@ func ImageRepository(img Image, ver version.Version) string {
 		suffix = getUBISuffix(ver)
 	}
 	// on 9.x ubi is the default and there's no -ubi image
-	if useUBISuffix && ver.Major == 9 {
+	if useUBISuffix && ver.Major >= 9 {
 		if img == APMServerImage {
 			suffix = ""
 		}

From 5aca2db70bcd000a05c8a8cf41823c34d7cbd798 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Wed, 8 Jan 2025 07:22:32 +0100
Subject: [PATCH 5/5] Update pkg/controller/common/container/container.go

Co-authored-by: Michael Morello <michael.morello@gmail.com>
---
 pkg/controller/common/container/container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/controller/common/container/container.go b/pkg/controller/common/container/container.go
index 1c37039e83..c200e00120 100644
--- a/pkg/controller/common/container/container.go
+++ b/pkg/controller/common/container/container.go
@@ -86,7 +86,7 @@ func ImageRepository(img Image, ver version.Version) string {
 	if useUBISuffix || isOlderMapsServerImg(img, ver) {
 		suffix = getUBISuffix(ver)
 	}
-	// on 9.x ubi is the default and there's no -ubi image
+	// Starting with 9.x ubi is the default for APM server, there's no -ubi image.
 	if useUBISuffix && ver.Major >= 9 {
 		if img == APMServerImage {
 			suffix = ""