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

[engine-1.21] Wrap containerd.New #5363

Closed
wants to merge 136 commits into from

Conversation

luthermonson
Copy link
Contributor

problem: While setting up containerd we make a client and the name of the npipe for windows is npipe://./pipe/containerd-containerd but at some point between windows server patches and the winio dialer we got to a place where it's expecting \\.\pipe\containerd-containerd and the npipe:// needed to be dropped. This was fixed CriConnection as the address was wrapped with utils.GetAddressAndDialer but the second call to containerd.New for a client didn't have this.

Fix: wrap the containerd.New call with a func that parses the address properly and pass that down

rancher/rke2#2161
rancher/windows#72

manuelbuil and others added 30 commits August 27, 2021 19:05
Signed-off-by: Manuel Buil <mbuil@suse.com>
…ngine

[engine-1.21] Add functions to separate ipv4 from ipv6 functions
)

* Fix condition for adding kubernetes endpoints

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* Fix condition for adding kubernetes endpoints

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Also honor node-ip when adding the node address to the SAN list, instead
of hardcoding the autodetected IP address.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…etcd controller (k3s-io#4016)

Signed-off-by: Chris Kim <oats87g@gmail.com>
Signed-off-by: dereknola <derek.nola@suse.com>
* Update to Kubernetes v1.21.5
* Handle moved runc library

Signed-off-by: Chris Kim <oats87g@gmail.com>
Signed-off-by: dereknola <derek.nola@suse.com>
Signed-off-by: dereknola <derek.nola@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 156bae2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…k3s-io#4172)

* Add "etcd-" prefix to etcd-snapshot commands as alias

Signed-off-by: dereknola <derek.nola@suse.com>
…3s-io#4050)

* Make sure there are no duplicates in etcd member list

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix node names with hyphens

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* use full server name for etcd node name

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* Display cluster tls error only in debug mode

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

* fix

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Manuel Buil <mbuil@suse.com>
[engine-1.21] Fix race condition in cloud provider
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3449d5b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 57377d2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 699ea16)
Partial cherry-pick from 29c8b23

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 086ca8b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 88178ae)
galal-hussein and others added 27 commits February 22, 2022 21:36
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
…-io#5199)

* Add json flag for secrets-encrypt status

Signed-off-by: Derek Nola <derek.nola@suse.com>
… is disabled (k3s-io#5230)

* Populate EtcdConfig in runtime from datastore when etcd is disabled (k3s-io#5222)

Fixes issue with secrets-encrypt rotate not having any etcd endpoints
available on nodes without a local etcd server.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

* Revert naming to old Kine

Signed-off-by: Derek Nola <derek.nola@suse.com>

Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Several types contained redundant references to ControlRuntime data. Switch to consistently accessing this via config.Runtime instead.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2989b8b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 54bb650)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a1b800f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5014c9e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 555087b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3531df3)
Reuse the existing etcd library code to start up the temporary etcd
server for bootstrap reconcile. This allows us to do proper
health-checking of the datastore on startup, including handling of
alarms.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e4846c9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9a48086)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a7878db)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f090bf2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a93b9b6)
…er bootstrap

This allows secondary etcd nodes to bootstrap the kubelet before an
apiserver joins the cluster. Rancher waits for all the etcd nodes to
come up before adding the control-plane nodes, so this needs to be
handled properly.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 38706ee)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Closing idle connections isn't guaranteed to close out a pooled connection to a
loadbalancer endpoint that has been removed. Instead, ensure that requests used
to wait for the apiserver to become ready aren't reused.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Improve feedback when running secrets-encrypt commands on etcd-only nodes, and
allow etcd-only nodes to properly restart when effecting rotation.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e811689)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…er npipe connector

Signed-off-by: Luther Monson <luther.monson@gmail.com>
@luthermonson luthermonson requested a review from a team as a code owner March 30, 2022 01:11
@luthermonson luthermonson deleted the fix-npipe-engine-121 branch March 30, 2022 14:36
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.

8 participants