This is the latest stable release branch ovn-kubernetes supports since
the v1.2.0 release:

https://github.com/ovn-kubernetes/ovn-kubernetes/releases/tag/v1.2.0

This release is the first ovnk release that uses OVN's transit routers
so it's interesting for us to use its tests.

Unfortunately we also had to do a minor change in the helper that
detects with golang version needs to be installed.  We used to use what
is stored in ovnk's go.mod file but on branch release-1.2 that points to
1.24.0.

If we use the value as is eventually the job will try to pull the
quay.io/projectquay/golang:1.24.0 image.  That doesn't exist.  It turns
out a better way to detect the golang version is to look at
dist/images/Makefile.  It's still not bullet proof and it might change
in the future but likely not on ovnk's stable release branch.
It seems to work for now.

Signed-off-by: Dumitru Ceara <[email protected]>
---
 .ci/ovn-kubernetes/prepare.sh        | 3 ++-
 .github/workflows/ovn-kubernetes.yml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/ovn-kubernetes/prepare.sh b/.ci/ovn-kubernetes/prepare.sh
index 89ba1c5942..333ddbe7c3 100755
--- a/.ci/ovn-kubernetes/prepare.sh
+++ b/.ci/ovn-kubernetes/prepare.sh
@@ -7,7 +7,8 @@ env_path=$2
 topdir=$PWD
 
 function extract_go_version() {
-    go mod edit -json go-controller/go.mod | jq -r .Go
+    grep -E 'GO_VERSION \?= [0-9]\.[0-9\.]*$' dist/images/Makefile \
+        | awk '{print $3}' | tr -d '"'
 }
 
 function extract_k8s_version() {
diff --git a/.github/workflows/ovn-kubernetes.yml 
b/.github/workflows/ovn-kubernetes.yml
index 6449fed5ca..140bc68d1f 100644
--- a/.github/workflows/ovn-kubernetes.yml
+++ b/.github/workflows/ovn-kubernetes.yml
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  OVNKUBE_COMMIT: "release-1.1"
+  OVNKUBE_COMMIT: "release-1.2"
   KIND_CLUSTER_NAME: ovn
   KIND_INSTALL_INGRESS: true
   KIND_ALLOW_SYSTEM_WRITES: true
-- 
2.52.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to