Commit Graph

355 Commits (4f9483b8ae28bb0669da35b6e898a81fe57860b4)

Author SHA1 Message Date
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
Darren Shepherd f4ff2bf3a8 Update vendor 2020-06-06 22:38:12 -07:00
Darren Shepherd 6b5b69378f Add embedded etcd support
This is replaces dqlite with etcd.  The each same UX of dqlite is
followed so there is no change to the CLI args for this.
2020-06-06 16:39:41 -07:00
Erik Wilson f1a01f4afb Update k8s 1.18.3 2020-05-26 15:59:35 -07:00
Jacob Blain Christen 4949da46f1 runc: bump to rc10
- [CVE-2019-19921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19921)

See https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc10
2020-05-04 18:11:25 -07:00
Erik Wilson cafd10eb50 Upgrade helm-controller v0.6.0 2020-05-04 17:27:21 -07:00
Erik Wilson a013f7dda5
Merge pull request #1740 from erikwilson/bump-cri
Bump cri to 1.3.0-k3s6
2020-05-04 10:39:58 -07:00
Erik Wilson e0bf7a053a Bump cri to 1.3.0-k3s6 2020-05-04 10:11:48 -07:00
galal-hussein dae4a92091 update dqlite-build and kine 2020-04-23 22:34:44 +02:00
galal-hussein 30b1fb0e98 kine update 2020-04-23 00:46:46 +02:00
galal-hussein 94da8b8e12 update helm-controller 2020-04-23 00:34:19 +02:00
Erik Wilson 3986b4787f Update to k8s 1.18.2 2020-04-19 08:46:09 -07:00
Darren Shepherd 53ed13bf29 Update vendor 2020-04-18 23:59:08 -07:00
loganhz 48eb3d8111 Update docker vendor 2020-04-10 17:27:02 +08:00
Erik Wilson b6cb8149c0 Bump cri to 1.3.0-k3s.5 2020-03-20 15:06:53 -07:00
Erik Wilson dacd8545c4 Update k8s to v1.17.4-k3s1 2020-03-16 17:12:21 -07:00
Darren Shepherd 124def22ed Update vendor 2020-02-24 16:03:11 -07:00
Erik Wilson 4210800648
Merge pull request #1343 from ibuildthecloud/rootless
Create pidns for rootless
2020-02-24 15:05:52 -07:00
Darren Shepherd fb2ab1b408 Fix kine HA compaction
In HA the compaction in kine will get stuck.  This change fixes
and also fixes the corrupt data.
2020-02-14 14:16:06 -07:00
Erik Wilson d86446d737 Update k8s to v1.17.3 2020-02-13 17:18:16 -07:00
Darren Shepherd 8c9ed8e197 Bump rootlesskit 2020-01-31 21:41:27 -07:00
Erik Wilson 38c3bbcc53 Fixup cri-tools location 2020-01-22 09:32:39 -07:00
Erik Wilson e64cc18c8c Bump kine to v0.3.4 2020-01-21 16:57:50 -07:00
Erik Wilson 10314e76be Bump kubernetes to v1.17.2-k3s1 2020-01-21 14:48:34 -07:00
Erik Wilson a07369fcb9
Merge pull request #1331 from erikwilson/bump-cri-tools
Bump cri-tools to v1.17.0-k3s1
2020-01-21 11:48:17 -07:00
Erik Wilson d6370d9bfb Bump helm-controller to v0.4.1 2020-01-21 11:47:22 -07:00
Erik Wilson 5bc3065339 Bump cri-tools to v1.17.0-k3s1 2020-01-21 11:14:47 -07:00
Erik Wilson 4c08a74b8b
Merge pull request #1300 from galal-hussein/k3s-1.17
Update k8s to v1.17.1
2020-01-20 16:50:06 -07:00
Erik Wilson fa5385e3ee
Merge pull request #1323 from erikwilson/upgrade-containerd
Upgrade containerd to v1.3.3-k3s1
2020-01-20 16:49:30 -07:00
Erik Wilson 686768eacf
Merge pull request #1321 from erikwilson/upgrade-kine
Upgrade kine to v0.3.3
2020-01-20 16:17:44 -07:00
Erik Wilson 39d146bb90 Upgrade containerd to v1.3.3-k3s1 2020-01-20 16:17:03 -07:00
Erik Wilson ab0dfa676e Upgrade kine v0.3.3 2020-01-20 15:43:58 -07:00
Erik Wilson f6d2239643 Upgrade go-dqlite to v1.3.0 2020-01-20 15:33:17 -07:00
galal-hussein 9372050c63 Update k8s to v1.17.1 2020-01-15 19:39:10 +02:00
galal-hussein 8f8cfd102c upgrade helm image 2019-12-23 22:12:42 +02:00
galal-hussein b624e3631a Update helm controller and vendor udpate 2019-12-19 23:12:48 +02:00
galal-hussein ab273a7f1c update helm controller 2019-12-18 19:12:06 -07:00
Erik Wilson b43c8e4574
Merge pull request #1213 from erikwilson/containerd-patch-3889
Apply containerd patch 3889
2019-12-17 22:55:26 -07:00
Erik Wilson 52c8e8d5c5 Containerd patch 3889 2019-12-17 21:13:52 -07:00
Darren Shepherd 1004f5b0be Update vendor for kine fix 2019-12-17 09:01:32 -07:00
Darren Shepherd b329c6fac2 Update vendor 2019-12-16 11:45:21 -07:00
Erik Wilson 5a2cc21094 Update go mod for k8s 1.17.0 2019-12-15 23:28:19 -07:00
Darren Shepherd 1ad4765353 Bump kine/k8s to fix broken label based pagination 2019-11-18 18:48:42 +00:00
Darren Shepherd 59177e58b7 Bump dynamiclistener to support RSA keys 2019-11-15 21:51:51 -07:00
Erik Wilson 82702a2a64 Bump k8s to v1.16.3-k3s.1 2019-11-14 11:56:24 -07:00
Darren Shepherd 4018a64c43 Ensure that revision is consistent for empty lists 2019-11-14 05:17:50 +00:00
Darren Shepherd 19e64c8869 Bump kine to fix too many conflicts on mysql 2019-11-13 18:53:05 -07:00
Darren Shepherd 0a06949b9c Update kine/dynamiclistener 2019-11-13 14:49:54 +00:00
Darren Shepherd f3b1ba7fe9 Update go-dqlite to remove panic and newer go-sqlite3 2019-11-12 08:22:48 +00:00
Darren Shepherd 840c5911ac Update to kine v0.2.1 2019-11-12 01:12:24 +00:00
Darren Shepherd b3336f69cf Update kine and dynamiclistener 2019-11-10 04:05:59 +00:00
Darren Shepherd b67b62478b Update dynamiclistener 2019-11-08 21:42:47 +00:00
galal-hussein a90225dfad update kine and move to rancher/kine 2019-11-08 01:05:40 +02:00
Erik Wilson 5d342a3051
Merge pull request #995 from ibuildthecloud/master
Refactor tokens, bootstrap, and cli args
2019-11-04 14:24:00 -07:00
Darren Shepherd 6290029e6d kine v0.1.1 2019-11-01 17:08:59 -07:00
Darren Shepherd 69949dda0a Update vendor 2019-10-30 19:22:22 -07:00
Erik Wilson b576abf32d Bump cri to include local http registry fix 2019-10-30 16:41:56 -07:00
Erik Wilson 61eb7fa635 Set required go version to 1.12 or later in go.mod 2019-10-27 08:39:20 -07:00
Erik Wilson 0cc172e8bf Bump containerd version to v1.3.0-k3s.4 2019-10-25 13:12:43 -07:00
Erik Wilson f9888ca3bb
Merge pull request #933 from erikwilson/bump-cri
Bump containerd, cri, & cri-tools
2019-10-22 13:53:48 -07:00
Erik Wilson 6a9d8b3ad1 Bump containerd, cri, & cri-tools 2019-10-22 10:26:07 -07:00
Erik Wilson da3a7c6bbc Add network policy controller 2019-10-18 16:11:42 -07:00
Erik Wilson eda8319841 Upgrade k8s to v1.16.2-k3s.1 2019-10-16 16:45:18 -07:00
galal-hussein 9961b1a625 Vendor Update 2019-10-15 23:17:17 +02:00
Erik Wilson c12d2a1aea
Merge pull request #867 from galal-hussein/private_reg
Add private registry support to containerd
2019-10-10 14:35:37 -07:00
galal-hussein f8ec6f905a Vendor update 2019-10-10 03:34:35 +02:00
galal-hussein 1f42da0164 Vendor Update 2019-10-08 01:03:59 +02:00
Erik Wilson 262a4950bf Separate CNI plugin dependencies
Because:
- Current CNI plugins produces an error on Raspbian:
  `failed to create bridge \"cni0\": could not add \"cni0\": operation not supported"`
