Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve merge conflicts for release 1.18.4 release #3043

Merged
merged 84 commits into from
Sep 26, 2024
Merged

Resolve merge conflicts for release 1.18.4 release #3043

merged 84 commits into from
Sep 26, 2024

Conversation

jaydeokar
Copy link
Contributor

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:

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.

kwohlfahrt and others added 30 commits April 2, 2024 17:40
@kwohlfahrt @orsenthil
Mount /run/xtables.lock as FileOrCreate (aws#2841)
ca74a14 
Otherwise, if the file doesn't already exist on the host at startup, it will be created as a directory. This breaks (among other things) `kube-proxy`, which leads to the AWS CNI not being able to reach the API-server, which leads to the node being stuck in `NotReady` state.

Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (aws#2864)
d40f4a1 
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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: Senthil Kumaran <[email protected]>
@dependabot
Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (aws#2863)
e111bea 
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>
@dependabot
Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (aws#2866)
bccdbf7 
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.52.2.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.52.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  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>
@dependabot @orsenthil
Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (aws#2862)
2694202 
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.2 to 3.14.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.14.2...v3.14.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (aws#2859)
e5f6998 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
- [Commits](golang/sys@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (aws#…
389f5eb 
…2860)

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>
@sushrk
remove unused Dockerfile (aws#2869)
883c3b2 
* remove unused Dockerfile

* update golang and dependencies to fix CVE
@jchen6585
Update Kops test for 1.30 (aws#2868)
fbad965 
Co-authored-by: Joseph Chen <[email protected]>
@orsenthil
Update .go-version to 1.22.2 to fix CVE reports. (aws#2870)
244f636
@jchen6585
CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 rele…
deaca4b 
…ase (aws#2876)

Co-authored-by: Joseph Chen <[email protected]>
@jchen6585
Update changelogs and charts for v1.18.0 release (aws#2858) (aws#2881)
cd7eb59 
Co-authored-by: Joseph Chen <[email protected]>
@guessi @orsenthil
Improve "cni-metrics-helper" setup experience (aws#2874)
19d59c1 
Co-authored-by: Senthil Kumaran <[email protected]>
@orsenthil
Add correct labels to CNI metrics chart. (aws#2889)
1a76401
@orsenthil
Added information on the build troubleshooting. (aws#2890)
126a0ba
@orsenthil
Remove unused code in vpc cni init and vpc cni binary. (aws#2891)
73c45d8
@dependabot
Bump golang.org/x/sys from 0.18.0 to 0.19.0 in /test/agent (aws#2898)
92977ef 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.18.0 to 0.19.0.
- [Commits](golang/sys@v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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>
@orsenthil
Filter Managed ENI. (aws#2895)
06828ce 
If the SG reconcile loop runs before the ENI/IP reconcile loop it will modify the security groups as the ENI/IP reconcile hasn't had a chance to check the tags on the ENI yet.

Without relying on cache, when the SG reconcile is run, it will not update the ENI with the node.k8s.amazonaws.com/no_manage: true tag
@jchen6585 @jaydeokar
@kwohlfahrt @orsenthil @dependabot @sushrk
Merge release-1.18 to master after v1.18.1 release (aws#2914)
9ed4e3e 
* Update changelogs and charts for v1.18.0 release (aws#2858)

Co-authored-by: Joseph Chen <[email protected]>

* Resolve merge conflicts from master to release 1.18 (aws#2885)

* Mount /run/xtables.lock as FileOrCreate (aws#2841)

Otherwise, if the file doesn't already exist on the host at startup, it will be created as a directory. This breaks (among other things) `kube-proxy`, which leads to the AWS CNI not being able to reach the API-server, which leads to the node being stuck in `NotReady` state.

Co-authored-by: Senthil Kumaran <[email protected]>

* Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (aws#2864)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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: Senthil Kumaran <[email protected]>

* Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (aws#2863)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>

* Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (aws#2866)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.52.2.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.52.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  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>

* Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (aws#2862)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.2 to 3.14.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.14.2...v3.14.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (aws#2859)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
- [Commits](golang/sys@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>

* Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (aws#2860)

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* remove unused Dockerfile (aws#2869)

* remove unused Dockerfile

* update golang and dependencies to fix CVE

* Update Kops test for 1.30 (aws#2868)

Co-authored-by: Joseph Chen <[email protected]>

* Update .go-version to 1.22.2 to fix CVE reports. (aws#2870)

* CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release (aws#2876)

Co-authored-by: Joseph Chen <[email protected]>

* Update changelogs and charts for v1.18.0 release (aws#2858) (aws#2881)

Co-authored-by: Joseph Chen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>

* Merge master to release-1.18 for v1.18.1 release (aws#2882)

* Mount /run/xtables.lock as FileOrCreate (aws#2841)

Otherwise, if the file doesn't already exist on the host at startup, it will be created as a directory. This breaks (among other things) `kube-proxy`, which leads to the AWS CNI not being able to reach the API-server, which leads to the node being stuck in `NotReady` state.

Co-authored-by: Senthil Kumaran <[email protected]>

* Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (aws#2864)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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: Senthil Kumaran <[email protected]>

* Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (aws#2863)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>

* Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (aws#2866)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.52.2.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.52.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  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>

* Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (aws#2862)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.2 to 3.14.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.14.2...v3.14.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (aws#2859)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
- [Commits](golang/sys@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>

* Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (aws#2860)

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* remove unused Dockerfile (aws#2869)

* remove unused Dockerfile

* update golang and dependencies to fix CVE

* Update Kops test for 1.30 (aws#2868)

Co-authored-by: Joseph Chen <[email protected]>

* Update .go-version to 1.22.2 to fix CVE reports. (aws#2870)

* CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release (aws#2876)

Co-authored-by: Joseph Chen <[email protected]>

* Update changelogs and charts for v1.18.0 release (aws#2858) (aws#2881)

Co-authored-by: Joseph Chen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>

* CHANGELOG, chart, and manifest updates for v1.18.1 release (aws#2894)

Co-authored-by: Joseph Chen <[email protected]>

* Fix metrics readme

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>
Co-authored-by: Jay Deokar <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
@orsenthil
Update .go-version to fix GO-2024-2824 (aws#2911)
239ad1d
@orsenthil
Soak Test for CNI. (aws#2915)
05e7766 
* Soak Test for CNI.

Soak Test runs a fundamental test, like connectivity across pods
launched in both primary and secondary eni interfaces.

It launches pods, tests connectivity, tears them down, and repeats this
process for 1 hour. The run time configurable with how long we want to
run the soak test.

This test helps in discoverying race condition issues, compatiblity
issues with underlying AMI.

* Fix for make check.
@dependabot
Bump github.com/aws/amazon-vpc-resource-controller-k8s (aws#2910)
3daa258 
Bumps [github.com/aws/amazon-vpc-resource-controller-k8s](https://github.com/aws/amazon-vpc-resource-controller-k8s) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/aws/amazon-vpc-resource-controller-k8s/releases)
- [Commits](aws/amazon-vpc-resource-controller-k8s@v1.4.1...v1.5.0)

---
updated-dependencies:
- dependency-name: github.com/aws/amazon-vpc-resource-controller-k8s
  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>
@orsenthil
Update ENI Limits. (aws#2920)
4c1b162
@orsenthil
Skip Soak Test while running other tests. (aws#2922)
7eb07e9
@orsenthil
Update golang to go1.22.3 (aws#2924)
5d0e6e2
@dependabot
Bump k8s.io/api from 0.29.3 to 0.30.1 (aws#2918)
5fb5020 
Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.29.3 to 0.30.1.
- [Commits](kubernetes/api@v0.29.3...v0.30.1)

---
updated-dependencies:
- dependency-name: k8s.io/api
  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>
@liptanbiswas @orsenthil
Switch to counter for awscni_no_available_ip_addresses (aws#2919)
d0590be 
Co-authored-by: Liptan Biswas <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
@orsenthil
Expose network policy log file location to be configured using helm (a…
a477f12 
…ws#2925)

* Expose network policy log file location to be configured using helm
chart values.

* Updated log file location name.
@orsenthil @jchen6585
@jaydeokar @kwohlfahrt @dependabot @sushrk
Merge release branch release_1.18 (aws#2929)
1b9fe03 
* Update changelogs and charts for v1.18.0 release (aws#2858)

Co-authored-by: Joseph Chen <[email protected]>

* Resolve merge conflicts from master to release 1.18 (aws#2885)

* Mount /run/xtables.lock as FileOrCreate (aws#2841)

Otherwise, if the file doesn't already exist on the host at startup, it will be created as a directory. This breaks (among other things) `kube-proxy`, which leads to the AWS CNI not being able to reach the API-server, which leads to the node being stuck in `NotReady` state.

Co-authored-by: Senthil Kumaran <[email protected]>

* Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (aws#2864)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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: Senthil Kumaran <[email protected]>

* Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (aws#2863)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>

* Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (aws#2866)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.52.2.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.52.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  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>

* Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (aws#2862)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.2 to 3.14.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.14.2...v3.14.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (aws#2859)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
- [Commits](golang/sys@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>

* Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (aws#2860)

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* remove unused Dockerfile (aws#2869)

* remove unused Dockerfile

* update golang and dependencies to fix CVE

* Update Kops test for 1.30 (aws#2868)

Co-authored-by: Joseph Chen <[email protected]>

* Update .go-version to 1.22.2 to fix CVE reports. (aws#2870)

* CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release (aws#2876)

Co-authored-by: Joseph Chen <[email protected]>

* Update changelogs and charts for v1.18.0 release (aws#2858) (aws#2881)

Co-authored-by: Joseph Chen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>

* Merge master to release-1.18 for v1.18.1 release (aws#2882)

* Mount /run/xtables.lock as FileOrCreate (aws#2841)

Otherwise, if the file doesn't already exist on the host at startup, it will be created as a directory. This breaks (among other things) `kube-proxy`, which leads to the AWS CNI not being able to reach the API-server, which leads to the node being stuck in `NotReady` state.

Co-authored-by: Senthil Kumaran <[email protected]>

* Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (aws#2864)

Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.14.0 to 2.17.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.14.0...v2.17.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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: Senthil Kumaran <[email protected]>

* Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (aws#2863)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.4...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>

* Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (aws#2866)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.48.0 to 0.52.2.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.48.0...v0.52.2)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  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>

* Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (aws#2862)

Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.2 to 3.14.3.
- [Release notes](https://github.com/helm/helm/releases)
- [Commits](helm/helm@v3.14.2...v3.14.3)

---
updated-dependencies:
- dependency-name: helm.sh/helm/v3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (aws#2859)

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.17.0 to 0.18.0.
- [Commits](golang/sys@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>

* Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (aws#2860)

Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/containernetworking/plugins/releases)
- [Commits](containernetworking/plugins@v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/plugins
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>

* remove unused Dockerfile (aws#2869)

* remove unused Dockerfile

* update golang and dependencies to fix CVE

* Update Kops test for 1.30 (aws#2868)

Co-authored-by: Joseph Chen <[email protected]>

* Update .go-version to 1.22.2 to fix CVE reports. (aws#2870)

* CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 release (aws#2876)

Co-authored-by: Joseph Chen <[email protected]>

* Update changelogs and charts for v1.18.0 release (aws#2858) (aws#2881)

Co-authored-by: Joseph Chen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: Senthil Kumaran <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>

* CHANGELOG, chart, and manifest updates for v1.18.1 release (aws#2894)

Co-authored-by: Joseph Chen <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>
Co-authored-by: Joseph Chen <[email protected]>
Co-authored-by: Jay Deokar <[email protected]>
Co-authored-by: Kai Wohlfahrt <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sushmitha Ravikumar <[email protected]>
@orsenthil
Helpful Make target to login to public ECR. (aws#2934)
c8a2944
orsenthil and others added 25 commits July 17, 2024 16:55
@orsenthil
Revert "disable leaked eni cleanup routine when vpc-resource-controll…
e8faf2f 
…er is deployed (aws#2854)" (aws#2987)

* Revert "disable leaked eni cleanup routine when vpc-resource-controller is deployed (aws#2854)"

This reverts commit 9fdcb5f.

* Fix go.mod dependencies.
@yash97
updating iam doc with subnet policy (aws#2992)
2884e90 
* updating iam doc

* adding describe subnet to scoped down policy
@dependabot
Bump github.com/docker/docker (aws#2996)
6fc1be6 
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.5+incompatible to 26.1.4+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v25.0.5...v26.1.4)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump golang.org/x/sys from 0.21.0 to 0.22.0 in /test/agent (aws#3005)
7b9c37b 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.21.0 to 0.22.0.
- [Commits](golang/sys@v0.21.0...v0.22.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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>
@dependabot @orsenthil
Bump github.com/onsi/gomega from 1.33.1 to 1.34.1 (aws#3002)
dbea58a 
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.33.1 to 1.34.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.33.1...v1.34.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  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: Senthil Kumaran <[email protected]>
@orsenthil
Document the Multi Card Support Limitation. (aws#3006)
73adb4c 
* Document the Multi Card Support Limitation.

* Update the information on multi-card instance type.
@dependabot @orsenthil
Bump github.com/aws/aws-sdk-go from 1.54.11 to 1.55.5 (aws#3000)
7236559 
Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.54.11 to 1.55.5.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Commits](aws/aws-sdk-go@v1.54.11...v1.55.5)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go
  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: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump github.com/onsi/ginkgo/v2 from 2.19.0 to 2.19.1 (aws#3001)
abc9cfb 
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.19.0...v2.19.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump k8s.io/client-go from 0.30.2 to 0.30.3 (aws#3003)
01a81d9 
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.30.2 to 0.30.3.
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.2...v0.30.3)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot
Bump github.com/containernetworking/cni from 1.2.0 to 1.2.3 (aws#3004)
1818159 
Bumps [github.com/containernetworking/cni](https://github.com/containernetworking/cni) from 1.2.0 to 1.2.3.
- [Release notes](https://github.com/containernetworking/cni/releases)
- [Commits](containernetworking/cni@v1.2.0...v1.2.3)

---
updated-dependencies:
- dependency-name: github.com/containernetworking/cni
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@zyue110026
fix: init.image.pullPolicy and nodeAgent.image.pullPolicy not being r…
a473163 
…espect (aws#3010)

Signed-off-by: zyue110026 <[email protected]>
@dependabot
Bump github.com/docker/docker (aws#3011)
443f530 
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.1.4+incompatible to 26.1.5+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](moby/moby@v26.1.4...v26.1.5)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@zachdorame
Update kops version and k8s version (aws#3012)
27ce136
@yash97
Bug fix: Ensure exact IP match between IMDS and local datastore. (aws…
5c471fe 
…#3033)

* adding function to compare list

* adding ut for functions

* go fmt
@dependabot @orsenthil
Bump golang.org/x/sys from 0.22.0 to 0.24.0 in /test/agent (aws#3027)
4d1442a 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.22.0 to 0.24.0.
- [Commits](golang/sys@v0.22.0...v0.24.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump github.com/coreos/go-iptables from 0.7.0 to 0.8.0 in /test/agent (…
fe812f5 
…aws#3026)

Bumps [github.com/coreos/go-iptables](https://github.com/coreos/go-iptables) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/coreos/go-iptables/releases)
- [Commits](coreos/go-iptables@v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-iptables
  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: Senthil Kumaran <[email protected]>
@dependabot
Bump github.com/vishvananda/netlink from 1.1.0 to 1.3.0 in /test/agent (
8d6b674 
aws#3025)

Bumps [github.com/vishvananda/netlink](https://github.com/vishvananda/netlink) from 1.1.0 to 1.3.0.
- [Release notes](https://github.com/vishvananda/netlink/releases)
- [Commits](vishvananda/netlink@v1.1.0...v1.3.0)

---
updated-dependencies:
- dependency-name: github.com/vishvananda/netlink
  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>
@dependabot @orsenthil
Bump github.com/prometheus/client_model from 0.6.0 to 0.6.1 (aws#3024)
eaa5db8 
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](prometheus/client_model@v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_model
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot @orsenthil
Bump github.com/coreos/go-iptables from 0.7.0 to 0.8.0 (aws#3020)
49b0742 
Bumps [github.com/coreos/go-iptables](https://github.com/coreos/go-iptables) from 0.7.0 to 0.8.0.
- [Release notes](https://github.com/coreos/go-iptables/releases)
- [Commits](coreos/go-iptables@v0.7.0...v0.8.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-iptables
  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: Senthil Kumaran <[email protected]>
@dependabot
Bump golang.org/x/sys from 0.22.0 to 0.25.0 (aws#3037)
abaf575 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.22.0 to 0.25.0.
- [Commits](golang/sys@v0.22.0...v0.25.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  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>
@Pavani-Panakanti @jayanthvn
Fix fetching enimetadata (aws#3035)
eb7a9bd 
* Fix fetching enimetadata for efa-only enis

* Fix format

* Fix and add tests

* fix format

* Add comments

---------

Co-authored-by: Jayanth Varavani <[email protected]>
@jaydeokar @orsenthil
Changelog, Chart Versions and Config Version update for CNI Release v… (
262e4a7 
aws#3029)

* Changelog, Chart Versions and Config Version update for CNI Release v1.18.3 (aws#2994)

* CNI Release v1.18.3

* Added Changelog categories.

* Update CHANGELOG.md

Fix incomplete sentence.

* test branch without addon

---------

Co-authored-by: Senthil Kumaran <[email protected]>
@dependabot
Bump google.golang.org/protobuf from 1.34.1 to 1.34.2 (aws#3023)
aa9c596 
Bumps google.golang.org/protobuf from 1.34.1 to 1.34.2.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jaydeokar
Revert "Fix fetching enimetadata (aws#3035)" (aws#3042)
3fae323 
This reverts commit eb7a9bd.
@jaydeokar
Merge remote-tracking branch 'upstream/master' into 1_18_4_release
6c7dbcd
@jaydeokar jaydeokar requested a review from a team as a code owner September 26, 2024 19:09
@jaydeokar jaydeokar changed the title 1 18 4 release Resolve merge conflicts for release 1.18.4 release Sep 26, 2024
orsenthil
orsenthil reviewed Sep 26, 2024
View reviewed changes
scripts/run-cni-release-tests.sh
echo "ipamd test took $((SECONDS - START)) seconds."

echo "Running cni integration tests"
START=$SECONDS
cd $INTEGRATION_TEST_DIR/cni && CGO_ENABLED=0 ginkgo $EXTRA_GINKGO_FLAGS --skip-file=soak_test.go -v -timeout 60m --no-color --fail-on-pending -- --cluster-kubeconfig="$KUBE_CONFIG_PATH" --cluster-name="$CLUSTER_NAME" --aws-region="$REGION" --aws-vpc-id="$VPC_ID" --ng-name-label-key="$NG_LABEL_KEY" --ng-name-label-val="$NG_LABEL_VAL" --test-image-registry=$TEST_IMAGE_REGISTRY || TEST_RESULT=fail
cd $INTEGRATION_TEST_DIR/cni && CGO_ENABLED=0 ginkgo $EXTRA_GINKGO_FLAGS --skip-file=soak_test.go -v -timeout 60m --no-color --fail-on-pending $GINKGO_TEST_BUILD/cni.test -- --cluster-kubeconfig="$KUBE_CONFIG_PATH" --cluster-name="$CLUSTER_NAME" --aws-region="$REGION" --aws-vpc-id="$VPC_ID" --ng-name-label-key="$NG_LABEL_KEY" --ng-name-label-val="$NG_LABEL_VAL" --test-image-registry=$TEST_IMAGE_REGISTRY || TEST_RESULT=fail
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which PR is bringing in these changes?

@orsenthil orsenthil merged commit 447afe9 into aws:release-1.18 Sep 26, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orsenthil orsenthil orsenthil approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.