Skip to content

Commit 2acfc66

Browse files
jaydeokarSenthil KumaranPavani-Panakantiyash97gavinbunney
authored
Merge from release-1.19 to master (#3289)
* Update to Changelog, config and scripts. (#3095) (#3107) (#3108) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Updating Manifest, Changelog and scripts (#3115) * Update to Changelog, config and scripts. (#3095) (#3107) (#3118) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update to Changelog, config and scripts. (#3095) (#3107) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update NP strict mode doc (#3125) * adding email to send log bundle (#3134) * Fix issues handling unmanaged ENIs with IPv6 only (#3122) * Bump go.uber.org/zap from 1.26.0 to 1.27.0 Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](uber-go/zap@v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.35.1...v1.36.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/prometheus/common from 0.60.0 to 0.60.1 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.0...v0.60.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/onsi/ginkgo/v2 from 2.20.1 to 2.22.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.20.1 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.20.1...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.26.0 to 0.27.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.26.0 to 0.27.0. - [Commits](golang/sys@v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.27.0 to 0.28.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.27.0 to 0.28.0. - [Commits](golang/sys@v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix KOps Integration Test (#3140) * scripts lib integration: add more logging steps * scripts lib cluster: increase kops control plane node size * run make generate-limits to update the max pods file (#3141) * Fix the CHANGELOG.md duplication. * Revert "utils prometheusmetrics: convert gauges to counters (#3093)" This reverts commit d57c443. * Update crypto module dependency to handle CVE report. * Update CNI and NP Agent Version and Changelog. * Revert "Fix issues handling unmanaged ENIs with IPv6 only (#3122)" This reverts commit 7b46f6b. * Update Changelog to reflect on revert of #3122 * Update Changelog and Version for CNI 1.19.2 * Merge Changes from master to release-1.19 (#3207) * Update to Changelog, config and scripts. (#3095) (#3107) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update NP strict mode doc (#3125) * adding email to send log bundle (#3134) * Fix issues handling unmanaged ENIs with IPv6 only (#3122) * Bump go.uber.org/zap from 1.26.0 to 1.27.0 Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](uber-go/zap@v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.35.1...v1.36.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/prometheus/common from 0.60.0 to 0.60.1 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.0...v0.60.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog from release-1.19 branch to master branch. (#3136) * Update to Changelog, config and scripts. (#3095) (#3107) (#3108) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Updating Manifest, Changelog and scripts (#3115) * Update to Changelog, config and scripts. (#3095) (#3107) (#3118) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * fixed the changelog. --------- Co-authored-by: Jay Deokar <23660509+jaydeokar@users.noreply.github.com> * Bump github.com/onsi/ginkgo/v2 from 2.20.1 to 2.22.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.20.1 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.20.1...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.26.0 to 0.27.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.26.0 to 0.27.0. - [Commits](golang/sys@v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.27.0 to 0.28.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.27.0 to 0.28.0. - [Commits](golang/sys@v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix KOps Integration Test (#3140) * scripts lib integration: add more logging steps * scripts lib cluster: increase kops control plane node size * run make generate-limits to update the max pods file (#3141) * Update AWS VPC CNI to SDK V2 Update - master branch (#3070) * Update AWS SDK to Version 2 and Remove V1 Dependency. Fixes #3116 * Handle EKS Service for the Beta Endpoint. (#3143) * Adding multus v4.1.4 manifest (#3154) * scripts integration: capture exit codes from both tests (#3149) * fix(test): add volume mount for docker-func-test target (#3160) Signed-off-by: Omer Aplatony <omerap12@gmail.com> * cni-metrics-helper metrics: do type assertion before type casting (#3152) * cni-metrics-helper metrics: do type assertion before type casting * utils prometheusmetrics: remove counters from cni metrics mapping func * Bump helm.sh/helm/v3 from 3.15.2 to 3.16.4 Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.15.2 to 3.16.4. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.15.2...v3.16.4) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.50.0 to 1.51.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.50.0...service/s3/v1.51.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/iam from 1.38.1 to 1.38.3 Bumps [github.com/aws/aws-sdk-go-v2/service/iam](https://github.com/aws/aws-sdk-go-v2) from 1.38.1 to 1.38.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.38.1...service/s3/v1.38.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update Changelog and Version for CNI 1.19.2 (#3171) * Bump github.com/aws/aws-sdk-go-v2/feature/ec2/imds (#3166) Bumps [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) from 1.16.19 to 1.16.22. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/ram/v1.16.19...service/ram/v1.16.22) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add CNINode to cache filter (#3164) We should reduce the number of CNINode object VPC CNI watches for to just the node it is managing as well. Signed-off-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Hao Zhou <zhuhz@amazon.com> Co-authored-by: Harish Kuna <hakuna@amazon.com> * fix: remove null creationTimestamp from CRD metadata (#3163) Signed-off-by: Omer Aplatony <omerap12@gmail.com> Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Fix issue with primary ENI ip lookup when an ENI has both IPv4 and IPv6 address. (#3156) * Use awshttp client instead of smithy httpclient. (#3193) * Use awshttp client. * Update .go-version. * retryOnConflict shouldnt' retry on NotFound (#3192) Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update awsutils.go (#3191) Updated typo for AssignPrivateIpv6Addresses to AssignIpv6Addresses Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.43.0 to 1.43.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@service/s3/v1.43.0...service/cloudwatch/v1.43.12) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.51.2 to 1.51.10. - [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.2...service/autoscaling/v1.51.10) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/prometheus/common from 0.60.1 to 0.62.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.1 to 0.62.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.1...v0.62.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.28.0 to 0.29.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.28.0 to 0.29.0. - [Commits](golang/sys@v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.29.0 to 0.30.0 in /test/agent (#3198) * Bump github.com/aws/aws-sdk-go-v2/service/cloudwatch (#3199) * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.51.10 to 1.51.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@service/fsx/v1.51.10...service/autoscaling/v1.51.12) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/samber/lo from 1.39.0 to 1.49.1 (#3184) * Bump github.com/aws/aws-sdk-go-v2/service/eks from 1.52.1 to 1.58.0 (#3200) * Add grpc call to fetch networkpolicymode from NP (#3202) * add rpc call to fetch np mode * go generate * nit: change print %t to %v * Bug Fix: "utils prometheusmetrics: convert gauges to counters (#3093)"" This reverts commit e9af9f3 which removed it in CNI 1.19.2 with fix in master. * Fix issues handling unmanaged ENIs with IPv6 only (#3122) This reverts commit 0a200d6 which reverted only in CNI 1.19.2 with fix in master. * Changes to attach probes at pod start * minor error change * do not ret error on grpc dial * add dial with context * update mocked grpc wrapper and unit tests add new lines to satisfy format check update unit tests for DialContext --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Omer Aplatony <omerap12@gmail.com> Signed-off-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Jay Deokar <23660509+jaydeokar@users.noreply.github.com> Co-authored-by: pavanipt <pavanip2201@gmail.com> Co-authored-by: Yash Thakkar <ythakkar97@gmail.com> Co-authored-by: Gavin Bunney <409207+gavinbunney@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shehbaj Dhillon <dshehbaj@amazon.com> Co-authored-by: Todd Neal <tnealt@amazon.com> Co-authored-by: Omer Aplatony <omerap12@gmail.com> Co-authored-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Hao Zhou <zhuhz@amazon.com> Co-authored-by: Harish Kuna <hakuna@amazon.com> Co-authored-by: Hao Zhou <haouc@users.noreply.github.com> Co-authored-by: Parikshit Patel <parixitpatel@gmail.com> Co-authored-by: Pavani Panakanti <pavanipt@amazon.com> * Merged master into release-1.19 with master versions for all conflicts (#3256) * Update to Changelog, config and scripts. (#3095) (#3107) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update NP strict mode doc (#3125) * adding email to send log bundle (#3134) * Fix issues handling unmanaged ENIs with IPv6 only (#3122) * Bump go.uber.org/zap from 1.26.0 to 1.27.0 Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.26.0 to 1.27.0. - [Release notes](https://github.com/uber-go/zap/releases) - [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md) - [Commits](uber-go/zap@v1.26.0...v1.27.0) --- updated-dependencies: - dependency-name: go.uber.org/zap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.35.1...v1.36.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/prometheus/common from 0.60.0 to 0.60.1 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.0...v0.60.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update changelog from release-1.19 branch to master branch. (#3136) * Update to Changelog, config and scripts. (#3095) (#3107) (#3108) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Updating Manifest, Changelog and scripts (#3115) * Update to Changelog, config and scripts. (#3095) (#3107) (#3118) * Update to Changelog, config and scripts. * Add Version in Changelog. Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * fixed the changelog. --------- Co-authored-by: Jay Deokar <23660509+jaydeokar@users.noreply.github.com> * Bump github.com/onsi/ginkgo/v2 from 2.20.1 to 2.22.0 Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.20.1 to 2.22.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.20.1...v2.22.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.26.0 to 0.27.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.26.0 to 0.27.0. - [Commits](golang/sys@v0.26.0...v0.27.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.27.0 to 0.28.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.27.0 to 0.28.0. - [Commits](golang/sys@v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix KOps Integration Test (#3140) * scripts lib integration: add more logging steps * scripts lib cluster: increase kops control plane node size * run make generate-limits to update the max pods file (#3141) * Update AWS VPC CNI to SDK V2 Update - master branch (#3070) * Update AWS SDK to Version 2 and Remove V1 Dependency. Fixes #3116 * Handle EKS Service for the Beta Endpoint. (#3143) * Adding multus v4.1.4 manifest (#3154) * scripts integration: capture exit codes from both tests (#3149) * fix(test): add volume mount for docker-func-test target (#3160) Signed-off-by: Omer Aplatony <omerap12@gmail.com> * cni-metrics-helper metrics: do type assertion before type casting (#3152) * cni-metrics-helper metrics: do type assertion before type casting * utils prometheusmetrics: remove counters from cni metrics mapping func * Bump helm.sh/helm/v3 from 3.15.2 to 3.16.4 Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.15.2 to 3.16.4. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.15.2...v3.16.4) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.50.0 to 1.51.2. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.50.0...service/s3/v1.51.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/iam from 1.38.1 to 1.38.3 Bumps [github.com/aws/aws-sdk-go-v2/service/iam](https://github.com/aws/aws-sdk-go-v2) from 1.38.1 to 1.38.3. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/s3/v1.38.1...service/s3/v1.38.3) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/iam dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update Changelog and Version for CNI 1.19.2 (#3171) * Bump github.com/aws/aws-sdk-go-v2/feature/ec2/imds (#3166) Bumps [github.com/aws/aws-sdk-go-v2/feature/ec2/imds](https://github.com/aws/aws-sdk-go-v2) from 1.16.19 to 1.16.22. - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@service/ram/v1.16.19...service/ram/v1.16.22) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/feature/ec2/imds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Add CNINode to cache filter (#3164) We should reduce the number of CNINode object VPC CNI watches for to just the node it is managing as well. Signed-off-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Hao Zhou <zhuhz@amazon.com> Co-authored-by: Harish Kuna <hakuna@amazon.com> * fix: remove null creationTimestamp from CRD metadata (#3163) Signed-off-by: Omer Aplatony <omerap12@gmail.com> Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Fix issue with primary ENI ip lookup when an ENI has both IPv4 and IPv6 address. (#3156) * Use awshttp client instead of smithy httpclient. (#3193) * Use awshttp client. * Update .go-version. * retryOnConflict shouldnt' retry on NotFound (#3192) Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Update awsutils.go (#3191) Updated typo for AssignPrivateIpv6Addresses to AssignIpv6Addresses Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Bump github.com/aws/aws-sdk-go-v2/service/cloudwatch Bumps [github.com/aws/aws-sdk-go-v2/service/cloudwatch](https://github.com/aws/aws-sdk-go-v2) from 1.43.0 to 1.43.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@service/s3/v1.43.0...service/cloudwatch/v1.43.12) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/cloudwatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.51.2 to 1.51.10. - [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.2...service/autoscaling/v1.51.10) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/prometheus/common from 0.60.1 to 0.62.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.1 to 0.62.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.60.1...v0.62.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.28.0 to 0.29.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.28.0 to 0.29.0. - [Commits](golang/sys@v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.29.0 to 0.30.0 in /test/agent (#3198) * Bump github.com/aws/aws-sdk-go-v2/service/cloudwatch (#3199) * Bump github.com/aws/aws-sdk-go-v2/service/autoscaling Bumps [github.com/aws/aws-sdk-go-v2/service/autoscaling](https://github.com/aws/aws-sdk-go-v2) from 1.51.10 to 1.51.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@service/fsx/v1.51.10...service/autoscaling/v1.51.12) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/service/autoscaling dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump github.com/samber/lo from 1.39.0 to 1.49.1 (#3184) * Bump github.com/aws/aws-sdk-go-v2/service/eks from 1.52.1 to 1.58.0 (#3200) * Add grpc call to fetch networkpolicymode from NP (#3202) * add rpc call to fetch np mode * go generate * nit: change print %t to %v * Changes to attach probes at pod start * minor error change * do not ret error on grpc dial * add dial with context * update mocked grpc wrapper and unit tests add new lines to satisfy format check update unit tests for DialContext * improvement: add podmonitor for vpc metric collection (#3061) * add podmonitor for vpc metric collections Signed-off-by: adam_buran <adam.buran@airbnb.com> * expose nodeagent metrics port Signed-off-by: adam_buran <adam.buran@airbnb.com> * expose nodeagent metrics port in values.yaml Signed-off-by: adam_buran <adam.buran@airbnb.com> * update to add agent metrics to podmonitor Signed-off-by: adam_buran <adam.buran@airbnb.com> --------- Signed-off-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * Fix print the error message in string instead of bytes. (#3208) * Fix the error message format. * Address review comment. * update np standard mode doc (#3211) Co-authored-by: Senthil Kumaran <senthilx@amazon.com> * config multus: add v4.1.4-eksbuild.3 (#3217) * update helm chart to ensure that created eniconfig name is always a string (#3227) * Bump github.com/containerd/containerd from 1.7.23 to 1.7.27 Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.23 to 1.7.27. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md) - [Commits](containerd/containerd@v1.7.23...v1.7.27) --- updated-dependencies: - dependency-name: github.com/containerd/containerd dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * adding eni owner tag if cluster name is present (#3228) * only cache CNINode when SGP is in use (#3242) * Remove dependency on apiserver for IPAMD startup (#3243) * remove apiserver dependency for ipamd startup * fix format issue in UT * wait apiserver connectivty for pod annotate feature * return maxPods value directly when parsing the local file * Bump github.com/onsi/gomega from 1.36.0 to 1.36.2 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.36.0 to 1.36.2. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.36.0...v1.36.2) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Bump golang.org/x/sys from 0.30.0 to 0.31.0 in /test/agent Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.30.0 to 0.31.0. - [Commits](golang/sys@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Skip configuring NP related if network_policy_enforcing_mode is not set (#3254) * Skip configuring network policies if network_policy_enforcing_mode is not set * make format and update chart * fix vuln checks * fix metrics agent and readme * remove unneeded metricsBindPort from charts (#3257) * bump up go version (#3259) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Omer Aplatony <omerap12@gmail.com> Signed-off-by: Davanum Srinivas <davanum@gmail.com> Signed-off-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: Jay Deokar <23660509+jaydeokar@users.noreply.github.com> Co-authored-by: Senthil Kumaran <senthilx@amazon.com> Co-authored-by: pavanipt <pavanip2201@gmail.com> Co-authored-by: Yash Thakkar <ythakkar97@gmail.com> Co-authored-by: Gavin Bunney <409207+gavinbunney@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shehbaj Dhillon <dshehbaj@amazon.com> Co-authored-by: Todd Neal <tnealt@amazon.com> Co-authored-by: Omer Aplatony <omerap12@gmail.com> Co-authored-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Hao Zhou <zhuhz@amazon.com> Co-authored-by: Harish Kuna <hakuna@amazon.com> Co-authored-by: Hao Zhou <haouc@users.noreply.github.com> Co-authored-by: Parikshit Patel <parixitpatel@gmail.com> Co-authored-by: Pavani Panakanti <pavanipt@amazon.com> Co-authored-by: Adam Buran <aburan28@gmail.com> Co-authored-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: Adam <adam@adamcrowder.net> * run make generate-limits (#3260) (#3261) * cut v1.19.4 release (#3262) * cherry-pick: fix node init failure, add sgpp test in script (#3277) (#3278) * fix node init failure, add sgpp test in script (#3277) * remove redundant cninode cache filter * Adding release notes and chart update (#3281) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Omer Aplatony <omerap12@gmail.com> Signed-off-by: Davanum Srinivas <davanum@gmail.com> Signed-off-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: Senthil Kumaran <senthilx@amazon.com> Co-authored-by: pavanipt <pavanip2201@gmail.com> Co-authored-by: Yash Thakkar <ythakkar97@gmail.com> Co-authored-by: Gavin Bunney <409207+gavinbunney@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shehbaj Dhillon <dshehbaj@amazon.com> Co-authored-by: Todd Neal <tnealt@amazon.com> Co-authored-by: Omer Aplatony <omerap12@gmail.com> Co-authored-by: Davanum Srinivas <davanum@gmail.com> Co-authored-by: Hao Zhou <zhuhz@amazon.com> Co-authored-by: Harish Kuna <hakuna@amazon.com> Co-authored-by: Hao Zhou <haouc@users.noreply.github.com> Co-authored-by: Parikshit Patel <parixitpatel@gmail.com> Co-authored-by: Pavani Panakanti <pavanipt@amazon.com> Co-authored-by: Olivia Song <sonyingy@amazon.com> Co-authored-by: Adam Buran <aburan28@gmail.com> Co-authored-by: adam_buran <adam.buran@airbnb.com> Co-authored-by: Adam <adam@adamcrowder.net>
1 parent befa314 commit 2acfc66

18 files changed

Lines changed: 167 additions & 80 deletions

‎CHANGELOG.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
# Changelog
22

3+
## v1.19.5
4+
* Fix - fixed node init failure when using custom networking and SGPP @oliviassss in #3277
5+
6+
## v1.19.4
7+
* Improvement - Update AWS VPC CNI to SDK V2 Update - master branch by @orsenthil in #3070
8+
* Fix - Handle EKS Service for the Beta Endpoint by @orsenthil in #3143
9+
* Manifest - Adding multus v4.1.4 manifest by @jaydeokar in #3154
10+
* Tests - KOps Integration Test Follow Up by @dshehbaj in #3149
11+
* Fix - fix(test): add volume mount for docker-func-test target by @omerap12 in #3160
12+
* Fix - cni-metrics-helper metrics: do type assertion before type casting by @dshehbaj in #3152
13+
* Improvement - Add CNINode to cache filter by @dims in #3164
14+
* Fix - remove null creationTimestamp from CRD metadata by @omerap12 in #3163
15+
* Fix - issue with primary ENI ip lookup when an ENI has both IPv4 and IPv6 Address Assigned by @orsenthil in #3156
16+
* Improvement - Use awshttp client instead of smithy httpclient by @orsenthil in #3193
17+
* Fix - retryOnConflict shouldnt' retry on NotFound by @haouc in #3192
18+
* Improvement - Update awsutils.go by @git4example in #3191
19+
* Improvement - Add grpc call to fetch networkpolicymode from NP by @Pavani-Panakanti in #3202
20+
* Improvement - Changes to attach probes at pod start by @haouc in #3206
21+
* Improvement - adding eni owner tag if cluster name is present by @yash97 #3228
22+
* Improvement - only cache CNINode when SGP is in use by @oliviassss #3242
23+
* Improvement - Remove dependency on apiserver for IPAMD startup by @oliviassss #3243
24+
* Fix - Skip configuring NP related if network_policy_enforcing_mode is not set by @Pavani-Panakanti #3254
25+
* Doc and charts update
26+
27+
## v1.19.3
28+
29+
* Improvement - Changes to attach probes at pod start by @pavanipt and @haouc in https://github.com/aws/amazon-vpc-cni-k8s/pull/3206
30+
* Improvement - Add grpc call to fetch networkpolicymode from NP by @pavanipt in https://github.com/aws/amazon-vpc-cni-k8s/pull/3202
31+
* Update NP agent to v1.2.0 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3209
32+
33+
334
## v1.19.2
435

536
* Feature: run make generate-limits to update the max pods file by @tzneal in https://github.com/aws/amazon-vpc-cni-k8s/pull/3141

‎charts/aws-vpc-cni/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: aws-vpc-cni
3-
version: 1.19.2
4-
appVersion: "v1.19.2"
3+
version: 1.19.5
4+
appVersion: "v1.19.5"
55
description: A Helm chart for the AWS VPC CNI
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

‎charts/aws-vpc-cni/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ The following table lists the configurable parameters for this chart and their d
4848
| `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation | `3` |
4949
| `branchENICooldown` | Number of seconds that branch ENIs remain in cooldown | `60` |
5050
| `fullnameOverride` | Override the fullname of the chart | `aws-node` |
51-
| `image.tag` | Image tag | `v1.19.2` |
51+
| `image.tag` | Image tag | `v1.19.5` |
5252
| `image.domain` | ECR repository domain | `amazonaws.com` |
5353
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
5454
| `image.endpoint` | ECR repository endpoint to use. | `ecr` |
5555
| `image.account` | ECR repository account number | `602401143452` |
5656
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
5757
| `image.override` | A custom docker image to use | `nil` |
5858
| `imagePullSecrets` | Docker registry pull secret | `[]` |
59-
| `init.image.tag` | Image tag | `v1.19.2` |
59+
| `init.image.tag` | Image tag | `v1.19.5` |
6060
| `init.image.domain` | ECR repository domain | `amazonaws.com` |
6161
| `init.image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6262
| `init.image.endpoint` | ECR repository endpoint to use. | `ecr` |
@@ -69,7 +69,7 @@ The following table lists the configurable parameters for this chart and their d
6969
| `originalMatchLabels` | Use the original daemonset matchLabels | `false` |
7070
| `nameOverride` | Override the name of the chart | `aws-node` |
7171
| `nodeAgent.enabled` | If the Node Agent container should be created | `true` |
72-
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.1.5` |
72+
| `nodeAgent.image.tag` | Image tag for Node Agent | `v1.2.1` |
7373
| `nodeAgent.image.domain`| ECR repository domain | `amazonaws.com` |
7474
| `nodeAgent.image.region`| ECR repository region to use. Should match your cluster | `us-west-2` |
7575
| `nodeAgent.image.endpoint` | ECR repository endpoint to use. | `ecr` |

‎charts/aws-vpc-cni/values.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nameOverride: aws-node
88

99
init:
1010
image:
11-
tag: v1.19.2
11+
tag: v1.19.5
1212
domain: amazonaws.com
1313
region: us-west-2
1414
endpoint: ecr
@@ -27,7 +27,7 @@ init:
2727
nodeAgent:
2828
enabled: true
2929
image:
30-
tag: v1.1.5
30+
tag: v1.2.1
3131
domain: amazonaws.com
3232
region: us-west-2
3333
endpoint: ecr
@@ -51,7 +51,7 @@ nodeAgent:
5151
resources: {}
5252

5353
image:
54-
tag: v1.19.2
54+
tag: v1.19.5
5555
domain: amazonaws.com
5656
region: us-west-2
5757
endpoint: ecr
@@ -85,7 +85,7 @@ env:
8585
ENABLE_IPv4: "true"
8686
ENABLE_IPv6: "false"
8787
ENABLE_SUBNET_DISCOVERY: "true"
88-
VPC_CNI_VERSION: "v1.19.2"
88+
VPC_CNI_VERSION: "v1.19.5"
8989
NETWORK_POLICY_ENFORCING_MODE: "standard"
9090

9191
# Add env from configMap or from secrets
@@ -244,4 +244,4 @@ podMonitor:
244244
# The timeout before a metrics scrape fails.
245245
scrapeTimeout: 30s
246246
# relabelings to apply to the podMonitor
247-
relabelings: []
247+
relabelings: []

‎charts/cni-metrics-helper/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: cni-metrics-helper
3-
version: 1.19.2
4-
appVersion: v1.19.2
3+
version: 1.19.5
4+
appVersion: v1.19.5
55
description: A Helm chart for the AWS VPC CNI Metrics Helper
66
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
77
home: https://github.com/aws/amazon-vpc-cni-k8s

‎charts/cni-metrics-helper/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following table lists the configurable parameters for this chart and their d
6060
| -------------------------------|---------------------------------------------------------------|-------------------------------------|
6161
| `affinity` | Map of node/pod affinities | `{}` |
6262
| `fullnameOverride` | Override the fullname of the chart | `cni-metrics-helper` |
63-
| `image.tag` | Image tag | `v1.19.2` |
63+
| `image.tag` | Image tag | `v1.19.5` |
6464
| `image.domain` | ECR repository domain | `amazonaws.com` |
6565
| `image.region` | ECR repository region to use. Should match your cluster | `us-west-2` |
6666
| `image.account` | ECR repository account number | `602401143452` |

‎charts/cni-metrics-helper/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ nameOverride: cni-metrics-helper
44

55
image:
66
region: us-west-2
7-
tag: v1.19.2
7+
tag: v1.19.5
88
account: "602401143452"
99
domain: "amazonaws.com"
1010
# Set to use custom image

‎config/master/aws-k8s-cni-cn.yaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ kind: CustomResourceDefinition
6060
metadata:
6161
annotations:
6262
controller-gen.kubebuilder.io/version: v0.11.3
63-
creationTimestamp: null
6463
labels:
6564
app.kubernetes.io/name: amazon-network-policy-controller-k8s
6665
name: policyendpoints.networking.k8s.aws
@@ -289,6 +288,7 @@ spec:
289288
storage: true
290289
subresources:
291290
status: {}
291+
292292
---
293293
# Source: aws-vpc-cni/templates/serviceaccount.yaml
294294
apiVersion: v1
@@ -300,7 +300,7 @@ metadata:
300300
app.kubernetes.io/name: aws-node
301301
app.kubernetes.io/instance: aws-vpc-cni
302302
k8s-app: aws-node
303-
app.kubernetes.io/version: "v1.19.2"
303+
app.kubernetes.io/version: "v1.19.5"
304304
---
305305
# Source: aws-vpc-cni/templates/configmap.yaml
306306
apiVersion: v1
@@ -312,7 +312,7 @@ metadata:
312312
app.kubernetes.io/name: aws-node
313313
app.kubernetes.io/instance: aws-vpc-cni
314314
k8s-app: aws-node
315-
app.kubernetes.io/version: "v1.19.2"
315+
app.kubernetes.io/version: "v1.19.5"
316316
data:
317317
enable-windows-ipam: "false"
318318
enable-network-policy-controller: "false"
@@ -331,7 +331,7 @@ metadata:
331331
app.kubernetes.io/name: aws-node
332332
app.kubernetes.io/instance: aws-vpc-cni
333333
k8s-app: aws-node
334-
app.kubernetes.io/version: "v1.19.2"
334+
app.kubernetes.io/version: "v1.19.5"
335335
rules:
336336
- apiGroups:
337337
- crd.k8s.amazonaws.com
@@ -377,7 +377,7 @@ metadata:
377377
app.kubernetes.io/name: aws-node
378378
app.kubernetes.io/instance: aws-vpc-cni
379379
k8s-app: aws-node
380-
app.kubernetes.io/version: "v1.19.2"
380+
app.kubernetes.io/version: "v1.19.5"
381381
roleRef:
382382
apiGroup: rbac.authorization.k8s.io
383383
kind: ClusterRole
@@ -397,7 +397,7 @@ metadata:
397397
app.kubernetes.io/name: aws-node
398398
app.kubernetes.io/instance: aws-vpc-cni
399399
k8s-app: aws-node
400-
app.kubernetes.io/version: "v1.19.2"
400+
app.kubernetes.io/version: "v1.19.5"
401401
spec:
402402
updateStrategy:
403403
rollingUpdate:
@@ -418,7 +418,7 @@ spec:
418418
hostNetwork: true
419419
initContainers:
420420
- name: aws-vpc-cni-init
421-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.19.2
421+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.19.5
422422
imagePullPolicy: Always
423423
env:
424424
- name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
440440
{}
441441
containers:
442442
- name: aws-node
443-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.19.2
443+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.19.5
444444
ports:
445445
- containerPort: 61678
446446
name: metrics
@@ -504,7 +504,7 @@ spec:
504504
- name: NETWORK_POLICY_ENFORCING_MODE
505505
value: "standard"
506506
- name: VPC_CNI_VERSION
507-
value: "v1.19.2"
507+
value: "v1.19.5"
508508
- name: WARM_ENI_TARGET
509509
value: "1"
510510
- name: WARM_PREFIX_TARGET
@@ -539,8 +539,11 @@ spec:
539539
- mountPath: /run/xtables.lock
540540
name: xtables-lock
541541
- name: aws-eks-nodeagent
542-
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.1.5
542+
image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon/aws-network-policy-agent:v1.2.1
543543
imagePullPolicy: Always
544+
ports:
545+
- containerPort: 8162
546+
name: agentmetrics
544547
env:
545548
- name: MY_NODE_NAME
546549
valueFrom:

‎config/master/aws-k8s-cni-us-gov-east-1.yaml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ kind: CustomResourceDefinition
6060
metadata:
6161
annotations:
6262
controller-gen.kubebuilder.io/version: v0.11.3
63-
creationTimestamp: null
6463
labels:
6564
app.kubernetes.io/name: amazon-network-policy-controller-k8s
6665
name: policyendpoints.networking.k8s.aws
@@ -289,6 +288,7 @@ spec:
289288
storage: true
290289
subresources:
291290
status: {}
291+
292292
---
293293
# Source: aws-vpc-cni/templates/serviceaccount.yaml
294294
apiVersion: v1
@@ -300,7 +300,7 @@ metadata:
300300
app.kubernetes.io/name: aws-node
301301
app.kubernetes.io/instance: aws-vpc-cni
302302
k8s-app: aws-node
303-
app.kubernetes.io/version: "v1.19.2"
303+
app.kubernetes.io/version: "v1.19.5"
304304
---
305305
# Source: aws-vpc-cni/templates/configmap.yaml
306306
apiVersion: v1
@@ -312,7 +312,7 @@ metadata:
312312
app.kubernetes.io/name: aws-node
313313
app.kubernetes.io/instance: aws-vpc-cni
314314
k8s-app: aws-node
315-
app.kubernetes.io/version: "v1.19.2"
315+
app.kubernetes.io/version: "v1.19.5"
316316
data:
317317
enable-windows-ipam: "false"
318318
enable-network-policy-controller: "false"
@@ -331,7 +331,7 @@ metadata:
331331
app.kubernetes.io/name: aws-node
332332
app.kubernetes.io/instance: aws-vpc-cni
333333
k8s-app: aws-node
334-
app.kubernetes.io/version: "v1.19.2"
334+
app.kubernetes.io/version: "v1.19.5"
335335
rules:
336336
- apiGroups:
337337
- crd.k8s.amazonaws.com
@@ -377,7 +377,7 @@ metadata:
377377
app.kubernetes.io/name: aws-node
378378
app.kubernetes.io/instance: aws-vpc-cni
379379
k8s-app: aws-node
380-
app.kubernetes.io/version: "v1.19.2"
380+
app.kubernetes.io/version: "v1.19.5"
381381
roleRef:
382382
apiGroup: rbac.authorization.k8s.io
383383
kind: ClusterRole
@@ -397,7 +397,7 @@ metadata:
397397
app.kubernetes.io/name: aws-node
398398
app.kubernetes.io/instance: aws-vpc-cni
399399
k8s-app: aws-node
400-
app.kubernetes.io/version: "v1.19.2"
400+
app.kubernetes.io/version: "v1.19.5"
401401
spec:
402402
updateStrategy:
403403
rollingUpdate:
@@ -418,7 +418,7 @@ spec:
418418
hostNetwork: true
419419
initContainers:
420420
- name: aws-vpc-cni-init
421-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.19.2
421+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.19.5
422422
imagePullPolicy: Always
423423
env:
424424
- name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
440440
{}
441441
containers:
442442
- name: aws-node
443-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.19.2
443+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.19.5
444444
ports:
445445
- containerPort: 61678
446446
name: metrics
@@ -504,7 +504,7 @@ spec:
504504
- name: NETWORK_POLICY_ENFORCING_MODE
505505
value: "standard"
506506
- name: VPC_CNI_VERSION
507-
value: "v1.19.2"
507+
value: "v1.19.5"
508508
- name: WARM_ENI_TARGET
509509
value: "1"
510510
- name: WARM_PREFIX_TARGET
@@ -539,8 +539,11 @@ spec:
539539
- mountPath: /run/xtables.lock
540540
name: xtables-lock
541541
- name: aws-eks-nodeagent
542-
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.1.5
542+
image: 151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon/aws-network-policy-agent:v1.2.1
543543
imagePullPolicy: Always
544+
ports:
545+
- containerPort: 8162
546+
name: agentmetrics
544547
env:
545548
- name: MY_NODE_NAME
546549
valueFrom:

0 commit comments

Comments
 (0)