From b97b2e42cd1899bacabc70b8b827d0790bab826b Mon Sep 17 00:00:00 2001
From: guru-aot <gurumoorthy.mohan@aot-technologies.com>
Date: Tue, 24 Oct 2023 13:09:56 -0600
Subject: [PATCH] #2440-Update_DB_Backup_container_image (#2454)

Upgrade to latest version of backup container
---
 devops/Makefile                                    | 7 +++++--
 devops/openshift/database-backup/backup-build.yaml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/devops/Makefile b/devops/Makefile
index 638fb45046..6704017078 100644
--- a/devops/Makefile
+++ b/devops/Makefile
@@ -14,6 +14,8 @@ export NEW_DB := $(or $(NEW_DB), $$NEW_DB)
 export JOB_NAME := $(or $(JOB_NAME), $$JN)
 export SITE_MINDER_LOGOUT_URL := $(or $(SITE_MINDER_LOGOUT_URL), https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi)
 export PATRONI_SIMSDB_BACKUP_APP_NAME := $(or $(PATRONI_SIMSDB_BACKUP_APP_NAME), patroni-simsdb-backup)
+# PATRONI_SIMSDB_BACKUP_TAG_NAME is both the version of the backup container or the tag name created for the build.
+export PATRONI_SIMSDB_BACKUP_TAG_NAME := $(or $(PATRONI_SIMSDB_BACKUP_TAG_NAME), 2.7.0)
 export PATRONI_SIMSDB_BACKUP_CONFIGMAP_NAME := $(or $(PATRONI_SIMSDB_BACKUP_CONFIGMAP_NAME), patroni-simsdb-backup-conf)
 export PATRONI_SIMSDB_BACKUP_CONFIG_FILE_NAME := $(or $(PATRONI_SIMSDB_BACKUP_CONFIG_FILE_NAME), patroni-simsdb-backup.conf)
 export BYPASS_CRA_INCOME_VERIFICATION := $(or $(BYPASS_CRA_INCOME_VERIFICATION), false)
@@ -491,7 +493,8 @@ db-backup-build-patroni:
 	test -n "$(PATRONI_SIMSDB_BACKUP_APP_NAME)"
 	@echo "+\n++ Creating build resources for database backups on $(BUILD_NAMESPACE)\n+"
 	oc -n $(BUILD_NAMESPACE) process -f ./openshift/database-backup/backup-build.yaml \
-		-p NAME=$(PATRONI_SIMSDB_BACKUP_APP_NAME) OUTPUT_IMAGE_TAG=v1 \
+		-p NAME=$(PATRONI_SIMSDB_BACKUP_APP_NAME) OUTPUT_IMAGE_TAG=$(PATRONI_SIMSDB_BACKUP_TAG_NAME) \
+		-p GIT_REF=$(PATRONI_SIMSDB_BACKUP_TAG_NAME) \
 		-p BASE_IMAGE_FOR_BUILD=quay.io/fedora/postgresql-14:14 \
 		| oc -n $(BUILD_NAMESPACE) apply -f -
 
@@ -524,7 +527,7 @@ db-backup-deploy-patroni:
   	-p NAME=$(PATRONI_SIMSDB_BACKUP_APP_NAME) \
   	-p IMAGE_NAMESPACE=$(BUILD_NAMESPACE) \
   	-p SOURCE_IMAGE_NAME=$(PATRONI_SIMSDB_BACKUP_APP_NAME) \
-  	-p TAG_NAME=v1 \
+  	-p TAG_NAME=$(PATRONI_SIMSDB_BACKUP_TAG_NAME) \
 		-p FTP_SECRET_KEY=$(PATRONI_SIMSDB_BACKUP_APP_NAME)-ftp-secret \
   	-p BACKUP_VOLUME_NAME=$(PATRONI_SIMSDB_BACKUP_APP_NAME)-pvc \
 		-p BACKUP_VOLUME_SIZE=20Gi \
diff --git a/devops/openshift/database-backup/backup-build.yaml b/devops/openshift/database-backup/backup-build.yaml
index 63c28863c9..20eea5b397 100644
--- a/devops/openshift/database-backup/backup-build.yaml
+++ b/devops/openshift/database-backup/backup-build.yaml
@@ -51,7 +51,7 @@ parameters:
     displayName: Git Reference
     description: The git reference or branch.
     required: true
-    value: master
+    value: 2.7.0
   - name: SOURCE_CONTEXT_DIR
     displayName: Source Context Directory
     description: The source context directory.