Commit Graph

2747 Commits

Author SHA1 Message Date
Manuel Buil
656aab06eb Merge pull request #7727 from manuelbuil/tailscale126
[Release 1.26] VPN integration
2023-06-12 10:20:04 +02:00
Ian Cardoso
d680b45146 [Release-1.26] E2e: Private registry test (#7721)
* add private registry e2e test (#7653)

add private registry e2e test

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

* E2E: Startup test cleanup + RunCommand Enhancement (#7388)

* Add beforesuite to startup
* Reduce timeouts for startup
* Fix cleanup + set kubeconfig

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

---------

Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
2023-06-09 13:09:54 -07:00
Manuel Buil
ab07b36ccd VPN PoC
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-06-09 19:11:36 +02:00
Derek Nola
8988439e52 [Release-1.26] E2E and Dep Backports - June (#7693)
* Bump docker go.mod (#7681)
* Shortcircuit commands with version or help flags (#7683)
* Fix for longhorn integration test
* Add Rotation certification Check (#7097)
* Add Certification Test to Validate Cluster
* Fix to stop/start for k3s certificate rotation
* E2E: Use sudo for all RunCmdOnNode
* Remove unnecessary daemonset addition/deletion

Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: est-suse <esteban.esquivel@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Co-authored-by: Esteban Esquivel Alvarado <esteban.alvarado@suse.com>
Co-authored-by: est-suse <esteban.esquivel@suse.com>
Co-authored-by: Brad Davidson <brad.davidson@rancher.com>
2023-06-08 15:05:30 -07:00
Derek Nola
c5333f9d71 Bump vagrant libvirt with fix for plugin installs (#7658)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-06-02 09:12:10 -07:00
Manuel Buil
313b83e894 Merge pull request #7648 from manuelbuil/flannel0220-1.26
[Release 1.26] Update flannel version
2023-05-31 11:41:16 +02:00
Manuel Buil
36d3f5c92e Update flannel version
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-05-31 08:41:43 +02:00
Brad Davidson
7cefebeaac Pin emicklei/go-restful to v3.9.0
Fix regression in legacy API prefix, until upstream pulls in support for MergePathStrategy from https://github.com/emicklei/go-restful/pull/523

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
v1.26.5-rc3+k3s1 v1.26.5+k3s1
2023-05-23 18:20:25 -07:00
Brian Downs
6cd540322f Update to v1.26.5-k3s1 (#7576) v1.26.5-rc2+k3s1 v1.26.5-rc1+k3s1 2023-05-18 10:24:17 -07:00
Manuel Buil
88eb3ae574 Merge pull request #7573 from manuelbuil/restartcluster126
[Release 1.26] Add '-all' flag to apply to inactive units
2023-05-18 15:45:14 +02:00
Manuel Buil
6ca5f342e3 Add '-all' flag to apply to inactive units
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-05-17 18:50:02 +02:00
Manuel Buil
e8d9ed7984 Merge pull request #7547 from manuelbuil/fixnetpollogs126
[Release 1.26] Wrap error stating that it is coming from netpol
2023-05-15 16:33:17 +02:00
Manuel Buil
2b838e695d Wrap error stating that it is coming from netpol
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-05-15 09:43:49 +02:00
Brad Davidson
5e32828d55 Bump containerd/runc to v1.7.1-k3s1/v1.1.7
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-05-11 13:51:43 -07:00
Brad Davidson
8312c171b2 Bump helm-controller version for repo auth/ca support
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-05-10 17:37:14 -07:00
Brad Davidson
03a3470193 Consistently use constant-time comparison of password hashes
As per https://github.com/golang/go/issues/47001 even subtle.ConstantTimeCompare should never be used with variable-length inputs, as it will return 0 if the lengths do not match. Switch to consistently using constant-time comparisons of hashes for password checks to avoid any possible side-channel leaks that could be combined with other vectors to discover password lengths.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 239021e759)
2023-05-10 17:37:14 -07:00
Brad Davidson
118d432322 Bump kine to v0.10.1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b32bf49541)
2023-05-10 17:37:14 -07:00
Brad Davidson
9eeee04675 Fix token startup test
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c98137ddca)
2023-05-10 17:37:14 -07:00
Brad Davidson
f14d33c471 Fail to validate server tokens that use bootstrap id/secret format
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cf9ebb3259)
2023-05-10 17:37:14 -07:00
Brad Davidson
8159076d7e Bump cni plugins to v1.2.0-k3s1
Also add bandwidth and firewall plugins. The bandwidth plugin is
automatically registered with the appropriate capability, but the
firewall plugin must be configured by the user if they want to use it.

Ref: https://www.cni.dev/plugins/current/meta/firewall/

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cedefeff24)
2023-05-10 17:37:14 -07:00
Brad Davidson
173a5b9131 Fix MemberList error handling and incorrect etcd-arg passthrough
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e61fde93c1)
2023-05-10 17:37:14 -07:00
Brad Davidson
705adedd1b Retry cluster join on "too many learners" error
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 91afb38799)
2023-05-10 17:37:14 -07:00
Brad Davidson
82a403a0c2 Fix stack log on panic
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit f1b6a3549c)
2023-05-10 17:37:14 -07:00
Brad Davidson
bdd210e785 Fix race condition in tunnel server startup
Several places in the code used a 5-second retry loop to wait on
Runtime.Core to be set. This caused a race condition where OnChange
handlers could be added after the Wrangler shared informers were already
started. When this happened, the handlers were never called because the
shared informers they relied upon were not started.

Fix that by requiring anything that waits on Runtime.Core to run from a
cluster controller startup hook that is guaranteed to be called before
the shared informers are started, instead of just firing it off in a
goroutine that retries until it is set.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c44d33d29b)
2023-05-10 17:37:14 -07:00
Brad Davidson
34df1c49a5 Add e2e test for --disable-agent
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ca035accc)
2023-05-10 17:37:14 -07:00
Brad Davidson
14ebfa814f Improve egress selector handling on agentless servers
Don't set up the agent tunnel authorizer on agentless servers, and warn when agentless servers won't have a way to reach in-cluster endpoints.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 31a6386994)
2023-05-10 17:37:14 -07:00
Brad Davidson
944beb1af3 Improve error message when CLI wrapper Exec fails
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5348b5e696)
2023-05-10 17:37:14 -07:00
Brad Davidson
fd77c076a1 go generate
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0247794aa9)
2023-05-10 17:37:14 -07:00
Brad Davidson
ba5d714734 Bump traefik to v2.9.10
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0bbc6ad3f0)
2023-05-10 17:37:14 -07:00
Brad Davidson
f0d73301ba Bump k3s-root for aarch64 page size fix
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9539147ee1)
2023-05-10 17:37:14 -07:00
Brad Davidson
0861ce2d97 Create CRDs with schema
Fixes an issue where CRDs were being created without schema, allowing
resources with invalid content to be created, later stalling the
controller ListWatch event channel when the invalid resources could not
be deserialized.

