Update OLM generator for new PostGIS image tag

This needed to include a reference for the new PostGIS image tag
format in order to properly load it into the scanners.

Author: Jonathan S. Katz

installers/olm/Makefile

@@ -2,24 +2,26 @@
 .SUFFIXES:
 
 CCP_IMAGE_PREFIX ?= registry.developers.crunchydata.com/crunchydata
-CCP_IMAGE_TAG ?= $(PGO_BASEOS)-$(CCP_PG_FULLVERSION)-$(PGO_VERSION)
 CCP_PG_FULLVERSION ?= 12.3
+CCP_POSTGIS_VERSION ?= 3.0
 KUBECONFIG ?= $(HOME)/.kube/config
 OLM_SDK_VERSION ?= 0.13.0
 OLM_TOOLS ?= registry.localhost:5000/postgres-operator-olm-tools:$(OLM_SDK_VERSION)
 OLM_VERSION ?= 0.14.2
 PGO_BASEOS ?= centos7
 PGO_IMAGE_PREFIX ?= registry.developers.crunchydata.com/crunchydata
-PGO_IMAGE_TAG ?= $(PGO_BASEOS)-$(PGO_VERSION)
 PGO_VERSION ?= 4.4.0
+PGO_IMAGE_TAG ?= $(PGO_BASEOS)-$(PGO_VERSION)
+CCP_IMAGE_TAG ?= $(PGO_BASEOS)-$(CCP_PG_FULLVERSION)-$(PGO_VERSION)
+CCP_POSTGIS_IMAGE_TAG ?= $(PGO_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_POSTGIS_VERSION)-$(PGO_VERSION)
 
 OLM_TOOLS_BASH = docker run --net=host --rm --tty $(DOCKER_ARGS) \
 		 --mount 'type=bind,source=$(KUBECONFIG),target=/root/.kube/config,ro' \
 		 --mount 'type=bind,source=$(CURDIR)/..,target=/mnt/installers' \
 		 --workdir '/mnt/installers/$(basename $(notdir $(CURDIR)))' \
 		 '$(OLM_TOOLS)'
 
-export CCP_IMAGE_PREFIX CCP_IMAGE_TAG
+export CCP_IMAGE_PREFIX CCP_IMAGE_TAG CCP_POSTGIS_IMAGE_TAG
 export KUBECONFIG
 export OLM_SDK_VERSION
 export PGO_IMAGE_PREFIX PGO_IMAGE_TAG PGO_VERSION

installers/olm/generate.sh

@@ -2,7 +2,7 @@
 # vim: set noexpandtab :
 set -eu
 
-render() { envsubst '$CCP_IMAGE_PREFIX $CCP_IMAGE_TAG $PACKAGE_NAME $PGO_IMAGE_PREFIX $PGO_IMAGE_TAG $PGO_VERSION'; }
+render() { envsubst '$CCP_IMAGE_PREFIX $CCP_IMAGE_TAG $CCP_POSTGIS_IMAGE_TAG $PACKAGE_NAME $PGO_IMAGE_PREFIX $PGO_IMAGE_TAG $PGO_VERSION'; }
 
 mkdir -p "./package/${PGO_VERSION}"
 

installers/olm/postgresoperator.csv.images.yaml

@@ -23,5 +23,5 @@
 - { name: RELATED_IMAGE_CRUNCHY_PGDUMP,           value: '${CCP_IMAGE_PREFIX}/crunchy-pgdump:${CCP_IMAGE_TAG}' }
 - { name: RELATED_IMAGE_CRUNCHY_PGRESTORE,        value: '${CCP_IMAGE_PREFIX}/crunchy-pgrestore:${CCP_IMAGE_TAG}' }
 - { name: RELATED_IMAGE_CRUNCHY_POSTGRES_HA,      value: '${CCP_IMAGE_PREFIX}/crunchy-postgres-ha:${CCP_IMAGE_TAG}' }
-- { name: RELATED_IMAGE_CRUNCHY_POSTGRES_GIS_HA,  value: '${CCP_IMAGE_PREFIX}/crunchy-postgres-gis-ha:${CCP_IMAGE_TAG}' }
+- { name: RELATED_IMAGE_CRUNCHY_POSTGRES_GIS_HA,  value: '${CCP_IMAGE_PREFIX}/crunchy-postgres-gis-ha:${CCP_POSTGIS_IMAGE_TAG}' }
 - { name: RELATED_IMAGE_CRUNCHY_PROMETHEUS,       value: '${CCP_IMAGE_PREFIX}/crunchy-prometheus:${CCP_IMAGE_TAG}' }