8000 cherry pick go updates to release-3.5 (#5391) · nginx/kubernetes-ingress@819f594 · GitHub
[go: up one dir, main page]

Skip to content

Commit 819f594

Browse files
cherry pick go updates to release-3.5 (#5391)
* Bump the go group with 3 updates (#5331) Bumps the go group with 3 updates: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.27.8` | `1.27.10` | | [github.com/aws/aws-sdk-go-v2/service/marketplacemetering](https://github.com/aws/aws-sdk-go-v2) | `1.21.3` | `1.21.4` | | [github.com/spiffe/go-spiffe/v2](https://github.com/spiffe/go-spiffe) | `2.1.7` | `2.2.0` | Updates `github.com/aws/aws-sdk-go-v2/config` from 1.27.8 to 1.27.10 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.27.8...config/v1.27.10) Updates `github.com/aws/aws-sdk-go-v2/service/marketplacemetering` from 1.21.3 to 1.21.4 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/pi/v1.21.3...service/pi/v1.21.4) Updates `github.com/spiffe/go-spiffe/v2` from 2.1.7 to 2.2.0 - [Release notes](https://github.com/spiffe/go-spiffe/releases) - [Changelog](https://github.com/spiffe/go-spiffe/blob/main/CHANGELOG.md) - [Commits](spiffe/go-spiffe@v2.1.7...v2.2.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/aws/aws-sdk-go-v2/service/marketplacemetering dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: github.com/spiffe/go-spiffe/v2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * ensure minimum of protobuf 1.33.0 * Bump the go group with 3 updates (#5368) Bumps the go group with 3 updates: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.27.10` | `1.27.11` | | [go.opentelemetry. 8000 io/otel](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` | | [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.24.0` | `1.25.0` | Updates `github.com/aws/aws-sdk-go-v2/config` from 1.27.10 to 1.27.11 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.27.10...config/v1.27.11) Updates `go.opentelemetry.io/otel` from 1.24.0 to 1.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.24.0...v1.25.0) Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.24.0 to 1.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go@v1.24.0...v1.25.0) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go - dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 2ff4e79 commit 819f594

File tree

2 files changed

+96
-98
lines changed

2 files changed

+96
-98
lines changed

go.mod

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/nginxinc/kubernetes-ingress
33
go 1.22.1
44

55
require (
6-
github.com/aws/aws-sdk-go-v2/config v1.27.8
7-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.21.3
6+
github.com/aws/aws-sdk-go-v2/config v1.27.11
7+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.21.4
88
github.com/cert-manager/cert-manager v1.14.4
99
github.com/dlclark/regexp2 v1.11.0
1010
github.com/go-chi/chi/v5 v5.0.12
1111
github.com/golang-jwt/jwt/v4 v4.5.0
12-
github.com/golang/glog v1.1.2
12+
github.com/golang/glog v1.2.0
1313
github.com/google/go-cmp v0.6.0
1414
github.com/jinzhu/copier v0.4.0
1515
github.com/kr/pretty v0.3.1
@@ -19,10 +19,10 @@ require (
1919
github.com/nginxinc/telemetry-exporter v0.0.0-20240307135433-a5ecce59bddf
2020
github.com/prometheus/client_golang v1.18.0
2121
github.com/prometheus/common v0.47.0
22-
github.com/spiffe/go-spiffe/v2 v2.1.7
22+
github.com/spiffe/go-spiffe/v2 v2.2.0
2323
github.com/stretchr/testify v1.9.0
24-
go.opentelemetry.io/otel v1.24.0
25-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
24+
go.opentelemetry.io/otel v1.25.0
25+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
2626
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
2727
k8s.io/api v0.29.3
2828
k8s.io/apimachinery v0.29.3
@@ -35,21 +35,21 @@ require (
3535
require (
3636
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
3737
github.com/Microsoft/go-winio v0.6.1 // indirect
38-
github.com/aws/aws-sdk-go-v2 v1.26.0 // indirect
39-
github.com/aws/aws-sdk-go-v2/credentials v1.17.8 // indirect
40-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.4 // indirect
41-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.4 // indirect
42-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.4 // indirect
38+
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
39+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
40+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 // indirect
41+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
42+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
4343
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.1 // indirect
45-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.6 // indirect
46-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.3 // indirect
47-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.3 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.5 // indirect
49-
github.com/aws/smithy-go v1.20.1 // indirect
44+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
45+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
46+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
47+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
48+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 // indirect
49+
github.com/aws/smithy-go v1.20.2 // indirect
5050
github.com/beorn7/perks v1.0.1 // indirect
5151
github.com/blang/semver/v4 v4.0.0 // indirect
52-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
52+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5353
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5454
github.com/coreos/go-semver v0.3.1 // indirect
5555
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -59,7 +59,7 @@ require (
5959
github.com/fatih/color v1.16.0 // indirect
6060
github.com/felixge/httpsnoop v1.0.4 // indirect
8000 6161
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
62-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
62+
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
6363
github.com/go-kit/log v0.2.1 // indirect
6464
github.com/go-ldap/ldap/v3 v3.4.6 // indirect
6565
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -102,27 +102,27 @@ require (
102102
go.etcd.io/etcd/client/v3 v3.5.11 // indirect
103103
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
104104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
105-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
106-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
107-
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
108-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
105+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
106+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
107+
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
108+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
109109
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
110110
go.uber.org/multierr v1.11.0 // indirect
111111
go.uber.org/zap v1.26.0 // indirect
112112
golang.org/x/crypto v0.21.0 // indirect
113113
golang.org/x/mod v0.16.0 // indirect
114-
golang.org/x/net v0.22.0 // indirect
115-
golang.org/x/oauth2 v0.16.0 // indirect
114+
golang.org/x/net v0.23.0 // indirect
115+
golang.org/x/oauth2 v0.17.0 // indirect
116116
golang.org/x/sys v0.18.0 // indirect
117117
golang.org/x/term v0.18.0 // indirect
118118
golang.org/x/text v0.14.0 // indirect
119119
golang.org/x/time v0.5.0 // indirect
120120
golang.org/x/tools v0.19.0 // indirect
121121
google.golang.org/appengine v1.6.8 // indirect
122-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
123-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
124-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
125-
google.golang.org/grpc v1.61.1 // indirect
122+
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
123+
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
124+
google.golang.o 7720 rg/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
125+
google.golang.org/grpc v1.63.0 // indirect
126126
google.golang.org/protobuf v1.33.0 // indirect
127127
gopkg.in/inf.v0 v0.9.1 // indirect
128128
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -141,3 +141,7 @@ require (
141141
)
142142

143143
replace github.com/golang/glog => github.com/nginxinc/glog v1.1.2
144+
145+
replace google.golang.org/protobuf v1.26.0 => google.golang.org/protobuf v1.33.0
146+
147+
replace google.golang.org/protobuf v1.26.0-rc.1 => google.golang.org/protobuf v1.33.0

0 commit comments

Comments
 (0)
0