From 46e09c42ab35ab88e17265f7897f1912491b1de1 Mon Sep 17 00:00:00 2001 From: Eric Van Norman Date: Thu, 21 Mar 2024 14:46:05 -0500 Subject: [PATCH] Disable some failing tests (blocking issues created), fix others (#14763) * Disable some failing tests (blocking issues created), fix others * Update apiVersion * Update apiVersion * Remove comment --- .../traffic-management/network-topologies/index.md | 4 ---- .../traffic-management/network-topologies/snips.sh | 4 ---- .../ops/diagnostic-tools/istioctl-analyze/index.md | 2 +- .../ops/diagnostic-tools/istioctl-analyze/snips.sh | 2 +- .../logs/otel-provider/{test.sh => test-disable.sh} | 0 .../authz-dry-run/{test.sh => test-disable.sh} | 0 .../traffic-management/circuit-breaking/index.md | 2 +- .../traffic-management/circuit-breaking/snips.sh | 2 +- .../{mtls_test.sh => mtls_test-disable.sh} | 0 .../traffic-management/fault-injection/index.md | 4 ++-- .../traffic-management/fault-injection/snips.sh | 4 ++-- .../traffic-management/request-routing/index.md | 10 +++++----- .../traffic-management/request-routing/snips.sh | 10 +++++----- .../traffic-management/tcp-traffic-shifting/index.md | 2 +- .../traffic-management/tcp-traffic-shifting/snips.sh | 2 +- .../traffic-management/traffic-shifting/index.md | 2 +- .../traffic-management/traffic-shifting/snips.sh | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 19 files changed, 31 insertions(+), 39 deletions(-) rename content/en/docs/tasks/observability/logs/otel-provider/{test.sh => test-disable.sh} (100%) rename content/en/docs/tasks/security/authorization/authz-dry-run/{test.sh => test-disable.sh} (100%) rename content/en/docs/tasks/traffic-management/egress/egress-tls-origination/{mtls_test.sh => mtls_test-disable.sh} (100%) diff --git a/content/en/docs/ops/configuration/traffic-management/network-topologies/index.md b/content/en/docs/ops/configuration/traffic-management/network-topologies/index.md index 1a2adb3b3a..6a61450690 100644 --- a/content/en/docs/ops/configuration/traffic-management/network-topologies/index.md +++ b/content/en/docs/ops/configuration/traffic-management/network-topologies/index.md @@ -173,10 +173,6 @@ $ export GATEWAY_URL=$(kubectl get gateways.gateway.networking.k8s.io httpbin-ga "Accept": ... "Host": ... "User-Agent": ... - "X-B3-Parentspanid": ... - "X-B3-Sampled": ... - "X-B3-Spanid": ... - "X-B3-Traceid": ... "X-Envoy-Attempt-Count": ... "X-Envoy-External-Address": "72.9.5.6", "X-Forwarded-Client-Cert": ... diff --git a/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh b/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh index bfe121c6b0..de9a40c193 100644 --- a/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh +++ b/content/en/docs/ops/configuration/traffic-management/network-topologies/snips.sh @@ -84,10 +84,6 @@ curl -s -H 'X-Forwarded-For: 56.5.6.7, 72.9.5.6, 98.1.2.3' "$GATEWAY_URL/get?sho "Accept": ... "Host": ... "User-Agent": ... - "X-B3-Parentspanid": ... - "X-B3-Sampled": ... - "X-B3-Spanid": ... - "X-B3-Traceid": ... "X-Envoy-Attempt-Count": ... "X-Envoy-External-Address": "72.9.5.6", "X-Forwarded-Client-Cert": ... diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md index 328ea2d0e5..f055336628 100644 --- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md +++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md @@ -95,7 +95,7 @@ For example. if you have a misconfigured gateway on your "ratings" virtual servi running `kubectl get virtualservice ratings` would give you something like: {{< text syntax=yaml snip_id=vs_yaml_with_status >}} -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh index d35b364045..8d2cec8f97 100644 --- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh +++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh @@ -64,7 +64,7 @@ istioctl analyze --use-kube=false samples/bookinfo/networking/*.yaml } ! IFS=$'\n' read -r -d '' snip_vs_yaml_with_status <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/observability/logs/otel-provider/test.sh b/content/en/docs/tasks/observability/logs/otel-provider/test-disable.sh similarity index 100% rename from content/en/docs/tasks/observability/logs/otel-provider/test.sh rename to content/en/docs/tasks/observability/logs/otel-provider/test-disable.sh diff --git a/content/en/docs/tasks/security/authorization/authz-dry-run/test.sh b/content/en/docs/tasks/security/authorization/authz-dry-run/test-disable.sh similarity index 100% rename from content/en/docs/tasks/security/authorization/authz-dry-run/test.sh rename to content/en/docs/tasks/security/authorization/authz-dry-run/test-disable.sh diff --git a/content/en/docs/tasks/traffic-management/circuit-breaking/index.md b/content/en/docs/tasks/traffic-management/circuit-breaking/index.md index fd420b41b8..f05fe2f9ca 100644 --- a/content/en/docs/tasks/traffic-management/circuit-breaking/index.md +++ b/content/en/docs/tasks/traffic-management/circuit-breaking/index.md @@ -62,7 +62,7 @@ when calling the `httpbin` service: {{< text bash yaml >}} $ kubectl get destinationrule httpbin -o yaml - apiVersion: networking.istio.io/v1beta1 + apiVersion: networking.istio.io/v1 kind: DestinationRule ... spec: diff --git a/content/en/docs/tasks/traffic-management/circuit-breaking/snips.sh b/content/en/docs/tasks/traffic-management/circuit-breaking/snips.sh index a047b804e6..0a92f4dfec 100644 --- a/content/en/docs/tasks/traffic-management/circuit-breaking/snips.sh +++ b/content/en/docs/tasks/traffic-management/circuit-breaking/snips.sh @@ -49,7 +49,7 @@ kubectl get destinationrule httpbin -o yaml } ! IFS=$'\n' read -r -d '' snip_configuring_the_circuit_breaker_2_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: DestinationRule ... spec: diff --git a/content/en/docs/tasks/traffic-management/egress/egress-tls-origination/mtls_test.sh b/content/en/docs/tasks/traffic-management/egress/egress-tls-origination/mtls_test-disable.sh similarity index 100% rename from content/en/docs/tasks/traffic-management/egress/egress-tls-origination/mtls_test.sh rename to content/en/docs/tasks/traffic-management/egress/egress-tls-origination/mtls_test-disable.sh diff --git a/content/en/docs/tasks/traffic-management/fault-injection/index.md b/content/en/docs/tasks/traffic-management/fault-injection/index.md index 8e1305d36f..c9f0518de2 100644 --- a/content/en/docs/tasks/traffic-management/fault-injection/index.md +++ b/content/en/docs/tasks/traffic-management/fault-injection/index.md @@ -56,7 +56,7 @@ still expect the end-to-end flow to continue without any errors. {{< text bash yaml >}} $ kubectl get virtualservice ratings -o yaml - apiVersion: networking.istio.io/v1beta1 + apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -160,7 +160,7 @@ service is currently unavailable` message. {{< text bash yaml >}} $ kubectl get virtualservice ratings -o yaml - apiVersion: networking.istio.io/v1beta1 + apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/fault-injection/snips.sh b/content/en/docs/tasks/traffic-management/fault-injection/snips.sh index 10b2b1ddee..b1da60ad8d 100644 --- a/content/en/docs/tasks/traffic-management/fault-injection/snips.sh +++ b/content/en/docs/tasks/traffic-management/fault-injection/snips.sh @@ -34,7 +34,7 @@ kubectl get virtualservice ratings -o yaml } ! IFS=$'\n' read -r -d '' snip_injecting_an_http_delay_fault_2_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -73,7 +73,7 @@ kubectl get virtualservice ratings -o yaml } ! IFS=$'\n' read -r -d '' snip_injecting_an_http_abort_fault_2_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/request-routing/index.md b/content/en/docs/tasks/traffic-management/request-routing/index.md index 0019f97b72..3191c7bd16 100644 --- a/content/en/docs/tasks/traffic-management/request-routing/index.md +++ b/content/en/docs/tasks/traffic-management/request-routing/index.md @@ -97,7 +97,7 @@ EOF {{< text bash yaml >}} $ kubectl get virtualservices -o yaml -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -108,7 +108,7 @@ $ kubectl get virtualservices -o yaml - destination: host: details subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -119,7 +119,7 @@ $ kubectl get virtualservices -o yaml - destination: host: productpage subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -130,7 +130,7 @@ $ kubectl get virtualservices -o yaml - destination: host: ratings subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -246,7 +246,7 @@ You can confirm the rule is created using the following command: {{< text bash yaml >}} $ kubectl get virtualservice reviews -o yaml -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/request-routing/snips.sh b/content/en/docs/tasks/traffic-management/request-routing/snips.sh index fe654dcec8..b04cde331e 100644 --- a/content/en/docs/tasks/traffic-management/request-routing/snips.sh +++ b/content/en/docs/tasks/traffic-management/request-routing/snips.sh @@ -49,7 +49,7 @@ kubectl get virtualservices -o yaml } ! IFS=$'\n' read -r -d '' snip_route_to_version_1_3_out <<\ENDSNIP -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -60,7 +60,7 @@ kubectl get virtualservices -o yaml - destination: host: details subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -71,7 +71,7 @@ kubectl get virtualservices -o yaml - destination: host: productpage subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -82,7 +82,7 @@ kubectl get virtualservices -o yaml - destination: host: ratings subset: v1 -- apiVersion: networking.istio.io/v1beta1 +- apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: @@ -154,7 +154,7 @@ kubectl get virtualservice reviews -o yaml } ! IFS=$'\n' read -r -d '' snip_route_based_on_user_identity_2_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/index.md b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/index.md index 1192a9bfa5..4f263553b1 100644 --- a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/index.md +++ b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/index.md @@ -150,7 +150,7 @@ $ kubectl apply -f @samples/tcp-echo/gateway-api/tcp-echo-20-v2.yaml@ -n istio-i {{< text bash yaml >}} $ kubectl get virtualservice tcp-echo -o yaml -n istio-io-tcp-traffic-shifting -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh index dea645ab0a..7caa85a5c7 100644 --- a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh +++ b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/snips.sh @@ -81,7 +81,7 @@ kubectl get virtualservice tcp-echo -o yaml -n istio-io-tcp-traffic-shifting } ! IFS=$'\n' read -r -d '' snip_apply_weightbased_tcp_routing_7_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/traffic-shifting/index.md b/content/en/docs/tasks/traffic-management/traffic-shifting/index.md index 3731ac2616..1b7cbb1a1a 100644 --- a/content/en/docs/tasks/traffic-management/traffic-shifting/index.md +++ b/content/en/docs/tasks/traffic-management/traffic-shifting/index.md @@ -96,7 +96,7 @@ confirm the rule was replaced: {{< text syntax=bash outputis=yaml snip_id=verify_config_50_v3 >}} $ kubectl get virtualservice reviews -o yaml -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh b/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh index 0db45f3176..489a4c20de 100644 --- a/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh +++ b/content/en/docs/tasks/traffic-management/traffic-shifting/snips.sh @@ -42,7 +42,7 @@ kubectl get virtualservice reviews -o yaml } ! IFS=$'\n' read -r -d '' snip_verify_config_50_v3_out <<\ENDSNIP -apiVersion: networking.istio.io/v1beta1 +apiVersion: networking.istio.io/v1 kind: VirtualService ... spec: diff --git a/go.mod b/go.mod index 12786d0c0d..60662ab63d 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.6.0 - istio.io/istio v0.0.0-20240313163413-aab0fc6bb065 + istio.io/istio v0.0.0-20240320093105-964954afbbce k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 ) @@ -42,7 +42,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/emicklei/go-restful/v3 v3.11.2 // indirect - github.com/envoyproxy/go-control-plane v0.12.1-0.20240308164834-6064fa95bd86 // indirect + github.com/envoyproxy/go-control-plane v0.12.1-0.20240314184636-e9cf4c9cda6d // indirect github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect github.com/evanphx/json-patch v5.9.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect @@ -187,7 +187,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect helm.sh/helm/v3 v3.14.2 // indirect - istio.io/api v1.19.0-alpha.1.0.20240312010456-c6ba867f734d // indirect + istio.io/api v1.19.0-alpha.1.0.20240316125001-d29365cf33d2 // indirect istio.io/client-go v1.21.0-beta.0 // indirect k8s.io/api v0.29.2 // indirect k8s.io/apiextensions-apiserver v0.29.2 // indirect diff --git a/go.sum b/go.sum index cf87c68b4f..5eae845230 100644 --- a/go.sum +++ b/go.sum @@ -144,8 +144,8 @@ github.com/emicklei/go-restful/v3 v3.11.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.12.1-0.20240308164834-6064fa95bd86 h1:d5A1KhdW1kuRV98Y0xN7jrRdlgab2AhoEcfjpmTfCpk= -github.com/envoyproxy/go-control-plane v0.12.1-0.20240308164834-6064fa95bd86/go.mod h1:lFu6itz1hckLR2A3aJ+ZKf3lu8HpjTsJSsqvVF6GL6g= +github.com/envoyproxy/go-control-plane v0.12.1-0.20240314184636-e9cf4c9cda6d h1:ncc04Wh61TbqYosTi9ToaPEM8vm9qBLENa5RlwQ0I0c= +github.com/envoyproxy/go-control-plane v0.12.1-0.20240314184636-e9cf4c9cda6d/go.mod h1:lFu6itz1hckLR2A3aJ+ZKf3lu8HpjTsJSsqvVF6GL6g= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= @@ -928,12 +928,12 @@ helm.sh/helm/v3 v3.14.2/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -istio.io/api v1.19.0-alpha.1.0.20240312010456-c6ba867f734d h1:q61YXySqv5D0DRY5XdqF/J25UKFn2TYgzMAVlQG9g/0= -istio.io/api v1.19.0-alpha.1.0.20240312010456-c6ba867f734d/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY= +istio.io/api v1.19.0-alpha.1.0.20240316125001-d29365cf33d2 h1:nlb2jZNSjpUiXfM1uubR6/zH6yB/lSR6oTp6qFSo9eQ= +istio.io/api v1.19.0-alpha.1.0.20240316125001-d29365cf33d2/go.mod h1:w/4svOduCtCR+gGn/PuEBIrXfnX4MgA9TlIQgLPEFJk= istio.io/client-go v1.21.0-beta.0 h1:buitXxAL6Fsasge0Oq2zbKFFvPAKf0U6T4P9UFdOXTk= istio.io/client-go v1.21.0-beta.0/go.mod h1:Osr4bJWM5U6Ddvnl8CyppYgdceTsljJWyYa7tLd3qDc= -istio.io/istio v0.0.0-20240313163413-aab0fc6bb065 h1:KiJpObiKyK1tYAV5RGPVu3KZ4quOUa2J6kLfOdyyb5k= -istio.io/istio v0.0.0-20240313163413-aab0fc6bb065/go.mod h1:/sCxHJssZ6SoupXxWbLLeeGGsn1vk11szi8apNB/Kk4= +istio.io/istio v0.0.0-20240320093105-964954afbbce h1:F6Jp49CGSW4pv5ozMOTS0vDvwBwfgCrqHFB/zIMn37A= +istio.io/istio v0.0.0-20240320093105-964954afbbce/go.mod h1:LadiuE/gVfELCJr7tfkdIBRNleB0QopXp8E/Ya+7Hik= 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.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A=