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

[release-1.22] Backport bugfixes and enhancements from master #5586

Merged
merged 19 commits into from
May 20, 2022
Merged

[release-1.22] Backport bugfixes and enhancements from master #5586

merged 19 commits into from
May 20, 2022

Conversation

brandond
Copy link
Member

@brandond brandond commented May 19, 2022 •
edited
Loading

Proposed Changes

Backport bugfixes and enhancements from master to release-1.22

Types of Changes

backports

Verification

See linked issues

Linked Issues

User-Facing Change

The embedded ServiceLB LoadBalancer controller now supports mixed-protocol Services, and will clean up daemonsets when the Service type changes.
CNI plugins binaries now output the correct versions when queried on the command line
CNI plugins have been bumped to v1.1.1
K3s now uses the systemd cgroup driver instead of cgroupfs when running under systemd 244 or later.
K3s supervisor status errors are now wrapped in Kubernetes API error types, for improved compatibility with Kubernetes client libraries.
K3s now supports [NATS JetStream](https://docs.nats.io/nats-concepts/jetstream) as a datastore backend
The embedded kubelet now waits for the apiserver to become available before starting.
The K3s supervisor now implements a [KEP-1281](https://github.com/kubernetes/enhancements/tree/master/keps/sig-api-machinery/1281-network-proxy) compliant apiserver network proxy.
The integrated apiserver network proxy's operational mode can now be set with `--egress-selector-mode`.
When generating a replacement resolv.conf due to potentially unsuitable nameservers in the host resolv.conf, k3s now logs a warning, and stores the autogenerated configuration file in a more durable location.
Objects will be removed from Kubernetes when they are removed from manifest files.

Further Comments

@brandond brandond requested a review from a team as a code owner May 19, 2022 23:55
@brandond
Support MixedProtocolLBService and clean up Daemonsets on type change.
d9d3069 
Also add event support to increase visibility of change events.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 44c5374)
@brandond
Fix log spam due to servicelb event recorder namespace conflict
0ded8f8 
Don't hardcode the event namespace when creating event recorders; some controllers want to create events in other namespaces.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 965d0a0)
@brandond
Use core constants for cert user/group values
205ee2e 
Also update cert gen to ensure leaf certs are regenerated if other key fields change.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 99851b0)
@brandond
Move IPv4/v6 selection into helpers
d9698e9 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b12cd62)
@brandond
Add CNI Plugins and Flannel version to build scripts
2a7b40f 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1caae63)
@brandond
Add systemd cgroup controller support
d828909 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 333311c)
@brandond
Drop unnecessary intermediate variable
b8f8ac6 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a69d635)
@brandond
Make supervisor errors parsable by Kubernetes client libs
93ac874 
This gives nicer errors from Kubernetes components during startup, and
reduces LOC a bit by using the upstream responsewriters module instead
of writing the headers and body by hand.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3d01ca1)
@brandond
Bump kine to v0.9.1 for nats.io support
59caa27 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c9badb4)
@brandond
Use ListWatch helpers instead of bare List/Watch
a02fc30 
Reduces code complexity a bit and ensures we don't  have to handle closed watch channels on our own

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 13ca106)
@brandond
Don't start embedded kubelet until after apiserver is up
9b15e81 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d93b750)
@brandond
Ensure that WaitForAPIServerReady always re-dials through the loadbal…
2cf8efe 
…ancer

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e763fad)
@brandond
Replace DefaultProxyDialerFn dialer injection with EgressSelector sup…
74a9c10 
…port

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ce5b934)
@brandond
Add support for configuring the EgressSelector mode
eb7e9a6 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9d72304)
@brandond
Move auto-generated resolv.conf out of /tmp to prevent accidental cle…
25da441 
…anup

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1d4f995)
@brandond
Fix typo in image scan script
948777d 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e4369ce)
@brandond
Update CNI version in config file
7d71114 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e6385b2)
@brandond brandond force-pushed the 2022-05-backports_release-1.22 branch from ace2353 to 4952b26 Compare May 20, 2022 00:13
@thedadams @brandond
Remove objects when removed from manifests (k3s-io#5560)
17835e0 
* Remove objects when removed from manifests

If a user puts a file in /var/lib/rancher/k3s/server/manifests/ then the
objects contained therein are deployed to the cluster. If the objects
are removed from that file, they are not removed from the cluster.

This change tracks the GVKs in the files and will remove objects when
there are removed from the cluster.

Signed-off-by: Donnie Adams <donnie.adams@suse.com>
(cherry picked from commit c38a8c3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the 2022-05-backports_release-1.22 branch from 4952b26 to 17835e0 Compare May 20, 2022 04:25
@brandond
Bump dynamiclistener to v0.3.3
0f5c624 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ef3472)
@brandond brandond merged commit 244c56e into k3s-io:release-1.22 May 20, 2022
@brandond brandond deleted the 2022-05-backports_release-1.22 branch June 6, 2024 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@briandowns briandowns briandowns 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.
3 participants
@brandond @briandowns @thedadams