From 049b3caeead23a061b4b4558184b62a8459d5658 Mon Sep 17 00:00:00 2001 From: Daniel Hawton Date: Wed, 24 Jul 2024 15:44:29 -0600 Subject: [PATCH] bump istio and re-enable dns alloc tests (#15470) * bump istio and re-enable dns alloc tests Signed-off-by: Daniel Hawton * gen Signed-off-by: Daniel Hawton * readd other test Signed-off-by: Daniel Hawton --------- Signed-off-by: Daniel Hawton --- .../traffic-management/dns-proxy/test.sh | 16 ++++++---------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh b/content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh index 07dec8be8807..d9025032c28d 100644 --- a/content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh +++ b/content/en/docs/ops/configuration/traffic-management/dns-proxy/test.sh @@ -31,11 +31,8 @@ snip_dns_capture_in_action_2 snip_dns_capture_in_action_1 _verify_contains snip_dns_capture_in_action_3 "$snip_dns_capture_in_action_3_out" -# @TODO: Auto Allocation tests are not working in the current Istio version -# https://github.com/istio/istio.io/issues/15461 -# -# snip_address_auto_allocation_1 -# _verify_contains snip_address_auto_allocation_2 "* Trying 240.240." +snip_address_auto_allocation_1 +_verify_contains snip_address_auto_allocation_2 "* Trying 240.240." # verify external tcp services without vips snip_external_tcp_services_without_vips_1 @@ -43,11 +40,10 @@ snip_external_tcp_services_without_vips_2 snip_external_tcp_services_without_vips_3 snip_external_tcp_services_without_vips_4 -# @TODO: The output here changed as well.. we need to fix this. -#_verify_lines snip_external_tcp_services_without_vips_5 " -#+ outbound|9000||tcp-echo.external-2.svc.cluster.local -#+ outbound|9000||tcp-echo.external-1.svc.cluster.local -#" +_verify_lines snip_external_tcp_services_without_vips_5 " ++ outbound|9000||tcp-echo.external-2.svc.cluster.local ++ outbound|9000||tcp-echo.external-1.svc.cluster.local +" # @cleanup diff --git a/go.mod b/go.mod index 21e5c808b98e..7a74a86b7554 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 golang.org/x/sync v0.7.0 - istio.io/istio v0.0.0-20240718053917-6dd7b0acb6a4 + istio.io/istio v0.0.0-20240724030529-2cb93dcb8116 k8s.io/apimachinery v0.30.1 k8s.io/client-go v0.30.1 ) diff --git a/go.sum b/go.sum index 8eb87808b39a..2bcac7da7855 100644 --- a/go.sum +++ b/go.sum @@ -933,8 +933,8 @@ istio.io/api v1.23.0-alpha.0.0.20240717200518-ef9163fb1200 h1:EgZkWIhuii2cF/KIeo istio.io/api v1.23.0-alpha.0.0.20240717200518-ef9163fb1200/go.mod h1:QPSTGXuIQdnZFEm3myf9NZ5uBMwCdJWUvfj9ZZ+2oBM= istio.io/client-go v1.23.0-alpha.0.0.20240717200917-990731b83cc8 h1:xNPDT1jT8EWe4XDIw1jBYigAhr2b2NHQ/4rwdy+yfvY= istio.io/client-go v1.23.0-alpha.0.0.20240717200917-990731b83cc8/go.mod h1:yxh3oGLR8ZGd6MUjEXK9d7aqWoMrlpptmf+yaXawS08= -istio.io/istio v0.0.0-20240718053917-6dd7b0acb6a4 h1:rgioR8NBad5OBnnheXExE64SgQ15s0uOKUKqZv4IZY8= -istio.io/istio v0.0.0-20240718053917-6dd7b0acb6a4/go.mod h1:liJ546K4fw/Z4v257ddreoyMmR7UXXH2H/8MbzpzlxY= +istio.io/istio v0.0.0-20240724030529-2cb93dcb8116 h1:WTJ5F4Sbj0uN5P4tLj5qg+PKk1qephKNuNx4XERTFNQ= +istio.io/istio v0.0.0-20240724030529-2cb93dcb8116/go.mod h1:liJ546K4fw/Z4v257ddreoyMmR7UXXH2H/8MbzpzlxY= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=