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

328 Commits (80f909d0caaae22b0e937834350c78b48a5e0615)

Author SHA1 Message Date
Brad Davidson ce5b9347c9 Replace DefaultProxyDialerFn dialer injection with EgressSelector support 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-29 17:54:36 -07:00
Brad Davidson c9badb4fd7 Bump kine to v0.9.1 for nats.io support 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-29 10:50:14 -07:00
Brad Davidson 418c3fa858
Fix issue with datastore corruption on cluster-reset (#5515) 
* Bump etcd to v3.5.4-k3s1
* Fix issue with datastore corruption on cluster-reset
* Disable unnecessary components during cluster reset

Disable control-plane components and the tunnel setup during
cluster-reset, even when not doing a restore. This reduces the amount of
log clutter during cluster reset/restore, making any errors encountered
more obvious.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-27 13:44:15 -07:00
Brad Davidson 2a999e5c20
Bump containerd for selinux fix (#5507) 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-25 14:22:04 -07:00
Derek Nola 93f9562272
Update Kubernetes to v1.23.6 (#5477) 
* Go generate
* Update tags to k3s-io for v1.23.6

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-04-21 08:53:26 -07:00
Brad Davidson 7760e2177a Bump etcd to 3.5.3-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-15 01:53:18 -07:00
Brad Davidson f4336186f3 Bump containerd to v1.5.11-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-04-14 15:13:31 -07:00
Manuel Buil 5a024cb91d Update helm-controller version 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-04-08 12:01:42 +02:00
Michal Rostecki c707948adf netpol: Add dual-stack support 
This change allows to define two cluster CIDRs for compatibility with
Kubernetes dual-stuck, with an assumption that two CIDRs are usually
IPv4 and IPv6.

It does that by levearaging changes in out kube-router fork, with the
following downstream release:

https://github.com/k3s-io/kube-router/releases/tag/v1.3.2%2Bk3s

Signed-off-by: Michal Rostecki <vadorovsky@gmail.com>
 2022-04-06 14:43:09 +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
Brad Davidson 542771151c Update Kubernetes to v1.23.5-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-18 14:02:17 -07:00
ShylajaDevadiga 7f067d7fcd
Refactor automation using terraform (#5268) 
Signed-off-by: Shylaja Devadiga <shylaja.devadiga@suse.com>
 2022-03-18 13:03:45 -07:00
Brad Davidson a93b9b6d53 Update helm-controller 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-16 23:49:14 -07:00
Brad Davidson 66e350ea88 Track upstream changes to kubectl command execution 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-16 17:19:18 -07: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
Brad Davidson 04c39ba621 Bump containerd to v1.5.10-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-03-02 17:47:17 -08: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
Brad Davidson e4846c92b4 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>
 2022-03-01 20:25:20 -08:00
Kohei Tokunaga 7f4aa59014
Bump up github.com/containerd/stargz-snapshotter (v0.11.0) (#5032) 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2022-02-28 17:11:46 -08:00
Hussein Galal 43b1cb4820
Update to V1.23.4 k3s1 (#5135) 
* Update to v1.23.4

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

* Upgrade treafik to 2.6.1

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

* Upgrade treafik to 2.6.1

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

* Upgrade treafik image in image-list

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

* Update kubernetes

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2022-02-22 18:57:22 +02:00
Brad Davidson feb6feeaec Fix deploy controller resource deletion 
Update Wrangler to resolve issue with deleting owned resources.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-02-11 15:51:44 -08:00
Derek Nola e28be2912c
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>
 2022-02-09 08:22:53 -08:00
Michal Rostecki 4fed9f4052 netpol: Use kube-router as a library 
Before this change, we were copying a part of kube-router code to
pkg/agent/netpol directory with modifications, from which the biggest
one was consumption of k3s node config instead of kube-router config.

However, that approach made it hard to follow new upstream versions.
It's possible to use kube-router as a library, so it seems like a better
way to do that.

Instead of modifying kube-router network policy controller to comsume
k3s configuration, this change just converts k3s node config into
kube-router config. All the functionality of kube-router except netpol
is still disabled.

Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-02-07 10:54:08 +01:00
Manuel Buil 3fffef18fa Update versions: 
* K3S_ROOT
* FLANNEL
* CNI_PLUGINS

Signed-off-by: Manuel Buil <mbuil@suse.com>
 2022-01-31 20:19:37 +01:00
Derek Nola 5fb370e53e
Update to v1.23.3 (#5027) 
* Update to v1.23.3

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

* Update tags to k3s-io for v1.23.3

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-01-26 12:47:56 -08:00
Derek Nola fc8309a46c
Update to v1.23.2 (#4997) 
* Update to v1.23.2

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

* Update tags to k3s-io for v1.23.2

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-01-20 11:06:38 -08:00
Brad Davidson c08d394994 Bump etcd and containerd to track upstream 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2022-01-14 13:33:43 -08:00
Derek Nola 2ac8df3602
Integration tests utilities improvements (#4832) 
* Remove sudo commands from integration tests

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

* Added cleanup fucntion

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

* Implement better int cleanup

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

* Rename test utils

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

* Enable K3sCmd to be a single string

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

* Removed parsePod function

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

* codespell

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

* Revert startup timeout

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

* Reorder sonobuoy tests, drop concurrent tests to 3

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

* Disable etcd

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

* Skip parallel testing for etcd

Signed-off-by: Derek Nola <derek.nola@suse.com>
 2022-01-06 08:05:56 -08:00
Brad Davidson 87395e32d6 Update modules for Kubernetes v1.23 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-22 10:47:38 -08:00
Luther Monson e6cf8f5982 code changes to drop the vendor dir 
Signed-off-by: Luther Monson <luther.monson@gmail.com>
 2021-12-21 14:23:38 -07:00
Brad Davidson 6f4217a340 Build standalone containerd 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-16 12:00:15 -08:00
Brad Davidson e8a30a87c8 Bump runc to v1.0.3 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-08 15:16:02 -08:00
Brad Davidson 7d3447ceff Bump wharfie to v0.5.1 and use shared decompression code 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-07 12:50:57 -08:00
Brad Davidson 05d43278e2 bump kine to v0.8.1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-07 12:17:01 -08:00
Brad Davidson 3b6a3fe905 Update dynamiclistener 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-12-07 11:57:45 -08:00
Hussein Galal 77fd3e99ec
Add cert rotation command (#4495) 
* Add cert rotation command

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

* add function to check for dynamic listener file

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* Add dynamiclistener cert rotation support

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

* fixes to the cert rotation

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

* fix ci tests

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

* fixes to certificate rotation command

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

* more fixes

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

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-12-02 23:19:16 +02:00
Chris Kim d93c82f958
[master] Bump golang and containerd (#4538) 
* Increase test timeout to 60m
* Bump golang to v1.16.10
* Bump sonobuoy to v0.55.0
* Bump containerd to v1.5.8-k3s1

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 18:29:21 -08:00
Chris Kim 65110a4eec
[master] Bump Kubernetes to v1.22.4-k3s1 (#4536) 
* Update to v1.22.4

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 13:12:20 -08:00
Luther Monson 36c6634cce
[master] updating to new signals package in wrangler (#4399) 
* updating to new signals package in wrangler

Signed-off-by: Luther Monson <luther.monson@gmail.com>
 2021-11-08 08:32:43 -07:00
Jacob Blain Christen 86c6924119
containerd: v1.5.7-k3s2 (#4387) 
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-11-03 03:58:36 +02:00
Hussein Galal 91cf835ec3
Update to v1.22.3 (#4354) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-10-29 17:14:24 +02:00
Brad Davidson 02a314c69a Bump klipper-helm version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-22 14:28:12 -07:00
Manuel Buil 6e410fad49 Update to the newest flannel 
Fixes issues such as the internode connectivity

Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-20 14:32:39 +02:00
Brad Davidson b5b7033afd Bump klog fork version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-19 10:16:13 -07:00
Brad Davidson e24e1332fd Bump containerd to v1.5.7+k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-04 12:42:05 -07:00
Brad Davidson 77dfdda909 Update Kubernetes to v1.22.2-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-16 15:48:29 -07: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 5e0fae914f Bump helm-controller and klipper-helm image version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-15 00:09:22 -07:00
Chris Kim 928b8531c3
[master] Add `etcd-member-management` controller to K3s (#4001) 
* Initial leader elected etcd member management controller
* Bump etcd to v3.5.0-k3s2

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-09-14 08:20:38 -07:00
Brad Davidson 699ea16523 go mod tidy 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-10 17:04:15 -07: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
Kohei Tokunaga 8b857eef9c
Ship Stargz Snapshotter (#2936) 
* Ship Stargz Snapshotter

Signed-off-by: ktock <ktokunaga.mail@gmail.com>

* Bump github.com/containerd/stargz-snapshotter to v0.8.0

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2021-09-01 16:27:42 -07:00
Brad Davidson b8add39b07 Bump kine for metrics/tls changes 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-01 01:51:30 -07:00
Akihiro Suda c23e63aeea
Update RootlessKit to v0.14.5 (#3902) 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-08-25 07:28:59 -07:00
Brad Davidson dc14f370c4 Update wrangler to v0.8.5 
Required to support apiextensions.v1 as v1beta1 has been deleted. Also
update helm-controller and dynamiclistener to track wrangler versions.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson 641ab26fde Update containerd to 1.5 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson 16616c6b90 Update grpc 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson 54a7c860c7 Update kine for etcd v3.5 compat 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson 872855015c Update etcd to v3.5.0 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson e204d863a5 Update Kubernetes to v1.22.1 
* Update Kubernetes to v1.22.1
* Update dependent modules to track with upstream

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-20 18:47:16 -07:00
Brad Davidson 8e90c56f5c Update Kubernetes to v1.21.4-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-16 14:11:52 -07:00
Brad Davidson 544cf406aa Bump containerd to v1.4.9-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-16 13:33:41 -07:00
Brad Davidson a1097984c0 Bump helm-controller to work around tiller crashes 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-13 12:40:41 -07:00
Brad Davidson 338f9cae3f Bump helm-controller to v0.10.2 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-05 09:54:34 -07:00
Derek Nola 21c8a33647
Introduction of Integration Tests (#3695) 
* Commit of new etcd snapshot integration tests.
* Updated integration github action to not run on doc changes.
* Update Drone runner to only run unit tests

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-07-26 09:59:33 -07:00
Chris Kim c5832c1128 Bump Kubernetes to v1.21.3 
* Bump golang to 1.16.6
* Update to v1.21.3

Signed-off-by: Chris Kim <oats87g@gmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9c981b0184)
 2021-07-20 16:08:41 -07:00
Brad Davidson b352d73511 Bump containerd to v1.4.8-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-07-20 15:44:06 -07:00
Chris Kim ad28d18b19
Bump helm-controller to v0.10.1 (#3644) 
Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-07-15 11:31:44 -07:00
William Zhang a4c992ce52 🐳 burp to inetaf/tcpproxy 
Problem:
    tcpproxy repository has been moved out of the github.com/google org to github.com/inetaf.

    Solution:
    Switch to the new repo.
    FYI: https://godoc.org/inet.af/tcpproxy/

Signed-off-by: William Zhang <warmchang@outlook.com>
 2021-07-08 16:58:09 -07:00
Derek Nola 73df2d806b
Update embedded kube-router (#3557) 
* Update embedded kube-router

Signed-off-by: dereknola <derek.nola@suse.com>
 2021-07-07 08:46:10 -07:00
Derek Nola 8faa70dced Update to v1.21.2 
Signed-off-by: dereknola <derek.nola@suse.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5a67e8dc47)
 2021-07-02 08:59:16 -07:00
Brad Davidson 246b378a27 Bump kine to resolve race condition and unrevisioned delete 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-06-30 09:54:46 -07:00
Jamie Phillips 82394d7d36 Basic windows agent that will join a cluster without CNI. 
Signed-off-by: Jamie Phillips <jamie.phillips@suse.com>
 2021-06-23 09:07:50 -07:00
Hussein Galal 136dddca11
Fix storing bootstrap data with empty token string (#3422) 
* Fix storing bootstrap data with empty token string

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

* delete node password secret after restoration

fixes to bootstrap key

vendor update

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

* fix comment

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

* fix typo

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

* more fixes

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

* fixes

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

* fixes

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

* typos

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

* Removing dynamic listener file after restoration

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

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-06-22 22:42:34 +02:00
Manuel Buil d415e41337 Update flannel version 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-06-01 19:21:15 +02:00
Jacob Blain Christen cb25835d84 containerd: v1.4.4-k3s2 
Pull in backport of containerd/containerd#5017

Addresses #3296

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
 2021-05-20 11:37:37 -07:00
Brad Davidson 7e175e8ad4 Handle conntrack-related sysctls in supervisor agent setup 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-05-18 13:40:44 -07:00
Erik Wilson 70430b53a8
Update Kubernetes to v1.21.1-k3s1 2021-05-14 10:12:55 -07:00
Jacob Blain Christen 0d05b14b71
runc: v1.0.0-rc94 (#3305) 
- bump the runc version to v1.0.0-rc94
- build runc from its own source tree instead of from ./vendor/
  - side-steps incompatibility with upstream kubelet container manager

Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
 2021-05-12 11:50:24 -07:00
Brad Davidson 02a5bee62f
Add system-default-registry support and remove shared code (#3285) 
* Move registries.yaml handling out to rancher/wharfie
* Add system-default-registry support
* Add CLI support for kubelet image credential providers

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-05-10 15:58:41 -07:00
Brad Davidson 2705431d96
Add support for dual-stack Pod/Service CIDRs and node IP addresses (#3212) 
* Add support for dual-stack cluster/service CIDRs and node addresses

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-21 15:56:20 -07:00
Brad Davidson 4fbc241679 Update to forked protobuf 1.4.3-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-14 14:51:42 -07:00
Brad Davidson e8381db778 Update Kubernetes to v1.21.0 
* Update Kubernetes to v1.21.0
* Update to golang v1.16.2
* Update dependent modules to track with upstream
* Switch to upstream flannel
* Track changes to upstream cloud-controller-manager and FeatureGates

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-04-14 14:51:42 -07:00
Jacob Blain Christen 93b18b343a Update to Kubernetes v1.20.5 (#3094) 
* Update to Kubernetes v1.20.5
* vendor: bumps for some containerd deps
* go: bump to 1.16.2 for arm

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
(cherry picked from commit 355fff3017)
 2021-03-31 14:18:41 -07:00
Akihiro Suda cb73461a5b AkihiroSuda/containerd-fuse-overlayfs -> containerd/fuse-overlayfs-snapshotter 
The repo has been moved.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-24 10:34:34 -07:00
Akihiro Suda 11ef43011a bump up RootlessKit 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2021-03-24 00:37:30 -07:00
Jacob Blain Christen 59a39e9a3b
containerd: v1.4.4-k3s1 (#3090) 
Addresses k3s-io/k3s#3066 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-17 14:38:42 -07:00
Jacob Blain Christen 618b0f98bf
registry mirror repository rewrites (#3064) 
Support repository regex rewrite rules when fetching image content.

Example configuration:
```yaml
# /etc/rancher/k3s/registries.yaml
mirrors:
  "docker.io":
    endpoint:
    - "https://registry-1.docker.io/v2"
    rewrite:
      "^library/alpine$": "my-org/alpine"
```

This will instruct k3s containerd to fetch content for `alpine` images
from `docker.io/my-org/alpine` instead of the default
`docker.io/library/alpine` locations.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-15 16:17:27 -07:00
Brad Davidson 7cdfaad6ce
Always use static ports for client load-balancers (#3026) 
* Always use static ports for the load-balancers

This fixes an issue where RKE2 kube-proxy daemonset pods were failing to
communicate with the apiserver when RKE2 was restarted because the
load-balancer used a different port every time it started up.

This also changes the apiserver load-balancer port to be 1 below the
supervisor port instead of 1 above it. This makes the apiserver port
consistent at 6443 across servers and agents on RKE2.

Additional fixes below were required to successfully test and use this change
on etcd-only nodes.

* Actually add lb-server-port flag to CLI
* Fix nil pointer when starting server with --disable-etcd but no --server
* Don't try to use full URI as initial load-balancer endpoint
* Fix etcd load-balancer pool updates
* Update dynamiclistener to fix cert updates on etcd-only nodes
* Handle recursive initial server URL in load balancer
* Don't run the deploy controller on etcd-only nodes
 2021-03-06 02:29:57 -08:00
Brian Downs 4d1f9eda9d
Etcd Snapshot/Restore to/from S3 Compatible Backends (#2902) 
* Add functionality for etcd snapshot/restore to and from S3 compatible backends.
* Update etcd restore functionality to extract and write certificates and configs from snapshot.
 2021-03-03 11:14:12 -07:00
galal-hussein 885b7391a2 update dynamiclistener 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-03-01 23:51:07 +02:00
galal-hussein fad2a046c3 update master to 1.20.4 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-02-23 23:31:08 -08:00
Brad Davidson 6c472b5942 Use zstd instead of gzip for embedded tarball 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-02-08 21:08:35 -08:00
Brad Davidson 740b654d47 Update containerd to fix AppArmor on SLES 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-29 16:33:33 -08:00
Brad Davidson 1d4adb0301 Update Kubernetes to v1.20.2-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-13 21:31:53 -08:00
Brad Davidson 26d45287b6
Update helm-controller to v0.8.3 (#2793) 
* Update helm-controller to v0.8.3
* Update klipper-helm image

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-01-11 12:09:39 -08:00
Brad Davidson d13f7fabd6 Fix incorrect kubernetes replacement fork in go.mod 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-12-16 14:35:11 -08:00
Brad Davidson c6950d2cb0 Update Kubernetes to v1.20.0-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-12-08 22:51:34 -08:00
Hussein Galal 989c936993
update etcd to fix the panic for etcd tombstone issue (#2658) 
* update etcd

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

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2020-12-09 01:06:37 +02:00
Hussein Galal fadc5a8057
Add tombstone file to etcd and catch errc etcd channel (#2592) 
* Add tombstone file to embedded etcd

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

* go mod update

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

* fixes

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

* more fixes

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

* more changes

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

* gofmt and goimports

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

* go mod update

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

* go lint

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

* go lint

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

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2020-12-07 22:30:44 +02:00
Jacob Blain Christen 47019226bb
containerd: v1.4.3-k3s1 (#2631) 
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-07 10:02:56 -07:00
Akihiro Suda 05f6255437 add fuse-overlayfs snapshotter (mainly for rootless mode) 
Ubuntu and Debian kernels support mounting real overlayfs inside userns,
but the vanilla kernel still does not allow it.

OTOH fuse-overlayfs can be mounted inside userns with the vanilla kernel (>= 4.18).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-12-01 11:00:00 -08:00
Jacob Blain Christen 3647654fe4
[migration k3s-io] update helm-controller dependency (#2569) 
rancher/helm-controller ➡️ k3s-io/helm-controller

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-01 08:59:10 -07:00
Jacob Blain Christen b4a51f2b9a
[migration k3s-io] update flannel and go-powershell replace directives (#2576) 
rancher/flannel ➡️ k3s-io/flannel
rancher/go-powershell ➡️ k3s-io/go-powershell

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-01 08:12:18 -07:00
Jacob Blain Christen 898fd0848f
[migration k3s-io] update etcd replace directive (#2578) 
rancher/etcd ➡️ k3s-io/etcd

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-12-01 08:08:58 -07:00
Akihiro Suda 0b45e32486 Support cgroup v2 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-11-30 22:57:37 -08:00
Jacob Blain Christen 36230daa86
[migration k3s-io] update kine dependency (#2568) 
rancher/kine ➡️ k3s-io/kine

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-30 16:45:22 -07:00
Jacob Blain Christen cc32e2f9a0
[migration k3s-io] update containerd, cri, and cri-tools replace directives (#2591) 
- rancher/cri ➡️ k3s-io/cri
- rancher/cri-tools ➡️ k3s-io/cri-tools
- rancher/containerd ➡️ k3s-io/containerd

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-30 10:40:54 -07:00
Jacob Blain Christen f88d93db37
[migration k3s-io] go.mod replace kubernetes/kubernetes (#2567) 
This change set replaces these go.mod replacement directives with references to k3s-io repositories.

- rancher/kubernetes
- rancher/nocode

Part of https://github.com/rancher/k3s/issues/2189

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-30 09:39:38 -07:00
Brad Davidson 5896fb06c2 Update Kubernetes to v1.19.4-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-11-18 15:25:39 -08:00
Brad Davidson ea312a303e Update kine to v0.5.1 for compact fix 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-11-12 19:46:22 -08:00
Jacob Blain Christen 2c666af483
cri: pull in updated /dev/shm fix (#2506) 
Do not relabel container /dev/shm when it is host /dev/shm.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-11 17:08:59 -07:00
Jacob Blain Christen ce5c8efbcf
cri: bump to updated fork (#2478) 
Addresses rancher/k3s#2240

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-11-09 10:19:00 -07:00
Brad Davidson 7a5a9033a7 Update kine to v0.5.0 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-10-28 13:03:47 -07:00
Brad Davidson 03f05f9337 Update Kubernetes to v1.19.3-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-10-16 13:18:59 -07:00
Brian Downs 299fe83a1f update kine to v0.4.1 
Signed-off-by: Brian Downs <brian.downs@gmail.com>
 2020-10-15 10:34:24 -07:00
MonzElmasry 302fd26f50
bump k8s version to v1.19.2 on master 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2020-09-21 22:21:25 +02:00
Hussein Galal beab211685
update etcd to use rancher fork (#2238) 
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2020-09-12 01:13:27 +02:00
Brad Davidson 617b34c588 Update golang to 1.15.2 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-09-11 11:52:03 -07:00
Hussein Galal 041f18f6da
pin down grpc and related library in go.mod (#2222) 
* pin down grpc and related library in go.mod

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

* go mod tidy

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2020-09-10 00:08:21 +02:00
Brad Davidson 698cd2373f Update to v1.19.1-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-09-09 11:32:29 -07:00
Brad Davidson 8d5f58f00e
Merge pull request #2195 from brandond/rke2_271 
Update helm-controller
 2020-09-02 12:17:40 -07:00
Brad Davidson 733d26816a Update helm-controller 
Related to https://github.com/rancher/rke2/issues/271

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-09-02 10:17:04 -07:00
Darren Shepherd 0c29005bb3 Update vendor 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2020-08-29 21:44:18 -07:00
Darren Shepherd ae5c585050 Revert "Add config file support" 
This reverts commit e1dc3451bc.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2020-08-29 21:44:07 -07:00
Erik Wilson 447097a597
Merge pull request #2098 from erikwilson/k8s-1.19 
Update to k8s 1.19
 2020-08-28 18:22:15 -07:00
Erik Wilson daa4beb22c
Update go.mod for k8s 1.19 2020-08-28 17:18:31 -07:00
Brian Downs 866dc94cea
Galal hussein etcd backup restore (#2154) 
* Add etcd snapshot and restore

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

* fix error logs

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

* goimports

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

* fix flag describtion

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

* Add disable snapshot and retention

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

* use creation time for snapshot retention

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

* unexport method, update var name

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* adjust snapshot flags

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update var name, string concat

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* revert previous change, create constants

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* updates

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* type assertion error checking

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* pr remediation

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* pr remediation

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* pr remediation

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* pr remediation

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* pr remediation

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* updates

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* updates

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* simplify logic, remove unneeded function

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update flags

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update flags

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* add comment

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* exit on restore completion, update flag names, move retention check

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* exit on restore completion, update flag names, move retention check

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* exit on restore completion, update flag names, move retention check

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update disable snapshots flag and field names

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* move function

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update field names

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update var and field names

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update var and field names

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update defaultSnapshotIntervalMinutes to 12 like rke

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update directory perms

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update etc-snapshot-dir usage

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update interval to 12 hours

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* fix usage typo

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* add cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* add cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* add cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* wire in cron

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update deps target to work, add build/data target for creation, and generate

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* remove dead make targets

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* error handling, cluster reset functionality

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* error handling, cluster reset functionality

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* update

Signed-off-by: Brian Downs <brian.downs@gmail.com>

* remove intermediate dapper file

Signed-off-by: Brian Downs <brian.downs@gmail.com>

Co-authored-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2020-08-28 16:57:40 -07:00
Frederick F. Kautz IV cdce2b7e9a
Add support for compressed images when pre-loading images (#2165) 
* Add support for compressed images when pre-loading images

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>

* attempting to fix vendor source being dirty

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>

* fixing file extension for .tar.lz4

Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
 2020-08-28 12:27:01 -07:00
Brad Davidson ee7399ae27 Update helm-controller 
Related to https://github.com/rancher/rke2/issues/218

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-21 12:23:07 -07:00
Brad Davidson c980fa68a0
Update helm-controller for HelmChartConfig CRD (#2114) 
* Update helm-controller for HelmChartConfig CRD

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-20 14:23:50 -07:00
Brad Davidson 4e990b408c
Merge pull request #2100 from brandond/update_dynamiclistener 
Update dynamiclistener
 2020-08-18 12:35:47 -07:00
Brad Davidson b1d017f892 Update dynamiclistener 
Second round of fixes for #1621

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-18 10:38:47 -07:00
Brad Davidson 89c03794c8 Update master to v1.18.8-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-17 14:24:39 -07:00
Jacob Blain Christen 4db4171808 helm-controller: bring in a fix for tolerations 
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-08-16 03:06:36 -07:00
Brad Davidson 30345b6974 Update helm-controller 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-07 12:17:58 -07:00
Jacob Blain Christen 97ff5affab
Merge pull request #2065 from dweomer/containerd/v1.3.6-selinux 
updated containerd/cri selinux support
 2020-08-07 11:09:28 -07:00
Akihiro Suda a70cdac356
update rootlesskit to v0.10.0 
Fix intermittent "Connection reset by peer" error during port forwarding

https://github.com/rootless-containers/rootlesskit/issues/153

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-08-05 18:22:05 +09:00
Brad Davidson 3e8141dc65 Update dynamiclistener 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-08-04 13:05:37 -07:00
Brad Davidson 1eec7348a5 Call setproctitle to conceal node args in ps output 
This is related to #2014.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-28 15:49:49 -07:00
Jacob Blain Christen 371bee82f9 containerd: bump to v1.3.6 
Remove $NOTIFY_SOCKET, if present, from env when invoking containerd to
prevent gratuitous notifications sent to systemd.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2020-07-27 14:41:52 -07:00
Brad Davidson 1de58904ad Update flannel to v0.12.0-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-20 13:18:46 -07:00
Brad Davidson 206accbe8d
Update to v1.18.6-k3s1 (#2035) 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2020-07-18 01:14:37 +02:00
Erik Wilson e1dc3451bc
Add config file support 2020-07-10 10:34:00 -07:00
Erik Wilson a535d13df4
Replace juju/errors with nocode 2020-06-30 13:46:20 -07:00
Hussein Galal 7f9bf0b6d4
update k8s to 1.18.4 (#1945) 2020-06-24 00:12:14 +02:00
Hussein Galal 01035ba9df
Update helm controller to 0.6.3 (#1931) 
* update helm controller to 0.6.3

* update klipper-helm to v0.2.7
 2020-06-21 19:12:54 +02:00
galal-hussein 42eef33d85 update helm and vendor update 2020-06-08 20:41:37 +02:00
Darren Shepherd 5f26de74c2
Merge pull request #1871 from galal-hussein/update_helm_2 
upgrade helm to v0.6.1
 2020-06-08 10:47:38 -07:00
galal-hussein ac7eaea9ea upgrade helm to v0.6.1 2020-06-08 18:45:47 +02:00