Commit Graph

1767 Commits

Author SHA1 Message Date
Erik Wilson
720197b9b1
Fix linting issues 2020-08-28 17:18:29 -07:00
Erik Wilson
c1413e1c89
Update golangci-lint to v1.30.0 2020-08-28 17:18:29 -07:00
Erik Wilson
56e9ddae7d
Bump dapper to 0.5.1 2020-08-28 17:18:28 -07:00
Erik Wilson
f3a0248a03
Update vagrant for alpine 3.12 2020-08-28 17:18:28 -07:00
Erik Wilson
debf8005ca
Update for golang 1.15.0 2020-08-28 17:18:28 -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
Craig Jellick
719ffbfb27
Fix typo in MAINTAINERS 2020-08-27 11:10:51 -07:00
Brad Davidson
c4ac620b8b
Merge pull request #2159 from brandond/config_file_rename
Rename flags.conf to config.yaml
2020-08-25 21:43:48 -07:00
Brad Davidson
9687d814d7
Merge pull request #2160 from brandond/dqlite_args
Remove lingering references to dqlite
2020-08-25 21:43:09 -07:00
Brad Davidson
b4d81a9e33 Remove lingering references to dqlite
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-08-24 17:09:19 -07:00
Brad Davidson
43fcc5ddcb Rename flags.conf => config.yaml
Related to https://github.com/rancher/rke2/issues/150

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-08-24 14:56:30 -07:00
Craig Jellick
30f672b72a Add initial list of maintainers
Signed-off-by: Craig Jellick <craig@rancher.com>
2020-08-21 17:52:27 -07:00
Brad Davidson
037d8b1393
Merge pull request #2150 from brandond/fix_chartcontent
Update helm-controller
2020-08-21 13:52:09 -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
David Nuzik
87a012f18a
Merge pull request #2126 from davidnuzik/mark-v1.18.8-stable
Mark v1.18.8+k3s1 as stable
2020-08-21 09:11:53 -07:00
David Nuzik
7584964461 Mark v1.18.8+k3s1 as stable
* Change stable version from v1.18.6+k3s1 to v1.18.8+k3s1
* Note, there is an issue with upstream v1.18.7 which is why we are skipping to v1.18.8

Signed-off-by: David Nuzik <david.nuzik@rancher.com>
2020-08-21 08:47:48 -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
Brian Downs
a2471a1f8a
Merge pull request #2146 from briandowns/add_hook_for_rke2
add setup hook capabilities for rke2
2020-08-19 19:42:50 -07:00
Brian Downs
324bb55986 add ctx to hook, handle hook errors
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2020-08-19 16:54:58 -07:00
Brian Downs
fa2c1422b3 change name of variable
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2020-08-19 14:30:53 -07:00
Brian Downs
a4b2953017 add setup hook capabilities for rke2
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2020-08-19 13:42:45 -07:00
Brad Davidson
5859f83d05
Merge pull request #2142 from brandond/fix_768
Fix handling of TLS configuration args
2020-08-19 09:59:41 -07:00
Brad Davidson
79c499f0e0 Fix handling of TLS configuration args
Also fixes an unrelated error formatting issue turned up while testing.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-08-18 16:44:10 -07:00
Brad Davidson
e826439e79
Update build instructions (#2136)
* Update build instructions

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-08-18 14:34:10 -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
7508ef48d2
Merge pull request #2137 from brandond/master-v1.18.8-k3s1
Update master to v1.18.8-k3s1
2020-08-18 12:34:55 -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
Benoit Gaussen
7fb1797fd3
Create a "current" symlink to artifact dir in DataDir (#1786)
* Create a current symlink to artifact dir in DataDir

* Rename symlink to previous instead of current.prev...

Co-authored-by: Gaussen Benoît <benoit.gaussen@orange.com>
2020-08-17 22:00:51 -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
David Nuzik
da3e26a624
Merge pull request #2134 from tuananh/patch-1
Fix typo
2020-08-17 10:00:31 -07:00
Tuan Anh Tran
a1199fca6f Fix typo
Signed-off-by: Tuan Anh Tran <anh.tt@teko.vn>
2020-08-17 11:48:09 +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
Craig Jellick
186c441aa5 initial roadmap
Signed-off-by: Craig Jellick <craig@rancher.com>
2020-08-13 08:06:55 -07:00
Jacob Blain Christen
e2089bea18
cli: add --selinux flag to agent/server sub-cmds (#2111)
* cli: add --selinux flag to agent/server sub-cmds

Introduces --selinux flag to affirmatively enable SELinux in containerd.
Deprecates --disable-selinux flag which now defaults to true which
auto-detection of SELinux configuration for containerd is no longer
supported.  Specifying both --selinux and --disable-selinux will result
in an error message encouraging you to pick a side.

* Update pkg/agent/containerd/containerd.go

update log warning message about enabled selinux host but disabled runtime

Co-authored-by: Brad Davidson <brad@oatmail.org>
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-08-11 16:17:32 -07:00
Brad Davidson
4a68698014
Merge pull request #2104 from brandond/update_helm-controller
Update helm-controller
2020-08-10 23:54:52 -07:00
Jacob Blain Christen
89b9dde3c2
Merge pull request #2109 from dweomer/go1.13.15
golang: 1.13.15
2020-08-10 16:11:30 -07:00
Jacob Blain Christen
3f8c94254a golang: 1.13.15
- https://github.com/golang/go/issues?q=milestone%3AGo1.13.15+label%3ACherryPickApproved

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-08-10 15:39: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
Erik Wilson
026584e1f7
Merge pull request #2103 from brandond/fix_2102
Fix removal of /run directories
2020-08-07 11:49:58 -07:00
Brad Davidson
0291bd770e Fix removal of /run directories
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2020-08-07 11:13:04 -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
Craig Jellick
4aaebd35f6 etcd mgmt is a work in progress 2020-08-07 10:21:54 -07:00
Craig Jellick
dbf59b46f2
Clarify K3s's positioning, goals, intentions, and components 2020-08-07 09:56:50 -07:00
Thorsten Klein
cf8c101b70
registry template: add insecure_skip_verify field
Signed-off-by: Thorsten Klein <iwilltry42@gmail.com>
2020-08-06 08:02:08 +02:00
Brad Davidson
9137c45cdb
Merge pull request #1614 from sen-subhabrata/master
install.sh: cleanup /run on uninstall
2020-08-05 11:26:21 -07:00
Brad Davidson
3f2551ec05
Merge pull request #1848 from euank/insecure-on-lo
Listen insecurely on localhost only
2020-08-05 10:55:09 -07:00
Brad Davidson
d11570fbdb
Merge pull request #2096 from AkihiroSuda/bump-up-rootlesskit
update rootlesskit to v0.10.0
2020-08-05 10:31:17 -07:00
Euan Kemp
4808c4e7d5 Listen insecurely on localhost only
Before this change, k3s configured the scheduler and controller's
insecure ports to listen on 0.0.0.0. Those ports include pprof, which
provides a DoS vector at the very least.

These ports are only enabled for componentstatus checks in the first
place, and componentstatus is hardcoded to only do the check on
localhost anyway (see
https://github.com/kubernetes/kubernetes/blob/v1.18.2/pkg/registry/core/rest/storage_core.go#L341-L344),
so there shouldn't be any downside to switching them to listen only on
localhost.
2020-08-05 10:28:11 -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