Commit Graph

186 Commits (revert-14780-docker-cni)

Author SHA1 Message Date
Chris Kannon 2a86770a92
Merge branch 'master' into master 2022-11-17 09:58:49 -05:00
Steven Powell 9ed675cbde update go 2022-11-09 10:19:54 -05:00
Chris Kannon 00486c3fd6
Merge branch 'master' into master 2022-11-02 15:09:58 -04:00
Chris Kannon 320c41f80e Added version.json to kicbase image and version validation to start.go.
Added CHANGELOG to kicbase and ISO.
Updated gh to latest version 2.18.1.
2022-11-02 14:17:41 -04:00
Steven Powell 3d2752907f update Ubuntu image 2022-10-25 10:42:39 -07:00
Steven Powell 176351c456 bump golang version 2022-10-10 12:31:10 -07:00
Steven Powell 5e70a7d9f8 update kicbase base image 2022-10-05 09:45:06 -07:00
Steven Powell 1abc03c8f2 update entrypoint and kindnetd 2022-10-03 14:26:32 -07:00
Steven Powell 2e2903cf60 update kicbase base image 2022-09-02 09:36:38 -07:00
Andrew Hamilton 20470cfc8b Fixes containerd configuration issue with insecure registry
- Updates containerd configuration to use the new format for specifying
  container registry mirrors.
- Updates the start code to produce files in the correct location for
  registry mirrors specified with --insecure-registry
