1fa3444672
Merge branch 'master' into improveContainerdConfig
2022-05-27 11:46:47 -07:00
e15f3bca50
spaces
2022-05-26 13:22:47 -07:00
315aef0f15
revert unnecessary change
2022-05-26 13:12:36 -07:00
e4ca9c6c50
revert unrelated change
2022-05-25 18:38:15 -07:00
b9c90e9d82
kicbase: don't build cri-dockerd from source
2022-05-25 18:16:42 -07:00
fa8864c25c
pass in less source code to auto-pause kicbase context
2022-05-24 14:18:49 -07:00
dd444b8ec2
remove overlayfs from config files
2022-05-12 10:59:42 -07:00
614726958d
only import when containerd explictly enabled
2022-05-12 10:58:51 -07:00
0cda289d88
set flags to auto resolve config file conflicts
2022-05-12 10:53:06 -07:00
cf036c63ed
rename config file to config.toml
2022-05-12 10:53:06 -07:00
b5cd6c4549
containerd: use drop in config to update values
2022-05-12 10:52:32 -07:00
7c1b415614
update to 0.10.3
2022-05-11 15:49:29 -07:00
4c9b61d977
Update deploy/kicbase/Dockerfile
2022-05-11 15:48:43 -07:00
67699a2c68
Upgrade buildkit from 0.9.0 to 0.10.0
2022-05-11 15:48:43 -07:00
01a4be1d76
Merge branch 'master' into tryCrioMirror
2022-05-11 10:15:04 -07:00
7ed0fb0473
use crio mirror
2022-05-10 16:14:39 -07:00
31c4c8bced
update entrypoint
2022-05-10 14:35:32 -07:00
7204b1db3e
KIC rootless: drop fuse-overlayfs; bump kernel requirement to 5.11
...
minikube 1.23 (PR 12359) added fuse-overlayfs snapshotter for rootless Docker driver,
but got broken in minikube 1.25 (issue 13534).
We can drop fuse-overlayfs for kernel >= 5.11.
Fix issue 13534
We may add back fuse-overlayfs later if there is a huge demand to
support kernel < 5.11.
That will require packing preloadable tarballs for fuse-overlayfs
snapshotter.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2022-03-22 18:08:14 +09:00
946856dfe9
Building auto-pause needs go1.17
2022-03-20 18:03:00 +01:00
5da2fb7ed4
Update kicbase base image
2022-03-20 17:39:26 +01:00
921816747a
use drop in configuration files for crio
2022-02-08 10:11:36 -08:00
0a9a80dac7
Upgrade cri-dockerd to fix the socket path
...
The v0.2.0 had the socket as cri-docker.sock,
while the installer are using cri-dockerd.sock
Also fix the output of cri-dockerd --version,
to use the git commit instead of just "HEAD".
2022-02-04 17:22:10 +01:00
9bfc7009a5
Upgrade cri-dockerd
2022-02-02 18:40:24 +01:00
3f723b2639
Add static build of cri-dockerd to kicbase
2021-12-22 21:48:37 +01:00
1c948645f1
spacing
2021-12-14 12:40:03 -08:00
c3688b6230
address comments
2021-12-14 12:36:48 -08:00
885ad28bbc
fix it actually
2021-12-13 16:54:36 -08:00
3733f436fc
death by a thousand papercuts
2021-12-13 15:47:21 -08:00
682d144904
fix sed for ppc
2021-12-13 14:38:59 -08:00
50ed250fce
don't use crio on armv7 either
2021-12-13 13:31:04 -08:00
72e654ac17
don't add user to nonexistent group :)
2021-12-08 15:53:10 -08:00
0e00ca4477
syntax
2021-12-08 14:26:38 -08:00
9700ca1c79
don't start podman socket when there is no podman
2021-12-08 14:17:44 -08:00
ba5e3d4615
don't stop services that aren't installed
2021-12-08 13:14:34 -08:00
a8ca32e63b
filter out podman for powerpc arch
2021-12-08 11:36:56 -08:00
6c7cf29987
exclude crio for powerpc
2021-12-08 09:39:15 -08:00
6b7168cf4b
fix kicbase dockerfile to allow ppc64le and armv7 archs
2021-12-07 16:05:32 -08:00
f358a1e907
Update BUILD KIT version.
2021-12-06 12:47:43 -08:00
4452d73284
add buildkit to kicbase
2021-09-22 11:31:41 -07:00
a218d9fce0
add missing slash
2021-09-22 11:31:41 -07:00
2c624cdeac
added improvements based on feedback
2021-09-22 11:31:41 -07:00
dbc7ace360
buildkit socket
2021-09-22 11:31:41 -07:00
debae03666
crio enabled s390x arch
2021-09-14 09:50:53 -07:00
5243af5d58
only disable crio if installed
2021-09-14 09:50:53 -07:00
8304e52539
prevent user from using crio on unsupported hardware
2021-09-14 09:50:53 -07:00
1bc841108f
skip cri-o installation on unsupported archs
2021-09-14 09:50:53 -07:00
623c01c23a
remove var
2021-09-14 09:50:53 -07:00
c31db4fd99
update cri-o from v1.20.0 to 1.22.0
2021-09-14 09:50:53 -07:00
323225483e
Support Rootless Docker
...
Requirements:
- Install rootless Docker 20.10 or later, see https://rootlesscontaine.rs/getting-started/docker/
- Enable cgroup v2 delegation, see https://rootlesscontaine.rs/getting-started/common/cgroup2/
Usage: `minikube start --driver=docker --container-runtime=containerd`.
The `--container-runtime` flag needs to be set to "containerd".
CRI-O can be also supported later.
Closes issue 10836 ("add support for rootless Docker").
Support for rootless Podman (issue 8719) is not covered in this commit.
---
Code reading guide:
- `deploy/kicbase/Dockerfile`: updated to install fuse-overlayfs and containerd-fuse-overlayfs, which is used
instead of `overlayfs` snapshotter
- `deploy/kicbase/entrypoint`: updated to verify cgroup v2 delegation.
Mostly from 8a83ee46b2/images/base/files/usr/local/bin/entrypoint
2021-08-27 17:21:53 +09:00
b36be9cd52
Upgrade buildkit from 0.8.2 to 0.9.0
2021-08-10 11:05:34 -07:00
022967c4d3
Make kicbase copy auto-pause directly instead of the auto-pause folder.
2021-06-30 10:08:16 -07:00
e8103ca011
auto puase arm64
2021-06-24 17:25:14 -04:00
075ca20498
Add useful tools in the Kicbase Docker image
...
Signed-off-by: Peixuan Ding <dingpeixuan911@gmail.com>
2021-05-11 21:57:29 -04:00
f9cfa45c60
Update kicbase base image and sync with kind
2021-04-10 09:51:07 +02:00
1cda7d41ef
change location of auto-pause binary
2021-04-08 09:56:36 -07:00
18f4b425e9
Upgrade buildkit from 0.8.1 to 0.8.2
...
Add buildkit-qemu-* to the packaging
2021-03-17 20:02:18 +01:00
175dbcf7ae
add auto-pause to kic image
2021-02-24 12:30:06 -08:00
adc9d9e0a6
add auto-pause to docker image
2021-02-24 12:30:06 -08:00
1921801b69
disable minikube-scheduled-stop.service until a user schedules a stop
2021-02-21 00:12:31 -08:00
48a1d6ad78
Change from crio-1.19 to crio-1.20 in kicbase
2021-02-20 10:20:45 -08:00
f3fda2a4c4
Make sure to add crun for running on cgroups v2
...
Podman will default to crun, for v2 (runc for v1)
So these dependencies are needed for podman.service
Note that runc is now provided by "containerd.io"
2021-02-20 10:11:35 -08:00
9c278299af
add link to issue
2021-02-19 18:53:20 -08:00
f81c526c6b
fix crio by hardcoding mountopt
2021-02-19 17:41:24 -08:00
9be89e2ac0
Merge branch 'master' of github.com:kubernetes/minikube into anders-kicbase-210119
2021-02-18 18:51:37 -08:00
3406be89f8
fix final line of dockerfile
2021-02-12 17:18:40 -08:00
400456b300
no need for bash
2021-02-12 17:09:46 -08:00
38c6fc60f0
fix makefile
2021-02-12 16:15:33 -08:00
ccdc844a94
Merge branch 'master' of github.com:kubernetes/minikube into kic-test
2021-02-09 15:12:42 -08:00
ac147e1442
Correct the filename for the crio apt repository
...
It was a bit confusing that 1.19 still said 1.18
2021-02-09 19:32:05 +01:00
e34354f6ea
Update kicbase base image and sync with kind
2021-02-09 17:59:36 +01:00
789c524431
change to dockerfile to test autobuild
2021-02-08 12:52:28 -08:00
11ea5b2f1d
Remove debugging code
2021-01-08 16:03:22 -08:00
6ec94aa064
Merge to master
2021-01-08 15:40:24 -08:00
66a671fc86
Experimental macOS/arm64 work
2021-01-08 15:38:31 -08:00
e0178acecc
Make sure NO_PROXY contains api endpoint
...
Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
2020-12-24 16:41:43 +08:00
897d3409d6
Upgrade buildkit from 0.8.0 to 0.8.1
2020-12-15 13:01:00 +01:00
a18166a243
Upgrade buildkit from 0.7.2 to 0.8.0
...
Also include the custom runc version
2020-12-12 10:20:45 +01:00
b24d632acb
Change from crio-1.18 to crio-1.19 in kicbase
2020-12-09 22:31:18 +01:00
4a0382fe72
Merge pull request #9636 from afbjorklund/podman2-kic
...
KIC: Upgrade podman to version 2.2.0 and remove varlink
2020-12-08 10:28:14 -08:00
756836d16e
Copy kind entrypoint fixes from upstream
2020-12-05 13:56:04 +01:00
1f958c1cd8
Upgrade to latest tag from ubuntu:20.04
2020-12-05 13:44:53 +01:00
605768a4d6
Merge branch 'master' into podman2-kic
2020-12-01 17:31:11 +01:00
25ba4dcdfe
Merge pull request #9659 from afbjorklund/crio-url
...
Change back to the version-pinned cri-o channel
2020-11-30 10:59:53 -08:00
f32eb7c0b6
Merge pull request #9646 from afbjorklund/buildkit-kic
...
KIC: Install buildkit package for use with containerd
2020-11-25 12:52:55 -08:00
de2013eb9b
Install buildkit binary for use with containerd
2020-11-18 07:58:44 +01:00
a8754ad470
Upgrade podman to version 2.1.1 and remove varlink
...
Add the podman group, to remove "sudo varlink bridge"
Use the podman socket /run/podman/podman.sock instead
2020-11-14 09:45:05 +01:00
16c258edda
make file executable
2020-11-12 15:21:27 -08:00
0deea5e3e1
fix dockerfile
2020-11-12 14:43:10 -08:00
cc8ca41915
Start adding scheduled stop for container
2020-11-12 14:20:41 -08:00
3672753100
Change back to the version-pinned cri-o channel
2020-11-10 16:54:39 +01:00
c2d4359456
Upgrade cri-o in kicbase to version 1.18.4
...
Use the latest 1.18, since 1.18.4 is broken again <sigh>
Use the recommended cri-o-runc package instead of runc
2020-11-07 12:52:43 +01:00
0c9d612e75
Merge pull request #9508 from tstromberg/cgroupfs
...
Remove hard-coded list of valid cgroupfs mountpoints to bind mount
2020-11-04 11:04:08 -08:00
d4d645bbac
Merge pull request #9527 from afbjorklund/kicbase-update
...
Update kicbase base image and sync with kind
2020-10-28 07:57:43 -07:00
96da9443e9
Merge pull request #9537 from tstromberg/mtu-probing
...
Enable TCP Path MTU Discovery when an ICMP black hole is detected
2020-10-28 07:46:24 -07:00
8f0fc9d8c0
Set net.ipv4.tcp_mtu_probing = 1
2020-10-23 09:52:52 -07:00
842871832f
Update kicbase base image and sync with kind
2020-10-22 23:55:06 +02:00
08e17b7f85
Remove hard-coded list of valid cgroupfs mountpoints to bind mount
2020-10-20 20:58:19 -07:00
beaae54f0a
Install docker from docker.com instead of distro
2020-10-17 12:56:48 +02:00
8a18334cba
Complete the fork of kindbase by copy/paste
...
Base kicbase directly on ubuntu, without kindbase
Move all the files that are still copied and used
Avoid installing software only to be deleted later
The entrypoint had already been forked since earlier
2020-09-27 15:16:42 +02:00
85f8d05757
Fork all files needed for kindbase from upstream
...
This is for reference, to be able to combine them
2020-09-27 15:15:43 +02:00
9056687844
Also remove the extra containerd configuration
2020-09-27 15:15:43 +02:00
d3dc36e146
Clean up the docker installation
...
Remove local things from kind, replace with packages.
Use the "clean-install" script for a nicer Dockerfile.
2020-09-27 14:46:03 +02:00
f8b2a6c82a
Add /kubepods to egrep regex in entrypoint
...
This will ensure that the kubepods cgroup is correctly mounted, which
kubeadm uses. Without it, `kubeadm init` fails in Cloud Shell.
2020-08-25 15:53:03 -07:00
b5ca12cd40
Revert whitespace change
2020-08-21 14:56:28 -07:00
c2f0a568ba
Reduce the diff size
2020-08-21 14:55:49 -07:00
654cf57f26
Dockerfile: prioritize /etc/hosts over dns
2020-08-18 16:50:33 -07:00
1f4bfa195e
Merge branch 'master' into retry-cgroups
2020-08-12 16:40:36 -07:00
d6a094ef4f
fix crio pkg vanishing
2020-08-12 16:25:54 -07:00
4265facd96
entrypoint: Retry fix_cgroup on failure
2020-08-11 13:44:22 -07:00
61583d6249
upgrade crio to 1.18.3, ubuntu to 20.04 and add terrible hack to fix restarts for cri-o
2020-07-30 15:11:30 -07:00
1bcbc67d98
update kicbase to ubuntu 20.04
2020-07-28 13:38:35 -07:00
738c09992a
update kicbase to ubuntu 2020
2020-07-28 13:32:50 -07:00
a35bf40cb1
Add entrypoint to Dockerfile
2020-07-28 11:10:36 -07:00
d9deec2954
improve update alternative
2020-07-28 11:00:10 -07:00
e89b0b4757
move dockerfile to a different folder
2020-07-27 15:59:56 -07:00
Steven Powell
Sharif Elgamal
Steven Powell
Anders F Björklund
Akihiro Suda
klaases
Andriy Dzikh
Medya Gh
Peixuan Ding
Jiefeng He
Thomas Stromberg
Ling Samuel
Medya Ghazizadeh
priyawadhwa
Thomas Strömberg