K8SPG-611 when cr version is different than version, build init container image instead of using the operator image (#1236)

Author: gkech

e2e-tests/functions

@@ -92,7 +92,8 @@ deploy_operator_gh() {
 
 	curl -s "https://raw.githubusercontent.com/percona/percona-postgresql-operator/${git_tag}/deploy/${cw_prefix}operator.yaml" >"${TEMP_DIR}/${cw_prefix}operator_${git_tag}.yaml"
 
-	yq eval '.spec.template.spec.containers[0].image = "'${REGISTRY_NAME_FULL}'percona/percona-postgresql-operator:'${git_tag#v}'"' \
+	local docker_hub_org=$(echo "$IMAGE" | sed -E 's|(.*/)?([^/]+)/[^/]+(:.*)?|\2|')
+	yq eval '.spec.template.spec.containers[0].image = "'${REGISTRY_NAME_FULL}''$docker_hub_org'/percona-postgresql-operator:'${git_tag#v}'"' \
 		"${TEMP_DIR}/${cw_prefix}operator_${git_tag}.yaml" \
 		| kubectl -n "${OPERATOR_NS:-$NAMESPACE}" apply -f -
 }

percona/k8s/util.go

@@ -17,6 +17,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/percona/percona-postgresql-operator/percona/naming"
+	"github.com/percona/percona-postgresql-operator/percona/version"
 	"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -87,7 +88,28 @@ func InitImage(ctx context.Context, cl client.Reader, cluster *v1beta1.PostgresC
 	if cluster != nil && cluster.Spec.InitContainer != nil && len(cluster.Spec.InitContainer.Image) > 0 {
 		return cluster.Spec.InitContainer.Image, nil
 	}
-	return operatorImage(ctx, cl)
+
+	operatorImage, err := operatorImage(ctx, cl)
+	if err != nil {
+		return "", errors.Wrap(err, "get operator image")
+	}
+
+	imageName := operatorImage
+
+	if cluster == nil {
+		return imageName, nil
+	}
+
+	crVersion, ok := cluster.Labels[v1beta1.LabelVersion]
+	if !ok || crVersion == "" {
+		return imageName, nil
+	}
+
+	if cluster.CompareVersion(version.Version()) != 0 {
+		imageName = strings.Split(operatorImage, ":")[0] + ":" + crVersion
+	}
+
+	return imageName, nil
 }
 
 func operatorImage(ctx context.Context, cl client.Reader) (string, error) {

percona/k8s/util_test.go

@@ -267,6 +267,19 @@ func TestInitImage(t *testing.T) {
 			getPGBackrestComponent,
 			"operator-image",
 		},
+		{
+			"pgbackrest not specified init image with different versions",
+			func() *v1beta1.PostgresCluster {
+				cr := crunchyCr.DeepCopy()
+
+				oldVersion := "1.2.0"
+
+				cr.Labels = map[string]string{v1beta1.LabelVersion: oldVersion}
+				return cr
+			},
+			getPGBackrestComponent,
+			"operator-image:1.2.0",
+		},
 		{
 			"pgbackrest general init image",
 			func() *v1beta1.PostgresCluster {