Master to Release-1.20 changes #3473
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge pull request #3456 from aws/master
Bumps the k8s-dependencies group with 5 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.33.4` | `0.34.0` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.4` | `0.34.0` | | [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.4` | `0.34.0` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.4` | `0.34.0` | | [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) | `0.21.0` | `0.22.0` | Updates `k8s.io/api` from 0.33.4 to 0.34.0 - [Commits](kubernetes/api@v0.33.4...v0.34.0) Updates `k8s.io/apimachinery` from 0.33.4 to 0.34.0 - [Commits](kubernetes/apimachinery@v0.33.4...v0.34.0) Updates `k8s.io/cli-runtime` from 0.33.4 to 0.34.0 - [Commits](kubernetes/cli-runtime@v0.33.4...v0.34.0) Updates `k8s.io/client-go` from 0.33.4 to 0.34.0 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.33.4...v0.34.0) Updates `sigs.k8s.io/controller-runtime` from 0.21.0 to 0.22.0 - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/controller-runtime@v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/cli-runtime dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.34.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.22.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the aws-dependencies group with 11 updates: | Package | From | To | | --- | --- | --- | | [github.com/aws/amazon-vpc-resource-controller-k8s](https://github.com/aws/amazon-vpc-resource-controller-k8s) | `1.7.5` | `1.7.10` | | [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) | `1.37.1` | `1.38.3` | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.30.2` | `1.31.6` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) | `1.18.1` | `1.18.6` | | [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) | `1.55.1` | `1.58.2` | | [github.com/aws/aws-sdk-go-v2/service/cloudformation](https://github.com/aws/aws-sdk-go-v2) | `1.62.1` | `1.65.2` | | [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) | `1.46.1` | `1.49.2` | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.239.0` | `1.249.0` | | [github.com/aws/aws-sdk-go-v2/service/eks](https://github.com/aws/aws-sdk-go-v2) | `1.67.1` | `1.73.1` | | [github.com/aws/aws-sdk-go-v2/service/iam](https://github.com/aws/aws-sdk-go-v2) | `1.44.1` | `1.47.3` | | [github.com/aws/smithy-go](https://github.com/aws/smithy-go) | `1.22.5` | `1.23.0` | Updates `github.com/aws/amazon-vpc-resource-controller-k8s` from 1.7.5 to 1.7.10 - [Release notes](https://github.com/aws/amazon-vpc-resource-controller-k8s/releases) - [Commits](aws/amazon-vpc-resource-controller-k8s@v1.7.5...v1.7.10) Updates `github.com/aws/aws-sdk-go-v2` from 1.37.1 to 1.38.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@v1.37.1...v1.38.3) Updates `github.com/aws/aws-sdk-go-v2/config` from 1.30.2 to 1.31.6 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@v1.30.2...config/v1.31.6) Updates `github.com/aws/aws-sdk-go-v2/feature/ec2/imds` from 1.18.1 to 1.18.6 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/config/v1.18.6/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@v1.18.1...config/v1.18.6) Updates `github.com/aws/aws-sdk-go-v2/service/autoscaling` from 1.55.1 to 1.58.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.55.1...service/s3/v1.58.2) Updates `github.com/aws/aws-sdk-go-v2/service/cloudformation` from 1.62.1 to 1.65.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/iot/v1.62.1...service/s3/v1.65.2) Updates `github.com/aws/aws-sdk-go-v2/service/cloudwatch` from 1.46.1 to 1.49.2 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/ssm/v1.46.1...service/ssm/v1.49.2) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.239.0 to 1.249.0 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/ec2/v1.239.0...service/ec2/v1.249.0) Updates `github.com/aws/aws-sdk-go-v2/service/eks` from 1.67.1 to 1.73.1 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.67.1...service/s3/v1.73.1) Updates `github.com/aws/aws-sdk-go-v2/service/iam` from 1.44.1 to 1.47.3 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/main/changelog-template.json) - [Commits](aws/aws-sdk-go-v2@service/iot/v1.44.1...service/s3/v1.47.3) Updates `github.com/aws/smithy-go` from 1.22.5 to 1.23.0 - [Release notes](https://github.com/aws/smithy-go/releases) - [Changelog](https://github.com/aws/smithy-go/blob/main/CHANGELOG.md) - [Commits](aws/smithy-go@v1.22.5...v1.23.0) --- updated-dependencies: - dependency-name: github.com/aws/amazon-vpc-resource-controller-k8s dependency-version: 1.7.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-version: 1.38.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.6 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-version: 1.18.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-version: 1.58.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.65.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.49.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.249.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-version: 1.73.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-version: 1.47.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies - dependency-name: github.com/aws/smithy-go dependency-version: 1.23.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: aws-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* optimize ENI slot reservation for non-supported instance type * integration test --------- Co-authored-by: Jay Deokar <[email protected]>
Changed error log in GetPodMTU to use podMTU (string input) instead of
mtu (int result) when logging parse failures.
This fixes the format string mismatch that causes:
{"level":"error","ts":"2025-10-02T23:03:58.442+0200","caller":"routed-eni-cni-plugin/cni.go:163","msg":"Failed to parse pod MTU %!s(int=0): strconv.Atoi: parsing \"\": invalid syntax"}
in the output of "make unit-test".
yash97
approved these changes
Oct 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this? release
Which issue does this PR fix?: N/A
What does this PR do / Why do we need it?:
N/A
Testing done on this change: N/A
Will this PR introduce any new dependencies?: N/A
Will this break upgrades or downgrades? Has updating a running cluster been tested?: N/A
Does this change require updates to the CNI daemonset config files to work?: N/A
Does this PR introduce any user-facing change?: N/A
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.