From 3eebc3b13cb4ec47ebbb41b84ba71405b621ec60 Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Fri, 25 Oct 2024 12:54:19 +0100 Subject: [PATCH 1/3] bump default test version to latest istio release Signed-off-by: Ashley Davis --- make/test-e2e.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/test-e2e.mk b/make/test-e2e.mk index 95eee3e2..ac1f0705 100644 --- a/make/test-e2e.mk +++ b/make/test-e2e.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ISTIO_VERSION ?= 1.22.2 +ISTIO_VERSION ?= 1.23.2 ISTIO_CONFIG_FILE ?= ./make/config/istio/istio-config-default.yaml $(bin_dir)/scratch/istioctl-$(ISTIO_VERSION): | $(bin_dir)/scratch/ From a66b216ca554df68b224da1c3ff047dfe6af1552 Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Fri, 25 Oct 2024 12:54:43 +0100 Subject: [PATCH 2/3] add command for geting latest istio version in CI Signed-off-by: Ashley Davis --- make/test-e2e.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make/test-e2e.mk b/make/test-e2e.mk index ac1f0705..1d69049c 100644 --- a/make/test-e2e.mk +++ b/make/test-e2e.mk @@ -15,6 +15,10 @@ ISTIO_VERSION ?= 1.23.2 ISTIO_CONFIG_FILE ?= ./make/config/istio/istio-config-default.yaml +.PHONY: print-latest-istio-version +print-latest-istio-version: + @curl -sSL --show-error -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/istio/istio/releases | jq -r '.[].tag_name' | sort -rV | head -n1 + $(bin_dir)/scratch/istioctl-$(ISTIO_VERSION): | $(bin_dir)/scratch/ curl -L https://istio.io/downloadIstio | ISTIO_VERSION=$(ISTIO_VERSION) sh - mv istio-$(ISTIO_VERSION)/bin/istioctl $(bin_dir)/scratch/istioctl-$(ISTIO_VERSION) From 136eeb1ebc495a90399063b5ab2e82d25fe612d5 Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Fri, 25 Oct 2024 12:55:02 +0100 Subject: [PATCH 3/3] move e2e option up to prevent missing env var warnings Signed-off-by: Ashley Davis --- make/test-e2e.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/test-e2e.mk b/make/test-e2e.mk index 1d69049c..7f9ac1f7 100644 --- a/make/test-e2e.mk +++ b/make/test-e2e.mk @@ -92,6 +92,7 @@ INSTALL_OPTIONS += -f ./make/config/istio-csr-values.yaml test-e2e-deps: e2e-setup-cert-manager test-e2e-deps: e2e-create-cert-manager-istio-resources +test-e2e-deps: ISTIO_INSTALL_OPTIONS := test-e2e-deps-sidecars: test-e2e-deps test-e2e-deps-sidecars: install @@ -100,7 +101,6 @@ test-e2e-deps-sidecars: e2e-setup-istio test-e2e-deps-ambient: test-e2e-deps test-e2e-deps-ambient: INSTALL_OPTIONS += --set app.server.caTrustedNodeAccounts="istio-system/ztunnel" test-e2e-deps-ambient: install -test-e2e-deps-ambient: ISTIO_INSTALL_OPTIONS := test-e2e-deps-ambient: ISTIO_INSTALL_OPTIONS += --set profile=ambient test-e2e-deps-ambient: e2e-setup-istio