Update standard image tag when using a GIS enabled cluster

Currently, the image tag value used by GIS enabled pgclusters is
being used when creating sidecontainers. Since the standard and
GIS enable PostgreSQL containers use different tags, this causes
an image pull error.

This update takes the current image name and the image tag value
stored in the pgcluster CRD and, if the image being used is the
crunchy-postgres-gis-ha container with the corresponding tag, it uses
an updated tag without the addition of the GIS version when provisioning
sidecars containers for the cluster.

Issue: [ch9393]
Issue: #1749

Author: tjmoore4

internal/operator/cluster/pgadmin.go

@@ -348,7 +348,7 @@ func createPgAdminDeployment(clientset kubernetes.Interface, cluster *crv1.Pgclu
 		Name:           pgAdminDeploymentName,
 		ClusterName:    cluster.Name,
 		CCPImagePrefix: operator.Pgo.Cluster.CCPImagePrefix,
-		CCPImageTag:    cluster.Spec.CCPImageTag,
+		CCPImageTag:    util.GetStandardImageTag(cluster.Spec.CCPImage, cluster.Spec.CCPImageTag),
 		DisableFSGroup: operator.Pgo.Cluster.DisableFSGroup,
 		Port:           defPgAdminPort,
 		InitUser:       defSetupUsername,

internal/operator/cluster/pgbouncer.go

@@ -554,7 +554,7 @@ func createPgBouncerDeployment(clientset kubernetes.Interface, cluster *crv1.Pgc
 		Name:               pgbouncerDeploymentName,
 		ClusterName:        cluster.Name,
 		CCPImagePrefix:     util.GetValueOrDefault(cluster.Spec.CCPImagePrefix, operator.Pgo.Cluster.CCPImagePrefix),
-		CCPImageTag:        cluster.Spec.CCPImageTag,
+		CCPImageTag:        util.GetStandardImageTag(cluster.Spec.CCPImage, cluster.Spec.CCPImageTag),
 		Port:               cluster.Spec.Port,
 		PGBouncerConfigMap: util.GeneratePgBouncerConfigMapName(cluster.Name),
 		PGBouncerSecret:    util.GeneratePgBouncerSecretName(cluster.Name),

internal/operator/clusterutilities.go

@@ -335,7 +335,7 @@ func GetBadgerAddon(clientset kubernetes.Interface, namespace string, cluster *c
 	if cluster.Labels[config.LABEL_BADGER] == "true" {
 		log.Debug("crunchy_badger was found as a label on cluster create")
 		badgerTemplateFields := badgerTemplateFields{}
-		badgerTemplateFields.CCPImageTag = spec.CCPImageTag
+		badgerTemplateFields.CCPImageTag = util.GetStandardImageTag(spec.CCPImage, spec.CCPImageTag)
 		badgerTemplateFields.BadgerTarget = pgbadger_target
 		badgerTemplateFields.PGBadgerPort = spec.PGBadgerPort
 		badgerTemplateFields.CCPImagePrefix = util.GetValueOrDefault(spec.CCPImagePrefix, Pgo.Cluster.CCPImagePrefix)

internal/util/util.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
+	"regexp"
 	"strings"
 	"time"
 
@@ -45,6 +46,10 @@ type JSONPatchOperation struct {
 	Value interface{} `json:"value"`
 }
 
+// gisImageTagRegex is a regular expression designed to match the standard image tag for
+// the crunchy-postgres-gis-ha container
+var gisImageTagRegex = regexp.MustCompile(`(.+-[\d|\.]+)-[\d|\.]+?(-[\d|\.]+.*)`)
+
 func init() {
 	rand.Seed(time.Now().UnixNano())
 
@@ -203,6 +208,20 @@ func GetSecretPassword(clientset kubernetes.Interface, db, suffix, Namespace str
 
 }
 
+// GetStandardImageTag takes the current image name and the image tag value
+// stored in the pgcluster CRD and, if the image being used is the
+// crunchy-postgres-gis-ha container with the corresponding tag, it returns
+// the tag without the addition of the GIS version. This tag value can then
+// be used when provisioning containers using the standard containers tag.
+func GetStandardImageTag(imageName, imageTag string) string {
+
+	if imageName == "crunchy-postgres-gis-ha" && strings.Count(imageTag, "-") > 2 {
+		return gisImageTagRegex.ReplaceAllString(imageTag, "$1$2")
+	}
+
+	return imageTag
+}
+
 // RandStringBytesRmndr ...
 func RandStringBytesRmndr(n int) string {
 	b := make([]byte, n)

internal/util/util_test.go

@@ -0,0 +1,75 @@
+package util
+
+import "testing"
+
+func TestGetStandardImageTag(t *testing.T) {
+
+	assertCorrectMessage := func(t testing.TB, got, want string) {
+		t.Helper()
+		if got != want {
+			t.Errorf("got %q want %q", got, want)
+		}
+	}
+
+	imageTagTests := []struct {
+		description string
+		imageName   string
+		imageTag    string
+		expected    string
+	}{
+		{
+			"image: crunchy-postgres-ha, tag: centos7-12.4-4.5.0",
+			"crunchy-postgres-ha",
+			"centos7-12.4-4.5.0",
+			"centos7-12.4-4.5.0",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos7-12.4-3.0-4.5.0",
+			"crunchy-postgres-gis-ha",
+			"centos7-12.4-3.0-4.5.0",
+			"centos7-12.4-4.5.0",
+		}, {
+			"image: crunchy-postgres-ha, tag: centos7-12.4-4.5.0-beta.1",
+			"crunchy-postgres-ha",
+			"centos7-12.4-4.5.0-beta.1",
+			"centos7-12.4-4.5.0-beta.1",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos7-12.4-3.0-4.5.0-beta.2",
+			"crunchy-postgres-gis-ha",
+			"centos7-12.4-3.0-4.5.0-beta.2",
+			"centos7-12.4-4.5.0-beta.2",
+		}, {
+			"image: crunchy-postgres-ha, tag: centos8-9.5.23-4.5.0-rc.1",
+			"crunchy-postgres-ha",
+			"centos8-9.5.23-4.5.0-rc.1",
+			"centos8-9.5.23-4.5.0-rc.1",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos8-9.5.23-2.4-4.5.0-rc.1",
+			"crunchy-postgres-gis-ha",
+			"centos8-9.5.23-2.4-4.5.0-rc.1",
+			"centos8-9.5.23-4.5.0-rc.1",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos8-13.0-3.0-4.5.0-rc.1",
+			"crunchy-postgres-gis-ha",
+			"centos8-13.0-3.0-4.5.0-rc.1",
+			"centos8-13.0-4.5.0-rc.1",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos8-custom123",
+			"crunchy-postgres-gis-ha",
+			"centos8-custom123",
+			"centos8-custom123",
+		}, {
+			"image: crunchy-postgres-gis-ha, tag: centos8-custom123-moreinfo-789",
+			"crunchy-postgres-gis-ha",
+			"centos8-custom123-moreinfo-789",
+			"centos8-custom123-moreinfo-789",
+		},
+	}
+
+	for _, itt := range imageTagTests {
+		t.Run(itt.description, func(t *testing.T) {
+			got := GetStandardImageTag(itt.imageName, itt.imageTag)
+			want := itt.expected
+			assertCorrectMessage(t, got, want)
+		})
+	}
+}