Skip to content

Commit b196b42

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1279 from yue9944882/automated-cherry-pick-of-#1146-#1157-#1169-#1177-upstream-release-1.30
Automated cherry pick of #1146: upgraded to ec2 v2, buggy #1157: Update ELB and ELBV2 packages to AWS SDK Go V2 #1169: aws sdk go upgrade #1177: update aws & awserr to go sdk v2
2 parents 97a5892 + 7f64e92 commit b196b42

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+3903
-2873
lines changed

‎THIRD-PARTY-LICENSES‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Copyright © 2015 Steve Francia <[email protected]>
180180

181181
-----
182182

183-
** aws/aws-sdk-go; version 1.15.7 -- https://github.com/aws/aws-sdk-go/
183+
** aws/aws-sdk-go-v2; version 1.24.4 -- https://github.com/aws/aws-sdk-go-v2/
184184
** Etcd; version v3.1.0-alpha.1 -- https://github.com/coreos/etcd/tree/v3.1.0-alpha.1
185185
** github.com/coreos/go-semver; version 0.2 -- https://github.com/coreos/go-semver
186186
** github.com/coreos/go-systemd/; version 10 -- https://github.com/coreos/go-systemd/
@@ -412,9 +412,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
412412
See the License for the specific language governing permissions and
413413
limitations under the License.
414414

415-
* For aws/aws-sdk-go see also this required NOTICE:
415+
* For aws/aws-sdk-go-v2 see also this required NOTICE:
416416
AWS SDK for Go
417-
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
417+
Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
418418
Copyright 2014-2015 Stripe, Inc.
419419
* For Etcd see also this required NOTICE:
420420
CoreOS Project

‎go.mod‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ module k8s.io/cloud-provider-aws
33
go 1.24.7
44

55
require (
6-
github.com/aws/aws-sdk-go v1.55.5
7-
github.com/aws/aws-sdk-go-v2 v1.32.5
8-
github.com/aws/aws-sdk-go-v2/config v1.28.0
6+
github.com/aws/aws-sdk-go-v2 v1.36.5
7+
github.com/aws/aws-sdk-go-v2/config v1.29.14
8+
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.53.3
99
github.com/aws/aws-sdk-go-v2/service/ecr v1.36.2
1010
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.27.2
11+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.29.3
12+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.45.2
13+
github.com/aws/aws-sdk-go-v2/service/kms v1.41.0
1114
github.com/spf13/cobra v1.8.1
1215
github.com/spf13/pflag v1.0.5
13-
github.com/stretchr/testify v1.9.0
16+
github.com/stretchr/testify v1.10.0
1417
golang.org/x/time v0.5.0
1518
gopkg.in/gcfg.v1 v1.2.3
1619
k8s.io/api v0.30.1
@@ -26,23 +29,28 @@ require (
2629
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
2730
)
2831

32+
require (
33+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
34+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
35+
github.com/onsi/ginkgo/v2 v2.23.0 // indirect
36+
github.com/onsi/gomega v1.36.2 // indirect
37+
)
38+
2939
require (
3040
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3141
github.com/NYTimes/gziphandler v1.1.1 // indirect
32-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 // indirect
33-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
34-
github.com/aws/aws-sdk-go-v2/credentials v1.17.41
35-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.17 // indirect
36-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
37-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
38-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.186.0
40-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.2 // indirect
43-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.2 // indirect
44-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1
45-
github.com/aws/smithy-go v1.22.1
42+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
43+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.31
44+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
47+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.218.0
48+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
53+
github.com/aws/smithy-go v1.22.4
4654
github.com/beorn7/perks v1.0.1 // indirect
4755
github.com/blang/semver/v4 v4.0.0 // indirect
4856
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -54,7 +62,7 @@ require (
5462
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5563
github.com/felixge/httpsnoop v1.0.4 // indirect
5664
github.com/fsnotify/fsnotify v1.7.0 // indirect
57-
github.com/go-logr/logr v1.4.1 // indirect
65+
github.com/go-logr/logr v1.4.2 // indirect
5866
github.com/go-logr/stdr v1.2.2 // indirect
5967
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6068
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -102,22 +110,22 @@ require (
102110
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
103111
go.uber.org/multierr v1.11.0 // indirect
104112
go.uber.org/zap v1.26.0 // indirect
105-
golang.org/x/crypto v0.32.0 // indirect
106-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
107-
golang.org/x/mod v0.17.0 // indirect
108-
golang.org/x/net v0.34.0 // indirect
113+
golang.org/x/crypto v0.36.0 // indirect
114+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
115+
golang.org/x/mod v0.23.0 // indirect
116+
golang.org/x/net v0.38.0 // indirect
109117
golang.org/x/oauth2 v0.11.0 // indirect
110-
golang.org/x/sync v0.10.0 // indirect
111-
golang.org/x/sys v0.29.0 // indirect
112-
golang.org/x/term v0.28.0 // indirect
113-
golang.org/x/text v0.21.0 // indirect
114-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
118+
golang.org/x/sync v0.12.0 // indirect
119+
golang.org/x/sys v0.31.0 // indirect
120+
golang.org/x/term v0.30.0 // indirect
121+
golang.org/x/text v0.23.0 // indirect
122+
golang.org/x/tools v0.30.0 // indirect
115123
google.golang.org/appengine v1.6.7 // indirect
116124
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
117125
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
118126
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
119127
google.golang.org/grpc v1.59.0 // indirect
120-
google.golang.org/protobuf v1.33.0 // indirect
128+
google.golang.org/protobuf v1.36.1 // indirect
121129
gopkg.in/inf.v0 v0.9.1 // indirect
122130
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
123131
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)