Merge master to Release 1.20 for v1.20.5 release #3504
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
Bumps the aws-dependencies group with 9 updates: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2](https://github.com/aws/aws-sdk-go-v2) | `1.39.1` | `1.39.2` | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.31.10` | `1.31.12` | | [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) | `1.18.8` | `1.18.9` | | [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) | `1.59.2` | `1.59.3` | | [github.com/aws/aws-sdk-go-v2/service/cloudformation](https://github.com/aws/aws-sdk-go-v2) | `1.66.3` | `1.66.4` | | [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) | `1.51.0` | `1.51.1` | | [github.com/aws/aws-sdk-go-v2/service/ec2](https://github.com/aws/aws-sdk-go-v2) | `1.254.0` | `1.254.1` | | [github.com/aws/aws-sdk-go-v2/service/eks](https://github.com/aws/aws-sdk-go-v2) | `1.74.1` | `1.74.2` | | [github.com/aws/aws-sdk-go-v2/service/iam](https://github.com/aws/aws-sdk-go-v2) | `1.47.6` | `1.47.7` | Updates `github.com/aws/aws-sdk-go-v2` from 1.39.1 to 1.39.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@v1.39.1...v1.39.2) Updates `github.com/aws/aws-sdk-go-v2/config` from 1.31.10 to 1.31.12 - [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@config/v1.31.10...config/v1.31.12) Updates `github.com/aws/aws-sdk-go-v2/feature/ec2/imds` from 1.18.8 to 1.18.9 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/config/v1.18.9/CHANGELOG.md) - [Commits](aws/aws-sdk-go-v2@config/v1.18.8...config/v1.18.9) Updates `github.com/aws/aws-sdk-go-v2/service/autoscaling` from 1.59.2 to 1.59.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.59.2...service/iot/v1.59.3) Updates `github.com/aws/aws-sdk-go-v2/service/cloudformation` from 1.66.3 to 1.66.4 - [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.66.3...service/medialive/v1.66.4) Updates `github.com/aws/aws-sdk-go-v2/service/cloudwatch` from 1.51.0 to 1.51.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.51.0...service/s3/v1.51.1) Updates `github.com/aws/aws-sdk-go-v2/service/ec2` from 1.254.0 to 1.254.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/ec2/v1.254.0...service/ec2/v1.254.1) Updates `github.com/aws/aws-sdk-go-v2/service/eks` from 1.74.1 to 1.74.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.74.1...service/eks/v1.74.2) Updates `github.com/aws/aws-sdk-go-v2/service/iam` from 1.47.6 to 1.47.7 - [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.47.6...service/s3/v1.47.7) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2 dependency-version: 1.39.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-version: 1.31.12 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-version: 1.18.9 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.59.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudformation dependency-version: 1.66.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-version: 1.51.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/ec2 dependency-version: 1.254.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/eks dependency-version: 1.74.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-version: 1.47.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: aws-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yash Thakkar <[email protected]>
Co-authored-by: jaydeokar <[email protected]>
* chore: add configurable retry logic for netlink dump operations - Wrap netlink.ErrDumpInterrupted errors with retry logic in netlinkwrapper - Implement retry mechanism for LinkList, RouteList, AddrList, and RuleList operations - Add AWS_VPC_K8S_CNI_NETLINK_MAX_RETRIES environment variable (default: 5) - Update test files to use netlinkwrapper instead of direct netlink calls * use netlinkwrapper, missed in previous commit * More fixes * Use standard Go logging to avoid triggering controller-runtime's logger before it is initialized * Use Go's standard library error wrapping * Better error messages * use logger * fix * more precise language * sort imports * Improve retryOnErrDumpInterrupted() * Fix format specifier and simplify logging * Fix messages * Make maxAttempts constant and = 5 * Add small delay after first failed attempt to avoid overwhelming the kernel * Add unit tests * Rename variable for clarity
Co-authored-by: jaydeokar <[email protected]> Co-authored-by: Yash Thakkar <[email protected]>
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.3 to 4.8.1. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@72eb03d...40c09b7) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-version: 4.8.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jay Deokar <[email protected]>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.5.0 to 6.0.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@d35c59a...4469467) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Gracefully handle v4 (unmanaged) ENIs on IPv6 node * fix panic * nit * fix unit tests * remove dead code * bumping go version to 1.24.9 to fix CVEs * update go check-latest flag * clean up * correcting error handling
Co-authored-by: jaydeokar <[email protected]>
* Separate ENI Tags from Subnet Tags * Create new section for subnet tag(s) in README * nit: README update --------- Co-authored-by: Christian DiRubbio <[email protected]>
jaydeokar
approved these changes
Nov 17, 2025
This was referenced Nov 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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?
Which issue does this PR fix?:
What does this PR do / Why do we need it?:
Testing done on this change:
Will this PR introduce any new dependencies?:
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
Does this change require updates to the CNI daemonset config files to work?:
Does this PR introduce any user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.