Merge branch 'cherry-pick-for-350' into 'release/0.28'

Cherry-pick 'Fix gc tag pipeline' into release/0.28

See merge request !354

devops/gc/pipeline/override-stages.yml

@@ -33,8 +33,9 @@ gc-containerize-gcr:
 .gc_substitute_image_in_helm:
   script:
     - wget -q https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && chmod +x /usr/bin/yq
-    - export EXTRA_TAG_PROVIDER=$(echo "$EXTRA_TAG" | sed "s|$CI_REGISTRY_IMAGE/$IMAGE_NAME|$CI_REGISTRY_IMAGE/gc/gc-provider|g")
-    - export EXTRA_TAG_TRANSFORMER=$(echo "$EXTRA_TAG" | sed "s|$CI_REGISTRY_IMAGE/$IMAGE_NAME|$CI_REGISTRY_IMAGE/gc/gc-transformer|g")
+    - export CLEAN_EXTRA_TAG=$(echo "$EXTRA_TAG" | sed 's/-t[[:space:]]*//g')
+    - export EXTRA_TAG_PROVIDER=$(echo "$CLEAN_EXTRA_TAG" | sed "s|$CI_REGISTRY_IMAGE/$IMAGE_NAME|$CI_REGISTRY_IMAGE/gc/gc-provider|g")
+    - export EXTRA_TAG_TRANSFORMER=$(echo "$CLEAN_EXTRA_TAG" | sed "s|$CI_REGISTRY_IMAGE/$IMAGE_NAME|$CI_REGISTRY_IMAGE/gc/gc-transformer|g")
     - yq -i ".provider.container.image = \"${EXTRA_TAG_PROVIDER}\"" $GC_HELM_DEPLOYMENT_DIR/values.yaml
     - yq -i ".transformer.container.image = \"${EXTRA_TAG_TRANSFORMER}\"" $GC_HELM_DEPLOYMENT_DIR/values.yaml
     - cat $GC_HELM_DEPLOYMENT_DIR/values.yaml | grep -i image