github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,255 Commits
31 Branches
881 Tags
634 MiB
Commit Graph

2255 Commits (bdb35433c59503de752640cec406cf2e882fa9fb)

Author SHA1 Message Date
Manuel Buil d73772d60d
Merge pull request #5399 from manuelbuil/fix_klipper-helm-ipv6 
[Release 1.22] Update helm-controller version
 2022-04-08 15:45:11 +02:00
Manuel Buil 97af74fbfb Update helm-controller version 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-04-08 15:02:59 +02:00
Roberto Bonafiglia 962269c096
Merge pull request #5385 from rbrtbnfgl/fix-ipv6-url-release1.22 
[release 1.22] Fix ipv6 url
 2022-04-06 09:43:57 +02:00
Roberto Bonafiglia 15472506e1 Fixed gofmt format 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 12:55:27 +02:00
Roberto Bonafiglia 27264a45cb Fixed included modules 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 11:05:18 +02:00
Roberto Bonafiglia 29a761360b Fixed http URL on etcd 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:22:59 +02:00
Roberto Bonafiglia ba0270c6bc Fixed loadbalancer in case of IPv6 addresses 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:22:34 +02:00
Roberto Bonafiglia 80b22ded81 Fixed etcd register 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:19:34 +02:00
Roberto Bonafiglia 5df127ec72 Fixed client URL 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:19:21 +02:00
Roberto Bonafiglia a8fdf93e15 Updated localhost address on IPv6 only setup 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:18:58 +02:00
Roberto Bonafiglia 44253bcfd4 Fixed etcd URL in case of IPv6 address 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-05 10:14:35 +02:00
Luther Monson 21fed356e6
Merge pull request #5362 from luthermonson/fix-containerd-npipe-122 
[1.22] Wrap containerd.New
 2022-03-30 07:36:08 -07:00
Brad Davidson d499e79e5c Skip setting up client tls when etcd server does not have tls enabled 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-30 01:05:53 -07:00
Luther Monson 4a97a7c8da add a wrapper around the containerd.New call to fix and pass the proper npipe connector 
Signed-off-by: Luther Monson <luther.monson@gmail.com>
 2022-03-29 18:07:57 -07:00
Brad Davidson 4cc9a48c1b Defragment etcd datastore before clearing alarms 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-28 09:28:13 -07:00
Brad Davidson b0d715e03e Fix etcd-only secrets encryption rotation 
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 e811689df9)
 2022-03-25 14:38:07 -07:00
Brad Davidson 26ddaec248 Ensure that apiserver ready channel checks re-dial every time 
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>
 2022-03-23 13:23:07 -07:00
Brad Davidson bef28b2ef0 go generate 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-18 23:31:19 -07:00
Brad Davidson f62f0ca6cf Bump coredns to v1.9.1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-18 23:31:19 -07:00
Brad Davidson 9f7530c5b3 Update Kubernetes to v1.22.8-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-18 14:02:44 -07:00
Brad Davidson 58b65cbeb1 Defer ensuring node passwords on etcd-only nodes during initial cluster 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 38706eeec0)
 2022-03-18 13:24:23 -07:00
Brad Davidson ff23175968 Update helm-controller 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a93b9b6d53)
 2022-03-17 16:01:25 -07:00
Brad Davidson 373977563d Close additional leaked GPRC clients 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-15 18:08:33 -07:00
Brad Davidson 11ac5a87b7 Bootstrap the executor even when the agent is disabled 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f090bf2d5e)
 2022-03-15 18:08:33 -07:00
Brad Davidson e323a85116 Fix etcd-snapshot commands by making setup more consistent. 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a7878db17f)
 2022-03-15 18:08:33 -07:00
Brad Davidson 3d3a4d08ca Ignore cluster membership errors when reconciling from temp etcd 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9a48086524)
 2022-03-15 18:08:33 -07:00