- Dependencies for CNI plugins may interfere with containerd dependencies.

This change will compile and download CNI plugins separately, and will
downgrade CNI plugins to v0.7.6 for compatability with armv7.
2019-10-02 18:48:30 -07:00
Erik Wilson 1b9698bb71
Merge pull request #850 from chenrui333/go-1.13
Upgrade to go v1.13.1
2019-10-02 13:21:35 -07:00
Erik Wilson fb7c8fe069 Add github.com/Microsoft/hcsshim to go.mod 2019-09-30 16:24:35 -07:00
galal-hussein 439920e517 Vendor update and go.mod update 2019-09-30 18:34:57 +02:00
Rui Chen 3afecdbf4e `go mod tidy` with GOPROXY 2019-09-29 21:35:37 -04:00
Rui Chen ba787a7ec0 Upgrade to go v1.13.1 2019-09-29 21:17:11 -04:00
Erik Wilson 0a605374c9 Update modules 2019-09-27 18:33:04 -07:00
Darren Shepherd 834f7df7ec Update go.mod 2019-09-27 16:54:28 -07:00
Erik Wilson 3b32bd4322 Downgrade grpc 1.20.1 -> 1.13.0 2019-09-24 22:00:42 -07:00
Erik Wilson fc660fca2a Upgrade x/sys 2019-09-24 19:54:27 -07:00
Erik Wilson 22ebe13ec5 Upgrade k8s to 1.15.4-k3s.1 2019-09-19 16:17:14 -07:00
Darren Shepherd 3ce8310a17 Switch to go modules 2019-09-05 15:16:36 -07:00