Commit Graph

189 Commits (3cd7a46b8fb9362fb490bec641ddd7e25c1d93f7)

Author SHA1 Message Date
Brad Davidson 198057ac05 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>
(cherry picked from commit e4846c92b4)
2022-03-15 18:09:26 -07:00
Brad Davidson a4b4dd90ff Bump containerd to v1.4.13-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2022-03-15 15:03:46 -07:00
Hussein Galal 471f5eb3db
Upgrade to V1.21.10+k3s1 (#5137)
* Update to v1.21.10

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

* Upgrade treafik image 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>

* add debug to download script

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

* Enable make generate to use dapper and standardize go and gzip versions (#4861)

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

* fix go generate

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

* fix deep copy generated file

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

* Update go.mod

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

Co-authored-by: Derek Nola <derek.nola@suse.com>
2022-02-20 20:48:06 +02:00
Manuel Buil c0bbaea06a Remove the iptables rules from ipmasq flannel
Signed-off-by: Manuel Buil <mbuil@suse.com>
2022-02-09 08:49:24 +01:00
Michal Rostecki 9de183fb0e 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 19:49:35 +01:00
Derek Nola 101917b0c4
Update to v1.21.9 (#4994)
* Update to v1.21.9

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

* Run go mod tidy with correct go version

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

* Update tags to k3s-io for v1.21.9

Signed-off-by: Derek Nola <derek.nola@suse.com>
2022-01-20 08:44:22 -08:00
Brad Davidson f540db4570 Update etcd to v3.4.18-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2022-01-14 13:34:53 -08:00
Luther Monson 03aa6d568f drop vendor dir
Signed-off-by: Luther Monson <luther.monson@gmail.com>
2021-12-27 15:02:38 -07:00
Hussein Galal 78102dcc01
Update to v1.21.8 (#4760)
* Update to v1.21.8

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

* Update to v1.21.8

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-12-16 19:35:28 +02:00
Brad Davidson d2f0bbb381 Bump runc to v1.0.3
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-12-08 18:45:03 -08:00
Brad Davidson 8e1b2340c9 Bump wharfie to v0.5.1 and use shared decompression code
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7d3447ceff)
2021-12-08 13:33:45 -08:00
Brad Davidson f468e10fcf bump kine to v0.6.5
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-12-08 13:33:45 -08:00
Hussein Galal 7b62900836
[Release-1.21] Add cert rotation command (#4632)
* 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:45:21 +02:00
Chris Kim d09821c2ed
[release-1.21] Bump golang and containerd versions (#4539)
* Bump containerd to v1.4.12-k3s1
* Bump golang to 1.16.10 and sonobuoy to 0.55.0
* Change timeout to 60m

Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-11-18 21:15:16 -08:00
Chris Kim 7f737097bc
[release-1.21] Bump Kubernetes to v1.21.7-k3s1 (#4531)
* Update to v1.21.7

Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-11-18 11:39:33 -08:00
Hussein Galal 3fba7c1021
Update to v1.21.6 (#4350)
* Update to v1.21.6

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

* Ignore go.mod and go.sum for codespell

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

* Update to v1.21.6

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-10-28 22:38:40 +02:00
Brad Davidson bb50c45a6f Revert "Backport bootstrap release 1.21 (#4313)"
This reverts commit
f0ea0a0946

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-10-27 14:17:22 -07:00
Brian Downs f0ea0a0946
Backport bootstrap release 1.21 (#4313) 2021-10-25 13:03:21 -07:00
Brad Davidson 63bcc307fb Bump klipper-helm version
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-10-22 15:05:40 -07:00
Manuel Buil 11dce34b4e Update to the newest flannel
Fixes issues such as the internode connectivity

Signed-off-by: Manuel Buil <mbuil@suse.com>
2021-10-21 13:02:18 +02:00
Manuel Buil 41b0997e31 Add dual-stack support
Signed-off-by: Manuel Buil <mbuil@suse.com>
2021-10-21 10:29:03 +02:00
Brad Davidson 7cbdea6bd2 go mod tidy
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 699ea16523)
2021-10-20 11:06:12 -07:00
Brad Davidson 724ef700ba Bump containerd to v1.4.11+k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-10-04 14:49:09 -07:00
Chris Kim acad8ef840
[release-1.21] Update Kubernetes to v1.21.5 (#4032)
* Update to v1.21.5

Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-09-17 09:21:32 -07:00
Brad Davidson 3e250fdbab Update Kubernetes to v1.21.4-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-08-16 14:42:09 -07:00
Brad Davidson 5802b429f8 Bump containerd to v1.4.9-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-08-16 13:33:56 -07:00
Brad Davidson abb6581a94 Bump helm-controller to work around tiller crashes
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-08-13 12:52:34 -07:00
Brad Davidson 69047a35c0 Bump helm-controller to v0.10.2
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-08-05 09:35:45 -07:00
Brad Davidson b9cc6409f4 Bump containerd to v1.4.8-k3s1
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-07-20 15:04:37 -07:00
Chris Kim 9c981b0184
[release-1.21] Bump Kubernetes to v1.21.3 (#3652)
* Bump golang to 1.16.6
* Update to v1.21.3

Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-07-15 22:04:09 -07:00
Hussein Galal 9859ec7a81
[release-1.21] - Backport Fix storing bootstrap data with empty token string (#3514)
* 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>

* 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>

* Fix calling delete in kine

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-07-13 22:28:38 +02:00
Chris Kim 5d66fed941
Merge pull request #3550 from Oats87/issues/k3s/3427
* Bump helm-controller to v0.10.1
* Bump rancher/klipper-helm image in airgap image-list.txt
* go mod vendor
* Fix spelling to satisfy codespell check
2021-07-07 15:27:57 -07:00
Derek Nola 0c5577a8ec
[Backport 1.21] Update embedded kube-router (#3557) (#3595)
* Update embedded kube-router

Signed-off-by: dereknola <derek.nola@suse.com>
2021-07-07 15:04:23 -07:00
Chris Kim 0a5bca7ea2 Bump helm-controller to v0.10.1
Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-07-07 08:39:54 -07:00
Derek Nola 5a67e8dc47
Update to v1.21.2 (#3479)
* Update to v1.21.2
Signed-off-by: dereknola <derek.nola@suse.com>
2021-06-18 13:46:09 -07:00
Manuel Buil 1932979f44 Update flannel version
Signed-off-by: Manuel Buil <mbuil@suse.com>
2021-06-04 08:56:46 +02:00
Jacob Blain Christen 5573fe4beb [backport 1.21] 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:38:48 -07:00
Brad Davidson 67651aee58 Handle conntrack-related sysctls in supervisor agent setup
(cherry picked from commit 7e175e8ad4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-05-18 22:25:33 -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