Brad Davidson 83d858a169 Move temporary etcd startup into etcd module 
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 e4846c92b4)
 2022-03-15 18:08:33 -07:00
Brad Davidson e575b4f50e Disable ineffassign CI plugin for excessive false positives 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3531df3f31)
 2022-03-15 18:08:33 -07:00
Brad Davidson 66b40c8e10 Add function to clear local alarms on etcd startup 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 555087b9b8)
 2022-03-15 18:08:33 -07:00
Brad Davidson 5cb6b1ecbc Fix adding etcd-only node to existing cluster 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5014c9e0e8)
 2022-03-15 18:08:33 -07:00
Brad Davidson 1da571ff69 Remove unnecessary copies of etcdconfig struct 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a1b800f0bf)
 2022-03-15 18:08:33 -07:00
Brad Davidson 9d1240577f Fix cluster bootstrap test 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 54bb65064e)
 2022-03-15 18:08:33 -07:00
Brad Davidson ce890d626d Remove unnecessary copies of runtime struct 
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 2989b8b2c5)
 2022-03-15 18:08:33 -07:00
Brad Davidson 88c2aa7c6f Bump containerd to v1.5.10-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-15 15:02:50 -07:00
Roberto Bonafiglia 37b460db7b
Merge pull request #5260 from rbrtbnfgl/backport1.22-ipv6-only 
[release 1.22] ipv6 only
 2022-03-15 09:15:03 +01:00
Roberto Bonafiglia 7d555489c0 Changed ipv6 config on flannel setup 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Roberto Bonafiglia 82d5f52719 Added ipv6 only support with flannel 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Roberto Bonafiglia 7bae0481ef Fixed log in case of ipv6 only config 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Roberto Bonafiglia 29324439b8 Added switch case to check netMode 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Roberto Bonafiglia 2b83753b3c Fixed in case of empty address 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Roberto Bonafiglia 1187c3573d Updated flannel to 0.17 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:49 +01:00
Brian Downs 6bf86c5b33 fix function arg call (#5234) 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:48 +01:00
Olli Janatuinen ec59241777 Add support for IPv6 only mode 
Automatically switch to IPv6 only mode if first node-ip is IPv6 address

Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-14 11:57:48 +01:00
Brian Downs b988e34c4b
Release 1.22 fix 700 (#5246) 2022-03-09 16:33:07 -07:00
Brian Downs 22a7b477b3
add net util funcs (#5245) 2022-03-09 14:25:59 -07:00
Brian Downs d00666d50d
fix function arg call (#5234) (#5236) 2022-03-09 08:00:01 -07:00
Derek Nola b3b44aec2f
Populate EtcdConfig in runtime from datastore when etcd is disabled (#5222) (#5228) 
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>

Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-08 10:42:23 -08:00
Derek Nola 0159e9bf38
[Release-1.22] Backport new E2E tests (#5200) 
* E2E secrets encryption test (#5144)
* E2E Add external DB options to ValidateCluster test (#5157)

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

* Wait for process to exit before returning from kill helper

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

Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-04 10:18:02 -08:00
Derek Nola 5b26c2eb4e
Add `--json` flag for `k3s secrets-encrypt status` (#5127) (#5198) 
* Add json flag for secrets-encrypt status

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-03-03 10:25:33 -08:00
Derek Nola d07edd72f6
[Release-1.22] Backport E2E Testing Improvements (#5124) 
* Fix cluster validation and add upgrade cluster test (#5020)

Signed-off-by: Shylaja Devadiga <shylaja@rancher.com>

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

* Migrate Ginkgo testing framework to V2, consolidate integration tests (#5097)

* Upgrade and convert ginkgo from v1 to v2
* Move all integration tests into integration folder
* Update TESTING.md

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

* E2E Test Improvements (#5102)

* Fix infinite while loop on failure, reduce upgradecluster

* DRY code

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-02-28 12:10:40 -08:00