2022-08-29 12:52:12 -07:00
Steven Powell f213b25ef2 update Ubuntu 2022-08-02 17:26:50 -07:00
Steven Powell 5fac416884 update entrypoint and kindnetd 2022-07-13 15:50:36 -07:00
Steven Powell d3f65501a5 update Docker from 20.10.16 to 20.10.17 2022-07-08 13:18:38 -07:00
Steven Powell 9f856abb8f update base images 2022-07-01 11:00:29 -07:00
Paul S. Schweigert d53be77683
update cri-o in dockerfile too
Signed-off-by: Paul S. Schweigert <paulschw@us.ibm.com>
2022-06-24 14:01:53 -04:00
Steven Powell 42fb10861c update cri-docker commit 2022-06-16 12:23:00 -07:00
Steven Powell d4a783c6d5 update cri-docker version 2022-06-16 12:23:00 -07:00
Sharif Elgamal 9938965715 make script executable 2022-06-13 17:17:22 -07:00
Sharif Elgamal 821d88a180 add new file 2022-06-13 17:10:08 -07:00
Sharif Elgamal 7d74925578 build auto-pause outside kicbase dockerfile 2022-06-13 17:08:30 -07:00
Steven Powell 8298398eb9 make cri-dockerd binary executable 2022-05-31 14:28:41 -07:00
Steven Powell 1fa3444672
Merge branch 'master' into improveContainerdConfig 2022-05-27 11:46:47 -07:00
Sharif Elgamal e15f3bca50 spaces 2022-05-26 13:22:47 -07:00
Sharif Elgamal 315aef0f15 revert unnecessary change 2022-05-26 13:12:36 -07:00
Sharif Elgamal e4ca9c6c50 revert unrelated change 2022-05-25 18:38:15 -07:00
Sharif Elgamal b9c90e9d82 kicbase: don't build cri-dockerd from source 2022-05-25 18:16:42 -07:00
Sharif Elgamal fa8864c25c pass in less source code to auto-pause kicbase context 2022-05-24 14:18:49 -07:00
Steven Powell dd444b8ec2 remove overlayfs from config files 2022-05-12 10:59:42 -07:00
Steven Powell 614726958d only import when containerd explictly enabled 2022-05-12 10:58:51 -07:00
Steven Powell 0cda289d88 set flags to auto resolve config file conflicts 2022-05-12 10:53:06 -07:00
Steven Powell cf036c63ed rename config file to config.toml 2022-05-12 10:53:06 -07:00
Steven Powell b5cd6c4549 containerd: use drop in config to update values 2022-05-12 10:52:32 -07:00
Steven Powell 7c1b415614 update to 0.10.3 2022-05-11 15:49:29 -07:00
Steven Powell 4c9b61d977 Update deploy/kicbase/Dockerfile 2022-05-11 15:48:43 -07:00
Anders F Björklund 67699a2c68 Upgrade buildkit from 0.9.0 to 0.10.0 2022-05-11 15:48:43 -07:00
Steven Powell 01a4be1d76
Merge branch 'master' into tryCrioMirror 2022-05-11 10:15:04 -07:00
Steven Powell 7ed0fb0473 use crio mirror 2022-05-10 16:14:39 -07:00
Steven Powell 31c4c8bced update entrypoint 2022-05-10 14:35:32 -07:00
Akihiro Suda 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
Anders F Björklund 946856dfe9 Building auto-pause needs go1.17 2022-03-20 18:03:00 +01:00
Anders F Björklund 5da2fb7ed4 Update kicbase base image 2022-03-20 17:39:26 +01:00
Steven Powell 921816747a use drop in configuration files for crio 2022-02-08 10:11:36 -08:00
Anders F Björklund 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
Anders F Björklund 9bfc7009a5 Upgrade cri-dockerd 2022-02-02 18:40:24 +01:00
Anders F Björklund 3f723b2639 Add static build of cri-dockerd to kicbase 2021-12-22 21:48:37 +01:00
Sharif Elgamal 1c948645f1 spacing 2021-12-14 12:40:03 -08:00
Sharif Elgamal c3688b6230 address comments 2021-12-14 12:36:48 -08:00
Sharif Elgamal 885ad28bbc fix it actually 2021-12-13 16:54:36 -08:00
Sharif Elgamal 3733f436fc death by a thousand papercuts 2021-12-13 15:47:21 -08:00
Sharif Elgamal 682d144904 fix sed for ppc 2021-12-13 14:38:59 -08:00
Sharif Elgamal 50ed250fce don't use crio on armv7 either 2021-12-13 13:31:04 -08:00
Sharif Elgamal 72e654ac17 don't add user to nonexistent group :) 2021-12-08 15:53:10 -08:00
Sharif Elgamal 0e00ca4477 syntax 2021-12-08 14:26:38 -08:00
Sharif Elgamal 9700ca1c79 don't start podman socket when there is no podman 2021-12-08 14:17:44 -08:00
Sharif Elgamal ba5e3d4615 don't stop services that aren't installed 2021-12-08 13:14:34 -08:00
Sharif Elgamal a8ca32e63b filter out podman for powerpc arch 2021-12-08 11:36:56 -08:00
Sharif Elgamal 6c7cf29987 exclude crio for powerpc 2021-12-08 09:39:15 -08:00
Sharif Elgamal 6b7168cf4b fix kicbase dockerfile to allow ppc64le and armv7 archs 2021-12-07 16:05:32 -08:00
klaases f358a1e907 Update BUILD KIT version. 2021-12-06 12:47:43 -08:00
Steven Powell 4452d73284 add buildkit to kicbase 2021-09-22 11:31:41 -07:00
Steven Powell a218d9fce0 add missing slash 2021-09-22 11:31:41 -07:00
Steven Powell 2c624cdeac added improvements based on feedback 2021-09-22 11:31:41 -07:00
Steven Powell dbc7ace360 buildkit socket 2021-09-22 11:31:41 -07:00
Steven Powell debae03666 crio enabled s390x arch 2021-09-14 09:50:53 -07:00
Steven Powell 5243af5d58 only disable crio if installed 2021-09-14 09:50:53 -07:00
Steven Powell 8304e52539 prevent user from using crio on unsupported hardware 2021-09-14 09:50:53 -07:00
Steven Powell 1bc841108f skip cri-o installation on unsupported archs 2021-09-14 09:50:53 -07:00
Steven Powell 623c01c23a remove var 2021-09-14 09:50:53 -07:00
Steven Powell c31db4fd99 update cri-o from v1.20.0 to 1.22.0 2021-09-14 09:50:53 -07:00
Akihiro Suda 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

