public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-04 03:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,086 Commits 31 Branches 949 Tags
fae41a8b2af0250dcf79bd4c77dbca2bb7b1acbb
Commit Graph

390 Commits

Author SHA1 Message Date
Derek Nola
fae41a8b2a Rename AgentReady to ContainerRuntimeReady for better clarity 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-02-21 12:21:19 -08:00
Derek Nola
91cc2feed2 Restore original order of agent startup functions 
Signed-off-by: Derek Nola <derek.nola@suse.com>
 2024-02-21 12:21:19 -08:00
Oliver Larsson
cfc3a124ee [Testing]: Test_UnitApplyContainerdQoSClassConfigFileIfPresent (Created) (#8945) 
Problem:
Function not tested.

Solution:
Unit test added.

Signed-off-by: Oliver Larsson <larsson.e.oliver@gmail.com>
 2024-02-09 11:28:06 -08:00
Harrison Affel
a36cc736bc allow executors to define containerd and docker behavior 
Signed-off-by: Harrison Affel <harrisonaffel@gmail.com>
 2024-02-09 15:51:35 -03:00
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
Vitor Savian
e9cec46a23 Runtimes refactor using exec.LookPath 
Signed-off-by: Vitor Savian <vitor.savian@suse.com>
 2024-02-07 15:06:16 -03:00
Brad Davidson
97a22632b9 gofmt config_test.go 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-02-01 18:51:51 -08:00
Brad Davidson
29848dea3d Fix issues with certs.d template generation 
* Fix issue with bare host or IP as endpoint
* Fix issue with localhost registries not defaulting to http.
* Move the registry template prep to a separate function,
  and adds tests of that function so that we can ensure we're
  generating the correct content.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-02-01 12:09:13 -08:00
Brad Davidson
c87e6e5f7e Move proxy dialer out of init() and fix crash 
* Fixes issue where proxy support only honored server address via K3S_URL, not CLI or config.
* Fixes crash when agent proxy is enabled, but proxy env vars do not return a proxy URL for the server address (server URL is in NO_PROXY list).
* Adds tests

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-11 16:12:15 -08:00
Brad Davidson
76fa022045 Enable network policy controller metrics 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-11 10:19:39 -08:00
Brad Davidson
37e9b87f62 Add embedded registry implementation 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-09 15:23:05 -08:00
Brad Davidson
ef90da5c6e Add server CLI flag and config fields for embedded registry 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-09 15:23:05 -08:00
Brad Davidson
77846d63c1 Propagate errors up from config.Get 
Fixes crash when killing agent while waiting for config from server

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-09 15:23:05 -08:00
Brad Davidson
16d29398ad Move registries.yaml load into agent config 
Moving it into config.Agent so that we can use or modify it outside the context of containerd setup

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-09 15:23:05 -08:00
Brad Davidson
5c99bdd9bd Pin images instead of locking layers with lease 
Layer leases never did what we wanted anyways, and this is the new approved interface for ensuring that images do not get GCd

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-09 15:23:05 -08:00
Manuel Buil
6330e26bb3 Wait for taint to be gone in the node before starting the netpol controller 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2024-01-08 12:04:18 +01:00
Lex Rivera
5fe074b540 Add more paths to crun runtime detection (#9086) 
* add usr/local paths for crun detection

Signed-off-by: Lex Rivera <me@lex.io>
 2024-01-04 16:51:13 -08:00
Brad Davidson
c45524e662 Add support for containerd cri registry config_path 
Render cri registry mirrors.x.endpoints and configs.x.tls into config_path; keep
using mirrors.x.rewrites and configs.x.auth those do not yet have an
equivalent in the new format.

The new config file format allows disabling containerd's fallback to the
default endpoint when using mirror endpoints; a new CLI flag is added to
control that behavior.

This also re-shares some code that was unnecessarily split into parallel
implementations for linux/windows versions. There is probably more work
to be done on this front but it's a good start.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-04 16:50:26 -08:00
Brad Davidson
db7091b3f6 Handle logging flags when parsing kube-proxy args 
Also adds a test to ensure this continues to work.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2024-01-04 16:23:03 -08:00
Pierre
bbd68f3a50 Rebase & Squash (#9070) 
Signed-off-by: Yodo <pierre@azmed.co>
 2024-01-02 12:05:36 -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
Vitor Savian
03532f7c0b Added runtime classes for crun/wasm/nvidia 
Signed-off-by: Vitor Savian <vitor.savian@suse.com>

Added default runtime flag

Signed-off-by: Vitor Savian <vitor.savian@suse.com>
 2023-12-08 15:49:28 -03:00
Brad Davidson
6c544a4679 Add jitter to client config retry 
Also:
* Replaces labeled for/continue RETRY loops with wait helpers for improved readability
* Pulls secrets and nodes from cache for node password verification
* Migrate nodepassword tests to wrangler mocks for better code reuse

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2023-11-16 09:53:28 -08:00
Oliver Larsson
30c8ad926d QoS-class resource configuration 
Problem:
Configuring qos-class features in containerd requres a custom containerd configuration template.

Solution:
Look for configuration files in default locations and configure containerd to use them if they exist.

Signed-off-by: Oliver Larsson <larsson.e.oliver@gmail.com>
 2023-11-14 15:53:14 -08:00
Manuel Buil
8f7a8b23b7 Improve dualStack log 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-11-14 10:50:37 +01:00
Flavio Castelli
ba5fcf13fc Wasm shims and runtimes detection 
Create a generic helper function that finds extra containerd runtimes.
The code was originally inside of the nvidia container discovery file.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

Discover the containerd shims based on runwasi that are already
available on the node.

The runtimes could have been installed either by a package manager or by
the kwasm operator.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

The containerd configuration on a Linux system now handles the nvidia
and the WebAssembly runtimes.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>

---------

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2023-11-13 14:43:41 -08:00
Texot
f575a05be2 fix: Access outer scope .SystemdCgroup (#8761) 
Signed-off-by: Texot <tete1030@gmail.com>
 2023-11-02 10:47:16 -07: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
Roberto Bonafiglia
1ffb4603cd Use IPv6 in case is the first configured IP with dualstack 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2023-10-13 10:23:31 +02:00
Roberto Bonafiglia
ced25af5b1 Fixed tailscale node IP dualstack mode in case of IPv4 only node 
Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
 2023-10-09 15:17:33 +02: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
Brad Davidson
0e5c760625 Pass SystemdCgroup setting through to nvidia runtime options 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2023-09-27 13:30:26 -07:00
Edgar Lee
fe18b1fce9 Add --image-service-endpoint flag (#8279) 
* Add --image-service-endpoint flag

Problem:
External container runtime can be set but image service endpoint is unchanged
and also is not exposed as a flag. This is useful for using containerd
snapshotters outside of the ones that have built-in support like
stargz-snapshotter.

Solution:
Add a flag --image-service-endpoint and also default image service endpoint to
container runtime endpoint if set.

Signed-off-by: Edgar Lee <edgarhinshunlee@gmail.com>
 2023-09-27 13:20:50 -07:00
Manuel Buil
cae8b2b626 Merge pull request #8346 from manuelbuil/interfaceLogs 
Include the interface name in the error message
 2023-09-25 16:50:01 +02:00
Manuel Buil
3194dc7367 Merge pull request #8284 from manuelbuil/improveFlannelLogging 
Add context to flannel errors
 2023-09-25 08:20:33 +02:00
Manuel Buil
8c197bdce4 Include the interface name in the error message 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-09-25 07:55:49 +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
Manuel Buil
d3f7632463 Fix error reporting 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-08-31 17:20:14 +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
Manuel Buil
8c38d1169d Merge pull request #8077 from manuelbuil/fixTailscale 
Fix tailscale bug with ip modes
 2023-08-02 11:42:20 +02: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
Manuel Buil
59eec78c62 Fix tailscale bug with ip modes 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-08-01 09:43:25 +02:00
Simon Kirsten
546dc247a0 Add support for {{ template "base" . }} in etc/containerd/config.toml.tmpl (#7991) 
Signed-off-by: Simon Kirsten <simonkirsten24@gmail.com>
 2023-07-31 16:36:23 -04: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
6c44b06e0a Merge pull request #7838 from manuelbuil/ipv4ipv6tailscale 
Check if we are on ipv4, ipv6 or dualStack when doing tailscale
 2023-07-06 11:11:26 +02:00
Manuel Buil
bca0adbca8 Fix code spell check 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-07-04 13:02:06 +02:00
Brad Davidson
7f50b40cfe Fall back to basic/bearer auth when node identity auth is rejected 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2023-07-03 16:20:50 -07:00
Manuel Buil
f21a01474d Check if we are on ipv4, ipv6 or dualStack when doing tailscale 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2023-07-03 10:48:59 +02:00
guoguangwu
2215870d5d chore: pkg imported more than once 
Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>
 2023-06-26 16:58:11 -07:00