Skip to content

Commit

Permalink
Merge tag '1.20.5' into tetrate-release-1.20
Browse files Browse the repository at this point in the history
Istio release 1.20.5
  • Loading branch information
github-actions committed Apr 9, 2024
2 parents 5968107 + eeb7ff1 commit 0240ef1
Show file tree
Hide file tree
Showing 33 changed files with 406 additions and 137 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "istio build-tools",
"image": "gcr.io/istio-testing/build-tools:release-1.20-885f59e05465a21c9ea351f6a66adca71a26ce09",
"image": "gcr.io/istio-testing/build-tools:release-1.20-5c483f077581e8d30a92caa6b38cd6818378e907",
"privileged": true,
"remoteEnv": {
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
Expand Down
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ endif
export VERSION

# Base version of Istio image to use
BASE_VERSION ?= 1.20-2024-02-16T19-01-57
BASE_VERSION ?= 1.20-2024-03-28T19-02-51
ISTIO_BASE_REGISTRY ?= gcr.io/istio-release

export GO111MODULE ?= on
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ceed1b4cadb8102d93dec8bdcbe652098b6239a0
85b83b956d116555aca33caa5e4a452d617b4878
2 changes: 1 addition & 1 deletion common/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fi
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
PROJECT_ID=${PROJECT_ID:-istio-testing}
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=release-1.20-885f59e05465a21c9ea351f6a66adca71a26ce09
IMAGE_VERSION=release-1.20-5c483f077581e8d30a92caa6b38cd6818378e907
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
Expand Down
46 changes: 23 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
require (
cloud.google.com/go/compute/metadata v0.2.3
cloud.google.com/go/logging v1.8.1
cloud.google.com/go/monitoring v1.16.0
cloud.google.com/go/security v1.15.1
cloud.google.com/go/trace v1.10.1
cloud.google.com/go/monitoring v1.16.3
cloud.google.com/go/security v1.15.4
cloud.google.com/go/trace v1.10.4
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
github.com/Masterminds/semver/v3 v3.2.1
github.com/Masterminds/sprig/v3 v3.2.3
Expand All @@ -23,7 +23,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0
github.com/cheggaaa/pb/v3 v3.1.4
github.com/cilium/ebpf v0.11.0
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4
github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.3.0
github.com/coreos/go-oidc/v3 v3.6.0
Expand All @@ -45,7 +45,7 @@ require (
github.com/google/go-containerregistry v0.16.1
github.com/google/gofuzz v1.2.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/google/uuid v1.3.1
github.com/google/uuid v1.4.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/websocket v1.5.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
Expand Down Expand Up @@ -93,24 +93,24 @@ require (
go.uber.org/atomic v1.11.0
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
golang.org/x/net v0.17.0
golang.org/x/oauth2 v0.13.0
golang.org/x/sync v0.4.0
golang.org/x/sys v0.15.0
golang.org/x/net v0.23.0
golang.org/x/oauth2 v0.14.0
golang.org/x/sync v0.5.0
golang.org/x/sys v0.18.0
golang.org/x/time v0.3.0
gomodules.xyz/jsonpatch/v2 v2.4.0
google.golang.org/api v0.147.0
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a
google.golang.org/genproto/googleapis/rpc v0.0.0-20231009173412-8bfb1ae86b6c
google.golang.org/grpc v1.58.3
google.golang.org/api v0.149.0
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17
google.golang.org/grpc v1.61.2
google.golang.org/protobuf v1.31.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.12.3
istio.io/api v1.20.3-0.20240306014037-8f7da9136957
istio.io/client-go v1.20.3-0.20240306015017-fa2e43592864
istio.io/api v1.20.5-0.20240404235354-1e3f12c56b81
istio.io/client-go v1.20.5-0.20240405000630-c79a685fd316
k8s.io/api v0.28.3
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.28.3
Expand All @@ -127,10 +127,10 @@ require (
)

require (
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/iam v1.1.2 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
cloud.google.com/go v0.110.10 // indirect
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/iam v1.1.5 // indirect
cloud.google.com/go/longrunning v0.5.4 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
Expand Down Expand Up @@ -170,7 +170,7 @@ require (
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
Expand Down Expand Up @@ -233,9 +233,9 @@ require (
go.opencensus.io v0.24.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand Down
Loading

0 comments on commit 0240ef1

Please sign in to comment.