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

[release-1.31] Backports for 2025-02 #11731

Closed
wants to merge 142 commits into from

Conversation

galal-hussein and others added 30 commits August 30, 2024 01:47
* Remove secrets encryption controller

Signed-off-by: Derek Nola <[email protected]>
Signed-off-by: Roberto Bonafiglia <[email protected]>
Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit fa6940d)
Signed-off-by: Brad Davidson <[email protected]>
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.20.0 to 0.24.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.20.0...0.24.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  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>
(cherry picked from commit dacc636)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 3d6e4a7)
Signed-off-by: Brad Davidson <[email protected]>
This is less effort than passing the tag across steps 🤷‍♂️

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 378edb9)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bd45aa5)
Signed-off-by: Brad Davidson <[email protected]>
Used https://github.com/coredns/corefile-migration to
migrate the corefile. There are no changes for the
default file from 1.10.1 to 1.11.3.

Notable plugin changes include the k8s_external with fallthrough option
and rewrite with cname_target option.

These changes are not part of the default config that ships
with k3s. Customers using these two plugins can start using the new options

Metrics does not have any new features other than build tooling updates.

Requires rancher/image-mirror#704

Signed-off-by: Harsimran Singh Maan <[email protected]>
(cherry picked from commit 0b4d249)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit d746073)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 662799f)
Signed-off-by: Brad Davidson <[email protected]>
…d CAs

Also silences warnings about bootstrap fields that are not intended to be handled by CA rotation

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit fe3324c)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 270f85e)
Signed-off-by: Brad Davidson <[email protected]>
Resolves issue from 270f85e that prevented old hosts.toml files from being cleaned up.

Signed-off-by: Brad Davidson <[email protected]>
* update Kubernetes to v1.31.1 and Go to 1.22.6

Signed-off-by: Brooks Newberry <[email protected]>
Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit ed14f7f)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit cda31eb)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 6c6d87d)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit c9e7b05)
Signed-off-by: Brad Davidson <[email protected]>
Support for 'sqlite' as the endpoint was removed in
k3s-io/kine#320 and the constant removed in
k3s-io/kine#325

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0942e6a)
Signed-off-by: Brad Davidson <[email protected]>
Don't delete s3 etcdsnapshotfiles if they are missing from s3 but less than a minute old, its possible the other node just finished uploading it and the object key has not yet become visible.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0826ebc)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b1a42e5)
Signed-off-by: Brad Davidson <[email protected]>
brandond and others added 28 commits February 8, 2025 11:56
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit e808d3e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 95700aa)
Signed-off-by: Brad Davidson <[email protected]>
* chore: Bump Local Path Provisioner version

Made with ❤️️ by updatecli

* chore: Bump Local Path Provisioner version

Made with ❤️️ by updatecli

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 28300ea)
Signed-off-by: Brad Davidson <[email protected]>
Also adds a CLI flag and fields for session token, which must be passed
alongside the access key and secret when using temporary credentials.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0d028a2)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 1b578b4)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit eec2a53)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 85b3775)
Signed-off-by: Brad Davidson <[email protected]>
…verage

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 5c8f236)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit d6d361e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 20dda23)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 9bdab19)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0d15457)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 4cacf6e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 8f85ee3)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b2418ba)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 838d687)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bf97b8f)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 8aa412e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 50326c8)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 85987ac)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 99f4f5a)
Signed-off-by: Brad Davidson <[email protected]>
Netpol startup is skipped with a warning on linux if ipset support is missing, we should do the same on windows

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 96c2dd3)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 3aa24cd)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 04ed6c0)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 124e46b)
Signed-off-by: Brad Davidson <[email protected]>
Ref: https://github.com/containerd/containerd/blob/release/2.0/docs/cri/config.md

Since this is a breaking change, add support for a new v3 template file. If no v3 template is present, fall back to checking for the legacy v2 template and render the old structure.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bc45972)
Signed-off-by: Brad Davidson <[email protected]>
Don't block other linux steps on building the windows binary

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 20a9a6b)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner February 8, 2025 11:57
@brandond brandond closed this Feb 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.