- `cmd/minikube/cmd/start_flags.go`: updated to set `KubeletInUserNamespace` feature gate when rootless

- `pkg/drivers/kic/oci`: updated to use port forwarding, because rootless container IPs are not reachable from the host

- `pkg/minikube/cruntime`: updated to generate `/etc/containerd/config.toml` with rootless support.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-08-27 17:21:53 +09:00
Steven Powell b36be9cd52 Upgrade buildkit from 0.8.2 to 0.9.0 2021-08-10 11:05:34 -07:00
Andriy Dzikh 022967c4d3 Make kicbase copy auto-pause directly instead of the auto-pause folder. 2021-06-30 10:08:16 -07:00
Medya Gh e8103ca011 auto puase arm64 2021-06-24 17:25:14 -04:00
Peixuan Ding 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
Anders F Björklund f9cfa45c60 Update kicbase base image and sync with kind 2021-04-10 09:51:07 +02:00
Medya Gh 1cda7d41ef change location of auto-pause binary 2021-04-08 09:56:36 -07:00
Anders F Björklund 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
Medya Gh 175dbcf7ae add auto-pause to kic image 2021-02-24 12:30:06 -08:00
Medya Gh adc9d9e0a6 add auto-pause to docker image 2021-02-24 12:30:06 -08:00
Jiefeng He 1921801b69 disable minikube-scheduled-stop.service until a user schedules a stop 2021-02-21 00:12:31 -08:00
Anders F Björklund 48a1d6ad78 Change from crio-1.19 to crio-1.20 in kicbase 2021-02-20 10:20:45 -08:00
Anders F Björklund 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
Sharif Elgamal 9c278299af add link to issue 2021-02-19 18:53:20 -08:00
Sharif Elgamal f81c526c6b fix crio by hardcoding mountopt 2021-02-19 17:41:24 -08:00
Sharif Elgamal 9be89e2ac0 Merge branch 'master' of github.com:kubernetes/minikube into anders-kicbase-210119 2021-02-18 18:51:37 -08:00
Sharif Elgamal 3406be89f8 fix final line of dockerfile 2021-02-12 17:18:40 -08:00
Sharif Elgamal 400456b300 no need for bash 2021-02-12 17:09:46 -08:00
Sharif Elgamal 38c6fc60f0 fix makefile 2021-02-12 16:15:33 -08:00
Sharif Elgamal ccdc844a94 Merge branch 'master' of github.com:kubernetes/minikube into kic-test 2021-02-09 15:12:42 -08:00
Anders F Björklund 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
Anders F Björklund e34354f6ea Update kicbase base image and sync with kind 2021-02-09 17:59:36 +01:00
Sharif Elgamal 789c524431 change to dockerfile to test autobuild 2021-02-08 12:52:28 -08:00
Thomas Stromberg 11ea5b2f1d Remove debugging code 2021-01-08 16:03:22 -08:00
Thomas Stromberg 6ec94aa064 Merge to master 2021-01-08 15:40:24 -08:00
Thomas Stromberg 66a671fc86 Experimental macOS/arm64 work 2021-01-08 15:38:31 -08:00
Ling Samuel e0178acecc
Make sure NO_PROXY contains api endpoint
Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
2020-12-24 16:41:43 +08:00
Anders F Björklund 897d3409d6 Upgrade buildkit from 0.8.0 to 0.8.1 2020-12-15 13:01:00 +01:00
Anders F Björklund 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
Anders F Björklund b24d632acb Change from crio-1.18 to crio-1.19 in kicbase 2020-12-09 22:31:18 +01:00
Medya Ghazizadeh 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