github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,199 Commits
32 Branches
867 Tags
626 MiB
Commit Graph

74 Commits (095ecdb0346c038b0c16c39f6f66ad4f67ad10b9)

Author SHA1 Message Date
Brad Davidson 753c00f30c Consistently handle component exit on shutdown 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-02-07 10:23:54 -08:00
Hussein Galal 9411196406
Update flannel to v0.24.0 and remove multiclustercidr flag (#9075) 
* update flannel to v0.24.0

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

* remove multiclustercidr flag

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

---------

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2023-12-20 00:25:38 +02:00
Hussein Galal 7101af36bb
Update Kubernetes to v1.29.0+k3s1 (#9052) 
* Update to v1.29.0

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

* Update to v1.29.0

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

* Update go to 1.21.5

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

* update golangci-lint

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

* update flannel to 0.23.0-k3s1

This update uses k3s' fork of flannel to allow the removal of
multicluster cidr flag logic from the code

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

* fix flannel calls

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

* update cri-tools to version v1.29.0-k3s1

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

* Remove GOEXPERIMENT=nounified from arm builds

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

* Skip golangci-lint

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

* Fix setup logging with newer go version

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

* Move logging flags to components arguments

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

* add sysctl commands to the test script

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

* Update scripts/test

Signed-off-by: Brad Davidson <brad@oatmail.org>

* disable secretsencryption tests

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

---------

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Signed-off-by: Brad Davidson <brad@oatmail.org>
Co-authored-by: Brad Davidson <brad@oatmail.org>
 2023-12-19 05:14:02 +02:00
Manuel Buil 8f7a8b23b7 Improve dualStack log 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-11-14 10:50:37 +01:00
Sean Yen 0c9bf36fe0
[K3s][Windows Port] Build script, multi-call binary, and Flannel (#7259) 
* initial windows port.

Signed-off-by: Sean Yen <seanyen@microsoft.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Wei Ran <weiran@microsoft.com>
 2023-10-16 14:53:09 -04:00
Manuel Buil f2c7117374 Take IPFamily precedence based on order 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-09-29 11:04:15 +02:00
Manuel Buil 66cb1064d1 Add context to flannel errors 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-09-07 14:09:22 +02:00
Derek Nola ced330c66a
[v1.28] CLI Removal for v1.28.0 (#8203) 
* Remove deprecated flannel ipsec

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

* Remove multipart backend

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

* Fix secrets-encryption integration test flakiness

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2023-08-24 22:09:13 -07:00
Derek Nola 46cbbab263
Consolidate CopyFile functions (#8079) 
* Consolidate CopyFile function

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

* Copy to File, not destination folder

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

---------

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2023-08-01 08:55:34 -07:00
Denys Smirnov b9a2bf11ee Support setting control server URL for Tailscale. 
This change enables the use of Headscale - open source implementation of the Tailscale control server.

Signed-off-by: Denys Smirnov <dennwc@pm.me>
 2023-07-07 10:49:01 +03:00
Manuel Buil 869e030bdd VPN PoC 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-06-09 12:39:33 +02:00
Brad Davidson cedefeff24 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>
 2023-05-04 13:58:42 -07:00
Derek Nola 944f811dc5
v1.27.1 CLI Deprecation (#7311) 
* Remove Flannel Wireguard
* Remove etcd-snapshot (implicit save)
* Convert ipsec and multiple backend to fatal

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2023-04-19 12:02:05 -07:00
Roberto Bonafiglia 15ee88964b Added multiClusterCidr feature 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2023-03-14 18:30:52 +01:00
Roberto Bonafiglia b8e69712a3 Updated flannel version to v0.21.0 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2023-02-10 23:03:10 +01:00
Derek Nola d723775792
Remove deprecated flags in v1.26 (#6574) 
* Remove NoFlannel
* Remove cluster-secret
* Remove no-deploy
* Remove disable-selinux
* Convert wireguard to fatal error
* Remove reference to no-op K3S_CLUSTER_SECRET

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-12-05 14:01:01 -08:00
Brad Davidson 2835368ecb Bump k3s-root and remove embedded strongswan support 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-12-01 12:40:40 -08:00
Roberto Bonafiglia 87c7ea81f0 Updated flannel version to 0.20.1 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-11-03 17:49:26 +01:00
Derek Nola 06d81cb936
Replace deprecated ioutil package (#6230) 
* Replace ioutil package
* check integration test null pointer
* Remove rotate retries

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-10-07 17:36:57 -07:00
Manuel Buil 5164cf5345 Add flannel-external-ip when there is a k3s node-external-ip 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-09-26 16:24:00 +02:00
Roberto Bonafiglia 26e9405767 Added warning message for flannel backend additional options deprecation 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-09-09 20:04:04 +02:00
Roberto Bonafiglia a30971efaa Updated flannel to v0.19.1 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-08-08 09:57:56 +02:00
Brad Davidson b1fa63dfb7 Revert "Remove --docker/dockershim support" 
This reverts commit 4a3d283bc1.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-08-05 02:39:25 -07:00
Roberto Bonafiglia a693071c74
Merge pull request #5552 from sjoerdsimons/sjoerd/flannel-wireguard-mode 
Add cli flag for flannel wireguard mode
 2022-06-15 14:28:21 +02:00
Manuel Buil c705d34804 Add FlannelConfCNI flag 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-06-08 11:03:17 +02:00
Sjoerd Simons 8643576985 Add ability to pass configuration options to flannel backend 
Allow the flannel backend to be specified as
backend=option=val,option2=val2 to select a given backend with extra options.

In particular this adds the following options to wireguard-native
backend:
* Mode - flannel wireguard tunnel mode
* PersistentKeepaliveInterval- wireguard persistent keepalive interval

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
 2022-06-07 20:13:28 +02:00
Brad Davidson 4a3d283bc1 Remove --docker/dockershim support 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-05-11 14:39:07 -07:00
Brad Davidson e6385b2341 Update CNI version in config file 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-05-11 14:39:07 -07:00
Brad Davidson 13ca10664f Use ListWatch helpers instead of bare List/Watch 
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>
 2022-04-29 12:24:12 -07:00
Roberto Bonafiglia f04c602c07 Updated wireguard-native options and added log message 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-07 19:31:21 +02:00
Roberto Bonafiglia 47abaf362e Added new flannel backend to use wireguard from flannel 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-04-07 19:31:13 +02:00
Euan Kemp c2e846dc16 Allow using flannel wireguard backend in a custom config 
Ideally we'd have fully fleshed out support for it (i.e. #5011), but
that's a potentially breaking change and taking a little while to merge.

This is a much simpler change which won't break anything, but will allow
a "Type": "wireguard" reference in the "--flannel-conf" custom config
file to work.

Signed-off-by: Euan Kemp <euank@euank.com>
 2022-04-05 09:44:26 -07:00
Roberto Bonafiglia ff85faa7de Changed ipv6 config on flannel setup 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-09 12:30:33 +01:00
Roberto Bonafiglia 073f155fc4 Added ipv6 only support with flannel 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-09 09:35:01 +01:00
Roberto Bonafiglia f3d81544b1 Fixed log in case of ipv6 only config 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-08 09:42:25 +01:00
Roberto Bonafiglia 0c83f50c4c Added switch case to check netMode 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-08 09:34:25 +01:00
Roberto Bonafiglia 2c39febdd2 Fixed in case of empty address 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-07 14:09:29 +01:00
Roberto Bonafiglia d7d4c891e2 Updated flannel to 0.17 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2022-03-07 14:09:05 +01:00
Luther Monson 9a849b1bb7
[master] changing package to k3s-io (#4846) 
* changing package to k3s-io

Signed-off-by: Luther Monson <luther.monson@gmail.com>

Co-authored-by: Derek Nola <derek.nola@suse.com>
 2022-03-02 15:47:27 -08:00
Roberto Bonafiglia 8eded2749a Added debug log for IPv6 Masquerading rule 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@gmail.com>
 2022-01-17 10:20:12 +01:00
Roberto Bonafiglia 111c1669fc Added flannel-ipv6-masq flag to enable IPv6 nat 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@gmail.com>
 2022-01-14 18:35:37 +01:00
Roberto Bonafiglia 2253f64b2a Added iptables masquerade rules for ipv6 on flannel 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@gmail.com>
 2022-01-14 18:35:37 +01:00
Manuel Buil 4eb282edac Move flannel logs to logrus 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-12-21 14:34:51 +01:00
Manuel Buil 7685da3e24 Improve flannel logging 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-11-22 21:51:52 +01:00
Brad Davidson 5acd0b9008 Watch the local Node object instead of get/sleep looping 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-29 15:18:14 -07:00
Manuel Buil 9fcd79baae Add tests to the dual-stack PR and enable dual-stack with flannel backend 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-09-15 14:11:54 +02:00
Manuel Buil 681058bb40 Add dual-stack support 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-09-15 11:44:48 +02:00
Brad Davidson 29c8b238e5 Replace klog with non-exiting fork 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-10 09:36:16 -07:00
Manuel Buil 243fd14cf1 Change Replace with ReplaceAll function 
strings has a specific function to replace all matches. We should use that one instead of strings.Replace(string, old, new string, -1)

Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-06-07 09:52:26 +02:00
Manuel Buil 1576030d6b Add a path for wireguard's privatekey 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-06-01 21:54:17 +02:00