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.

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

Resolve merge conflicts from master to release 1.18 #2885

Merged
merged 13 commits into from
Apr 17, 2024

Commits on Apr 3, 2024

  1. Mount /run/xtables.lock as FileOrCreate (#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]>
    kwohlfahrt and orsenthil authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    ca74a14 View commit details
    Browse the repository at this point in the history
  2. Bump github.com/onsi/ginkgo/v2 from 2.14.0 to 2.17.1 (#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]>
    dependabot[bot] and orsenthil authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    d40f4a1 View commit details
    Browse the repository at this point in the history
  3. Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#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>
    dependabot[bot] authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    e111bea View commit details
    Browse the repository at this point in the history
  4. Bump github.com/prometheus/common from 0.48.0 to 0.52.2 (#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>
    dependabot[bot] authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    bccdbf7 View commit details
    Browse the repository at this point in the history
  5. Bump helm.sh/helm/v3 from 3.14.2 to 3.14.3 (#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]>
    dependabot[bot] and orsenthil authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    2694202 View commit details
    Browse the repository at this point in the history
  6. Bump golang.org/x/sys from 0.17.0 to 0.18.0 in /test/agent (#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]>
    dependabot[bot] and orsenthil authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    e5f6998 View commit details
    Browse the repository at this point in the history
  7. Bump github.com/containernetworking/plugins from 1.4.0 to 1.4.1 (#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]>
    dependabot[bot] and orsenthil authored Apr 3, 2024
    Configuration menu
    Copy the full SHA
    389f5eb View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. remove unused Dockerfile (#2869)

    * remove unused Dockerfile
    
    * update golang and dependencies to fix CVE
    sushrk authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    883c3b2 View commit details
    Browse the repository at this point in the history
  2. Update Kops test for 1.30 (#2868)

    Co-authored-by: Joseph Chen <[email protected]>
    jchen6585 and Joseph Chen authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    fbad965 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Configuration menu
    Copy the full SHA
    244f636 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. CHANGELOG, chart, and manifest changes following VPC CNI v1.18.0 rele…

    …ase (#2876)
    
    Co-authored-by: Joseph Chen <[email protected]>
    jchen6585 and Joseph Chen authored Apr 16, 2024
    Configuration menu
    Copy the full SHA
    deaca4b View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

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

    Co-authored-by: Joseph Chen <[email protected]>
    jchen6585 and Joseph Chen authored Apr 17, 2024
    Configuration menu
    Copy the full SHA
    cd7eb59 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b4d93e View commit details
    Browse the repository at this point in the history