Automated merge

* upstream/main:
  Ignore istio version suffix used in the downstream builds (istio-ecosystem#446)
  Pin the version of OLM we use for e2e tests (istio-ecosystem#450)

Makefile.core.mk

@@ -472,6 +472,7 @@ OPERATOR_SDK_VERSION ?= v1.37.0
 HELM_VERSION ?= v3.16.2
 CONTROLLER_TOOLS_VERSION ?= v0.16.4
 OPM_VERSION ?= v1.47.0
+OLM_VERSION ?= 0.28.0
 GITLEAKS_VERSION ?= v8.21.1
 ISTIOCTL_VERSION ?= 1.23.0
 

tests/e2e/common-operator-integ-suite.sh

@@ -241,9 +241,14 @@ if [ "${SKIP_BUILD}" == "false" ]; then
     BUNDLE_IMG="${BUNDLE_IMG}" \
     OPENSHIFT_PLATFORM=false \
     make bundle bundle-build bundle-push
-     
+
     # Install OLM in the cluster because it's not available by default in kind.
-    ${OPERATOR_SDK} olm install
+    OLM_INSTALL_ARGS=""
+    if [ "${OLM_VERSION}" != "" ]; then
+      OLM_INSTALL_ARGS+="--version ${OLM_VERSION}"
+    fi
+    # shellcheck disable=SC2086
+    ${OPERATOR_SDK} olm install ${OLM_INSTALL_ARGS}
 
     # Wait for for the CatalogSource to be CatalogSource.status.connectionState.lastObservedState == READY
     ${COMMAND} wait catalogsource operatorhubio-catalog -n olm --for 'jsonpath={.status.connectionState.lastObservedState}=READY' --timeout=5m

tests/e2e/util/common/e2e_utils.go

@@ -55,7 +55,8 @@ var (
 	// - 1.22.2
 	// - 1.23.0-rc.1
 	// - 1.24-alpha.feabc1234
-	istiodVersionRegex = regexp.MustCompile(`Version:"([^"]*)"`)
+	// matching only the version before first '_' which is used in the downstream builds, e.g. "1.23.2_ossm_tp.2"
+	istiodVersionRegex = regexp.MustCompile(`Version:"([^"_]*)[^"]*"`)
 
 	k = kubectl.New()
 )

tools/update_deps.sh

@@ -58,6 +58,10 @@ sed -i "s|CONTROLLER_TOOLS_VERSION ?= .*|CONTROLLER_TOOLS_VERSION ?= ${CONTROLLE
 OPM_LATEST_VERSION=$(getLatestVersion operator-framework/operator-registry)
 sed -i "s|OPM_VERSION ?= .*|OPM_VERSION ?= ${OPM_LATEST_VERSION}|" "${ROOTDIR}/Makefile.core.mk"
 
+# Update olm
+OLM_LATEST_VERSION=$(getLatestVersion operator-framework/operator-lifecycle-manager)
+sed -i "s|OLM_VERSION ?= .*|OLM_VERSION ?= ${OLM_LATEST_VERSION}|" "${ROOTDIR}/Makefile.core.mk"
+
 # Update kube-rbac-proxy
 RBAC_PROXY_LATEST_VERSION=$(getLatestVersion brancz/kube-rbac-proxy | cut -d/ -f1)
 # Only update it if the newer image is available in the registry