Stop augmenting versions for deploy-latest

Since this target gets the latest `subctl`, and uses `SUBCTL` flag to skip overriding versions on deployment, the actual versions that will deploy are the ones dictated by that `subctl`. Signed-off-by: Mike Kolesnik <[email protected]> (cherry picked from commit 1bcd83a)
submariner-io · May 3, 2022 · 3218edf · 3218edf
1 parent 2be122e
commit 3218edf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile.inc b/Makefile.inc
@@ -145,7 +145,7 @@ upgrade-e2e: deploy-latest deploy e2e
 # are *not* rebuilt (we want to deploy the published images only)
 deploy-latest:
 	curl -L get.submariner.io | VERSION=latest bash
-	$(MAKE) -o images -o preload-images deploy SUBCTL=~/.local/bin/subctl DEV_VERSION=latest CUTTING_EDGE=latest VERSION=latest DEPLOY_ARGS="$(DEPLOY_ARGS) --image_tag=subctl" using=$(using)
+	$(MAKE) -o images -o preload-images deploy SUBCTL=~/.local/bin/subctl DEPLOY_ARGS="$(DEPLOY_ARGS) --image_tag=subctl" using=$(using)
 
 ##### LINTING TARGETS #####
 .PHONY: gitlint golangci-lint lint markdownlint packagedoc-lint shellcheck yamllint

diff --git a/scripts/shared/lib/deploy_funcs b/scripts/shared/lib/deploy_funcs
@@ -75,7 +75,7 @@ function test_connection() {
 
 function connectivity_tests() {
     target_cluster="$1"
-    DEV_VERSION="${BASE_BRANCH}" import_image quay.io/submariner/nettest
+    import_image quay.io/submariner/nettest
     deploy_resource "${RESOURCES_DIR}/netshoot.yaml"
     with_context "$target_cluster" deploy_resource "${RESOURCES_DIR}/nginx-demo.yaml"
 

diff --git a/scripts/shared/lib/deploy_operator b/scripts/shared/lib/deploy_operator
@@ -76,6 +76,9 @@ function subctl_install_subm() {
                 ${deploytool_submariner_args} \
                 ${cidr_args} \
                 "${OUTPUT_DIR}"/broker-info.subm
+
+    # Print installed versions for manual validation of CI
+    "${SUBCTL}" show versions --kubeconfig "${KUBECONFIGS_DIR}/kind-config-$cluster"
 }
 
 function install_subm_all_clusters() {