Update TAG Generation Logic

The Tag generation logic currently results in the image having a tag like the following: release-v1.30.0-v.1.30.0 This is as we use both the release branch name and the tag name. What we have previously done to get around this is manually edit the tags once pushed up to Quay. This commit introduces a change such that the generated tag matches the release branch exactly. Signed-off-by: Anish Asthana <anishasthana1@gmail.com>

Author: anishasthana

Makefile

@@ -25,7 +25,12 @@ ifneq ($(strip $(GIT_BRANCH)),)
 #	replace invalid characters that might exist in the branch name
 TAG:=$(shell echo ${TAG} | sed 's/[^a-zA-Z0-9]/-/g')
 endif
-TAG:=${TAG}${RELEASE_VER}
+
+# Check if the string contains "release"
+ifneq (,$(findstring release,$(GIT_BRANCH)))
+else
+ TAG:=${TAG}${RELEASE_VER}
+endif
 
 .PHONY: print-global-variables