public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-02 00:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,793 Commits 31 Branches 949 Tags
6d3c31adf10000ee50003bf2cedf8d3cc17f8cc1
Commit Graph

164 Commits

Author SHA1 Message Date
Hussein Galal
6d3c31adf1 [Release-1.20] Add cert rotation command (#4633) 
* 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>

* Upgrade dynamic listener

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>

Co-authored-by: Brian Downs <brian.downs@gmail.com>
 2021-12-06 19:44:57 +02:00
Chris Kim
a8382564e6 [release-1.20] Bump Kubernetes to v1.20.13-k3s1 (#4532) 
* Update to v1.20.13
* Bump sonobuoy and golang
* Change test timeout to 60m
* Bump containerd to v1.14.12-k3s1

Signed-off-by: Chris Kim <oats87g@gmail.com>
 2021-11-18 17:07:00 -08:00
Brad Davidson
a621c766f3 Bump klipper-helm version 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-22 15:06:03 -07:00
Manuel Buil
f399bd29b1 Update to flannel v0.14.1 
Signed-off-by: Manuel Buil <mbuil@suse.com>
 2021-10-22 09:05:50 +02:00
Brad Davidson
9cb5fb5716 Bump containerd to v1.4.11+k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-10-04 13:28:35 -07:00
Brad Davidson
2f9a89c8c0 Update rootless-containers 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-09-29 13:18:57 -07:00
Brad Davidson
82f7488aa1 Bump containerd to v1.4.9-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-16 13:34:08 -07:00
Brad Davidson
93c20fa4a4 Bump helm-controller to work around tiller crashes 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-13 12:57:13 -07:00
Brad Davidson
1769e7edab Bump helm-controller to v0.10.2 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-08-05 09:35:55 -07:00
Brad Davidson
f7a0256170 Bump containerd to v1.4.8-k3s1 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
 2021-07-20 15:04:49 -07:00
Hussein Galal
cd6e3ccd31 [release-1.20] - Backport K3s/RKE2 bootstrap data is encrypted with empty string if user does not supply a token (#3516) 
* 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>

* go mod vendor

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

* fix a runtime core panic

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

* update kine

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

* revert the helm controller update

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

* Fix calling delete in kine

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-07-13 22:58:58 +02:00
MonzElmasry
ef28edaf9a Update to v1.20.6 
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
 2021-04-15 21:50:35 +02:00
Brian Downs
881500d983 Merge pull request #3065 from briandowns/backport_add_etcd_backup_restore_s3-1.20 
[release-1.20] - Backport add etcd backup restore s3 1.20
 2021-04-02 14:35:12 -07:00
Jacob Blain Christen
355fff3017 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>
 2021-03-19 11:50:37 -07:00
Jacob Blain Christen
a2b1d28c68 [release 1.20] containerd: v1.4.4-k3s1 (#3086) 
Addresses k3s-io/k3s#3067 and CVE-2021-21334

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-03-17 14:37:30 -07:00
Brian Downs
1da86eaa0b 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.

Signed-off-by: Brian Downs <brian.downs@gmail.com>
(cherry picked from commit 4d1f9eda9d)
 2021-03-15 16:04:04 -07:00
Hussein Galal
b0c0d372b8 [release-1.20] Add disable components flags (#3019) 
* Add disable flags for control components (#2900)

* Add disable flags to control components

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

* golint

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 to disable flags

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

* Add comments to functions

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

* Fix joining problem

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

* more fixes

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

* golint

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

* fix ticker

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

* fix role labels

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

* more fixes

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

* remove etcd member if disable etcd is passed

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

* update dynamiclistener

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

* change error to warn when removing self from etcd members

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

* Mark disable components flags as experimental

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-03-05 00:04:48 +02:00
Hussein Galal
838a906ab5 Update to v1.20.4 (#2960) 
* Update to v1.20.4

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

* Update to v1.20.4

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
 2021-02-19 00:51:40 +02: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
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
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
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
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
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
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
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
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