K8SPS-598 refine default init image retagging to honor CR version for Percona images (#1157)

Author: hors

pkg/k8s/init_image.go

@@ -3,13 +3,15 @@ package k8s
 import (
 	"context"
 	"os"
+	"strings"
 
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	apiv1 "github.com/percona/percona-server-mysql-operator/api/v1"
+	operatorversion "github.com/percona/percona-server-mysql-operator/pkg/version"
 )
 
 type ComponentWithInit interface {
@@ -73,7 +75,12 @@ func InitImage(ctx context.Context, cl client.Reader, cr *apiv1.PerconaServerMyS
 	if cr.CompareVersion("0.12.0") < 0 && cr.Spec.InitImage == "" { //nolint:staticcheck
 		return cr.Spec.InitImage, nil //nolint:staticcheck
 	}
-	return OperatorImage(ctx, cl)
+	imageName, err := OperatorImage(ctx, cl)
+	if err != nil {
+		return "", err
+	}
+
+	return adjustInitImageWithCRVersion(cr, imageName), nil
 }
 
 func OperatorImage(ctx context.Context, cl client.Reader) (string, error) {
@@ -108,3 +115,50 @@ func operatorPod(ctx context.Context, cl client.Reader) (*corev1.Pod, error) {
 
 	return pod, nil
 }
+
+func adjustInitImageWithCRVersion(cr *apiv1.PerconaServerMySQL, imageName string) string {
+	if cr == nil {
+		return imageName
+	}
+
+	if cr.Spec.CRVersion == "" || cr.CompareVersion(operatorversion.Version()) == 0 {
+		return imageName
+	}
+
+	imageName = stripDigest(imageName)
+	if !hasPerconaNamespace(imageName) {
+		return imageName
+	}
+
+	imageBase := stripTag(imageName)
+	if imageBase == "" {
+		return imageName
+	}
+
+	return imageBase + ":" + cr.Spec.CRVersion
+}
+
+func stripDigest(image string) string {
+	if idx := strings.Index(image, "@"); idx != -1 {
+		return image[:idx]
+	}
+	return image
+}
+
+func stripTag(image string) string {
+	lastSlash := strings.LastIndex(image, "/")
+	lastColon := strings.LastIndex(image, ":")
+	if lastColon > lastSlash {
+		return image[:lastColon]
+	}
+	return image
+}
+
+func hasPerconaNamespace(image string) bool {
+	if image == "" {
+		return false
+	}
+
+	normalized := "/" + strings.Trim(image, "/") + "/"
+	return strings.Contains(normalized, "/percona/")
+}

pkg/k8s/init_image_test.go

@@ -9,6 +9,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	apiv1 "github.com/percona/percona-server-mysql-operator/api/v1"
+	operatorversion "github.com/percona/percona-server-mysql-operator/pkg/version"
 )
 
 func TestInitContainer(t *testing.T) {
@@ -154,3 +155,49 @@ func TestInitContainer(t *testing.T) {
 		})
 	}
 }
+
+func TestAdjustInitImageWithCRVersion(t *testing.T) {
+	currentVersion := operatorversion.Version()
+
+	tests := map[string]struct {
+		crVersion string
+		image     string
+		expected  string
+	}{
+		"percona image retagged": {
+			crVersion: "9.9.9",
+			image:     "percona/percona-server-mysql-operator:1.0.0",
+			expected:  "percona/percona-server-mysql-operator:9.9.9",
+		},
+		"percona image with registry port retagged": {
+			crVersion: "2.2.2",
+			image:     "registry.example.com:5000/percona/percona-server-mysql-operator:1.0.0",
+			expected:  "registry.example.com:5000/percona/percona-server-mysql-operator:2.2.2",
+		},
+		"percona image with digest retagged": {
+			crVersion: "3.3.3",
+			image:     "percona/percona-server-mysql-operator@sha256:abcdef",
+			expected:  "percona/percona-server-mysql-operator:3.3.3",
+		},
+		"non percona image unchanged": {
+			crVersion: "4.4.4",
+			image:     "custom/repo:1.0.0",
+			expected:  "custom/repo:1.0.0",
+		},
+		"matching operator version unchanged": {
+			crVersion: currentVersion,
+			image:     "percona/percona-server-mysql-operator:1.0.0",
+			expected:  "percona/percona-server-mysql-operator:1.0.0",
+		},
+	}
+
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			cr := &apiv1.PerconaServerMySQL{}
+			cr.Spec.CRVersion = tt.crVersion
+
+			result := adjustInitImageWithCRVersion(cr, tt.image)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}