From 561ce35117a1088d16d8d87ad047b4c4a52000a7 Mon Sep 17 00:00:00 2001
From: David White <david.white@seagate.com>
Date: Fri, 21 Jul 2023 09:11:42 -0600
Subject: [PATCH] fix: Use ubi7 instead of ubi7/go-toolset for final image

---
 Dockerfile.redhat           |  8 ++++----
 Makefile                    | 17 +++++++++++------
 helm/csi-charts/values.yaml |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.redhat b/Dockerfile.redhat
index f9237fb0..12bcf863 100644
--- a/Dockerfile.redhat
+++ b/Dockerfile.redhat
@@ -26,11 +26,11 @@ RUN ls -l /
 
 ########################################################################
 
-FROM registry.access.redhat.com/ubi7/go-toolset:1.19
+FROM registry.access.redhat.com/ubi7
 
-ARG version=v1.7.2
-ARG vcs_ref=89c5c4558d77735c53f25d44789938f6dc609e62
-ARG build_date=2023-06-28T00:45:11+00:00
+ARG version=v1.7.3
+ARG vcs_ref=f64a389bd19c45ff31ce5026ea28f7ad3e954723
+ARG build_date=2023-07-20T14:37:39+00:00
 ARG vendor=Seagate
 ARG family="Exos X"
 ARG app="${family} CSI Driver"
diff --git a/Makefile b/Makefile
index ea640424..ae75528a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ endif
 ifdef VERSION
 VERSION := $(VERSION)
 else
-VERSION := v1.7.2
+VERSION := v1.7.3
 endif
 HELM_VERSION := $(subst v,,$(VERSION))
 VERSION_FLAG = -X $(GITHUB_URL)/pkg/common.Version=$(VERSION)
@@ -129,23 +129,28 @@ REDHAT_IMAGE=$(REDHAT_IMAGE_BASE):$(VERSION)
 REDHAT_IMAGE_LATEST=$(REDHAT_IMAGE_BASE):latest
 PREFLIGHT_OPTIONS=
 PREFLIGHT_SUBMIT=
+PFLT_DOCKERCONFIG=.preflight-auth.json
 
-preflight:
+preflight: $(PFLT_DOCKERCONFIG)
 	-docker run -d -p 5000:5000 --name registry registry:2 # make sure local registry is running
 	docker tag $(IMAGE) $(PREFLIGHT_IMAGE)
 	docker push $(PREFLIGHT_IMAGE)
-	$(PREFLIGHT) check container $(PREFLIGHT_SUBMIT) $(PREFLIGHT_OPTIONS) $(PREFLIGHT_IMAGE) \
-		PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG)
-
+	PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG) $(PREFLIGHT) check container $(PREFLIGHT_SUBMIT) $(PREFLIGHT_OPTIONS) $(PREFLIGHT_IMAGE)
+		
 preflight-submit: .preflight-auth.json
 	$(MAKE) preflight PREFLIGHT_SUBMIT="--submit" \
 		PREFLIGHT_OPTIONS="--pyxis-api-token=$(PYXIS_API_TOKEN) --certification-project-id=$(REDHAT_PROJECT_ID)" \
-		PREFLIGHT_IMAGE=$(REDHAT_IMAGE) PFLT_DOCKERCONFIG=.preflight-auth.json
+		PREFLIGHT_IMAGE=$(REDHAT_IMAGE) PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG)
 
 tag-latest:
 	podman tag $(REDHAT_IMAGE) $(REDHAT_IMAGE_LATEST)
 	podman push $(REDHAT_IMAGE_LATEST)
 
+preflight-push:
+	podman login -u redhat-isv-containers+$(REDHAT_PROJECT_ID)-robot -p $(REGISTRY_KEY) quay.io
+	podman tag $(IMAGE) $(REDHAT_IMAGE)
+	podman push $(REDHAT_IMAGE)
+
 .preflight-auth.json:
 	podman login -u redhat-isv-containers+610494ea40182fa9651cdab0-robot -p $(REGISTRY_KEY) --authfile "$@" quay.io
 
diff --git a/helm/csi-charts/values.yaml b/helm/csi-charts/values.yaml
index ec3d62eb..2e4d98c7 100644
--- a/helm/csi-charts/values.yaml
+++ b/helm/csi-charts/values.yaml
@@ -11,7 +11,7 @@ image:
   repository: ghcr.io/seagate/seagate-exos-x-csi
   # -- Tag to use for nodes and controller
   # @default -- Uses Chart.appVersion value by default if tag does not specify a new version.
-  tag: "v1.7.2"
+  tag: "v1.7.3"
   # -- Default is set to IfNotPresent, to override use Always here to always pull the specified version
   pullPolicy: Always
 # -- Controller sidecar for provisioning