From cf43397b2fdecd4c892c8b0dda1c6fa71984b456 Mon Sep 17 00:00:00 2001 From: Eric Van Norman Date: Mon, 11 Sep 2023 11:40:29 -0500 Subject: [PATCH] Update to main branch commit (#13819) * Update to main branch comit * Update istio api and client-go commits * Update tests to also work on arm64 machines * Change multi-cluster cleanup to use --purge like the page * Change multi-cluster cleanup to use --purge like the page * Try changing uninstall order to see if it follows second uniunstall * Try doing one uninstall instead of spinning both of them * Move back to commit before suspected PR * make gen * Update to commit with fix for --context * Update to latest branch disabling tcp-traffic-shifting tests --- bin/init.sh | 4 ++-- ...{gtwapi_test.sh => gtwapi_test-disable.sh} | 0 .../{test.sh => test-disable.sh} | 0 go.mod | 10 +++++----- go.sum | 20 +++++++++---------- 5 files changed, 17 insertions(+), 17 deletions(-) rename content/en/docs/tasks/traffic-management/tcp-traffic-shifting/{gtwapi_test.sh => gtwapi_test-disable.sh} (100%) rename content/en/docs/tasks/traffic-management/tcp-traffic-shifting/{test.sh => test-disable.sh} (100%) diff --git a/bin/init.sh b/bin/init.sh index ced5b29478752..2c1c3ab39cbf2 100755 --- a/bin/init.sh +++ b/bin/init.sh @@ -78,8 +78,8 @@ then make "$ISTIOCTL_ARTIFACT" cp -a "$ISTIOCTL_ARTIFACT" "${ISTIOIO_BIN}/istioctl" else - make "${ISTIO_OUT}/release/istioctl-linux-amd64" - cp -a "${ISTIO_OUT}/release/istioctl-linux-amd64" /gobin/istioctl + make "${ISTIO_OUT}/release/istioctl-linux-${GOARCH_LOCAL}" + cp -a "${ISTIO_OUT}/release/istioctl-linux-${GOARCH_LOCAL}" /gobin/istioctl fi popd > /dev/null diff --git a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/gtwapi_test.sh b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/gtwapi_test-disable.sh similarity index 100% rename from content/en/docs/tasks/traffic-management/tcp-traffic-shifting/gtwapi_test.sh rename to content/en/docs/tasks/traffic-management/tcp-traffic-shifting/gtwapi_test-disable.sh diff --git a/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test.sh b/content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test-disable.sh similarity index 100% rename from content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test.sh rename to content/en/docs/tasks/traffic-management/tcp-traffic-shifting/test-disable.sh diff --git a/go.mod b/go.mod index 0c455028e4c27..48dc5aef43958 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module istio.io/istio.io -go 1.19 +go 1.20 // https://github.com/containerd/containerd/issues/5781 exclude k8s.io/kubernetes v1.13.0 @@ -11,7 +11,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.3.0 - istio.io/istio v0.0.0-20230901023555-3b3ca8ec1632 + istio.io/istio v0.0.0-20230910030658-d3a37657c940 k8s.io/apimachinery v0.28.1 k8s.io/client-go v0.28.1 ) @@ -37,7 +37,7 @@ require ( github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect 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/docker/cli v24.0.5+incompatible // indirect @@ -195,8 +195,8 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect helm.sh/helm/v3 v3.12.3 // indirect - istio.io/api v1.19.0-rc.0.0.20230828012244-464da4944bb2 // indirect - istio.io/client-go v1.19.0-rc.0 // indirect + istio.io/api v1.19.0-alpha.1.0.20230906212454-eb3480b47045 // indirect + istio.io/client-go v1.19.0-alpha.1.0.20230906213353-47c72a6168eb // indirect k8s.io/api v0.28.1 // indirect k8s.io/apiextensions-apiserver v0.28.1 // indirect k8s.io/apiserver v0.28.1 // indirect diff --git a/go.sum b/go.sum index 90932c181be10..712ee1fb7c63c 100644 --- a/go.sum +++ b/go.sum @@ -40,7 +40,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= @@ -144,8 +144,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -734,7 +734,7 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0 h1:7XZai4VhA473clBrOqqHdjHBImGfyEtv0qW4nnn/kAo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= @@ -1229,12 +1229,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -istio.io/api v1.19.0-rc.0.0.20230828012244-464da4944bb2 h1:w/BvgCcFs67CVuVTp0UidSDJNY50e6ZrkBmRH8A242c= -istio.io/api v1.19.0-rc.0.0.20230828012244-464da4944bb2/go.mod h1:KstZe4bKbXouALUJ5PqpjNEhu5nj90HrDFitZfpNhlU= -istio.io/client-go v1.19.0-rc.0 h1:IhPVJW9TT18HafUPxgVCuaEBdNVPol8IJlKYGrXJmS0= -istio.io/client-go v1.19.0-rc.0/go.mod h1:zG9fwlp6qSvxlErRgc8X46CLC3Ga91cGR5ADUqEAQYU= -istio.io/istio v0.0.0-20230901023555-3b3ca8ec1632 h1:FIt188FjltdiOkQBxBfkaEt/j2LFt5fwLUpn5zcyt4g= -istio.io/istio v0.0.0-20230901023555-3b3ca8ec1632/go.mod h1:mb5FYy8JQ83rWhX8whFTR5QXvVj8NtyVJVBeNPLAIQU= +istio.io/api v1.19.0-alpha.1.0.20230906212454-eb3480b47045 h1:ECyIu8umc8WBi3zkqx8fovLXYiXLx5zJM/0Zyhe+egk= +istio.io/api v1.19.0-alpha.1.0.20230906212454-eb3480b47045/go.mod h1:hFqNwCBpXIy5jboW4geFoz3io9ZR3nVJ4oLI7udf6Vo= +istio.io/client-go v1.19.0-alpha.1.0.20230906213353-47c72a6168eb h1:5pdDJ0Ve+vhwcLy55+pTUr9mEdhJ63YmN+TOhdlBt2s= +istio.io/client-go v1.19.0-alpha.1.0.20230906213353-47c72a6168eb/go.mod h1:4QPP/1dpDk3orNpBsyq7I8irUONSRaL4AeDZrwVaYo8= +istio.io/istio v0.0.0-20230910030658-d3a37657c940 h1:VivKLtjb2+DXMdOEClxGMeY4sL83t/mCJmliBSYrC6Q= +istio.io/istio v0.0.0-20230910030658-d3a37657c940/go.mod h1:+27w5+tb1PUAhuZd6JBv4IwFwaU+h/1bsdxQ0uZBk0o= 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.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108=