This also requires moving Addon GVK tracking from a status field to
an annotation, as the GroupVersionKind type has special handling
internal to Kubernetes that prevents it from being serialized to the CRD
when schema validation is enabled.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ad41fb8c96)
2023-05-10 17:37:14 -07:00
Brad Davidson
7ece0d9599 Bump containerd to v1.7.0 and move back into multicall binary
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2023-05-10 14:57:53 -07:00
Derek Nola
c206088d20 local-storage: Fix permission (#7217) (#7474)
* local-storage: Fix permission

/var/lib/rancher/k3s/storage/ should be 700
/var/lib/rancher/k3s/storage/* should be 777

Fixes #2348



* Fix pod command field type

* Fix to int test



---------

Signed-off-by: Boleyn Su <boleyn.su@gmail.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Boleyn Su <boleyn.su@gmail.com>
Co-authored-by: Brad Davidson <brad@oatmail.org>
2023-05-10 11:08:38 -07:00
thomasferrandiz
ef0b820ef2 Merge pull request #7360 from thomasferrandiz/backport-1.26-netpol-log-level
[release-1.26] ensure that klog verbosity is set to the same level as logrus
2023-05-10 15:01:32 +02:00
Ian Cardoso
414cc27528 add kube-* server flags integration tests (#7416)
This commit adds SearchK3sLog function to find specific strings in integration tests log file and also removes FindStringInCmdAsync function since it was not being used.

Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
2023-05-09 16:50:14 -03:00
Brooks Newberry
21a96c64cc Add longhorn storage test (#6445)
Signed-off-by: Brooks Newberry <brooks@newberry.com>
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
2023-05-09 16:50:14 -03:00
Roberto Bonafiglia
218844aa7c Bump kube-router version to fix a bug when a port name is used
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-05-09 18:21:56 +02:00
Manuel Buil
743a0dd804 Merge pull request #7432 from manuelbuil/netutil1.26
[Release 1.26] Migrate netutil methods into /utils/net.go
2023-05-05 09:14:38 +02:00
Manuel Buil
b8619527a2 Migrate netutil methods into /utils/net.go
Signed-off-by: Manuel Buil <mbuil@suse.com>
2023-05-05 07:23:41 +02:00
Derek Nola
5ddb3ccaff [Release-1.26] CLI + Config Enhancement (#7403)
* Handle multiple arguments with StringSlice flags (#7380)
* Cleanup server setup with util function

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

* Enable FindString to search dotD config files (#7323)
* Address multiple arg cases

Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-05-02 15:09:35 -07:00
Derek Nola
6bda083c6c Bump Runc and Containerd (#7399)
* Bump runc
* Bump to containerd, recombine build and go.mod version
Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-05-02 14:04:17 -07:00
Ian Cardoso
42fd1bf090 Add integration tests for etc-snapshot server flags and refactor /tests/integration/integration.go/K3sStartServer (#7300) (#7377)
This adds integration tests for the following flags: "--etcd-snapshot-name","--etcd-snapshot-dir","--etcd-snapshot-retention","--etcd-snapshot-schedule-cron" and "--etcd-snapshot-compress". It also refactors K3sStartServer to stop applying strings.Fields() into inputArgs, so it can accept arguments that have space in their definition.

Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 1ac03aad43)
2023-05-02 10:13:07 -03:00
Derek Nola
e5a199a861 Prepend release branch to dependabot (#7374)
Signed-off-by: Derek Nola <derek.nola@suse.com>
2023-05-01 09:45:54 -07:00
Thomas Ferrandiz
0b256f08d9 ensure that klog verbosity is set to the same level as logrus
by repeatedly settting it every second during k3s startup

Signed-off-by: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
2023-04-27 08:11:38 +00:00
github-actions[bot]
8d0255af07 Bump Trivy version (#7257)
* chore: Bump Trivy version

Made with ❤️️ by updatecli

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
v1.26.4+k3s1
2023-04-18 09:48:27 -07:00
github-actions[bot]
779d5f3aa2 chore: Updated the content of the file "/tmp/updatecli/github/k3s-io/... (#7256)
... k3s/conformance/Dockerfile"
Updated the content of the file "/tmp/updatecli/github/k3s-io/k3s/Dockerfile.test"

Made with ❤️️ by updatecli

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-18 09:46:56 -07:00
github-actions[bot]
554ad87c8d chore: Bump golang:alpine version (#7292)
Made with ❤️️ by updatecli

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-04-18 09:46:42 -07:00
Brian Downs
257fa2c54c Update to v1.26.4-k3s1 (#7282) v1.26.4-rc1+k3s1 2023-04-13 13:51:37 -07:00
Roberto Bonafiglia
d9f40d4f5b Update install script to clean iptables rules before start
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-04-12 22:33:10 +02:00
Roberto Bonafiglia
0c683720ad Update kube-router to insert iptables rules right after kubernetes ones
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
2023-04-12 22:33:10 +02:00