Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the rkt container runtime #3944

Merged
merged 2 commits into from
Mar 25, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions deploy/iso/minikube-iso/board/coreos/minikube/users
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
rkt -1 rkt -1 - /home/rkt /bin/bash rkt-admin,wheel,vboxsf -
docker -1 docker -1 =tcuser /home/docker /bin/bash rkt,rkt-admin,wheel,vboxsf -
docker -1 docker -1 =tcuser /home/docker /bin/bash wheel,vboxsf -
2 changes: 0 additions & 2 deletions deploy/iso/minikube-iso/package/Config.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/rkt-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/rktlet-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
Expand Down
22 changes: 0 additions & 22 deletions deploy/iso/minikube-iso/package/automount/minikube-automount
Original file line number Diff line number Diff line change
Expand Up @@ -129,28 +129,6 @@ if [ -n "$BOOT2DOCKER_DATA" ]; then
mkdir /tmp/hostpath-provisioner
mount --bind /mnt/$PARTNAME/hostpath-provisioner /tmp/hostpath-provisioner

rm -rf /var/lib/rkt
if [ ! -d /mnt/$PARTNAME/var/lib/rkt ]; then
mkdir -p /mnt/$PARTNAME/var/lib/rkt
chown root:rkt /mnt/$PARTNAME/var/lib/rkt
fi
mkdir /var/lib/rkt
mount --bind /mnt/$PARTNAME/var/lib/rkt /var/lib/rkt

if [ ! -d /mnt/$PARTNAME/var/lib/rkt-etc ]; then
mkdir -p /mnt/$PARTNAME/var/lib/rkt-etc
cp -rp /etc/rkt/* /mnt/$PARTNAME/var/lib/rkt-etc
chown root:rkt-admin /mnt/$PARTNAME/var/lib/rkt-etc
chmod ug+rw /mnt/$PARTNAME/var/lib/rkt-etc
fi
rm -rf /etc/rkt
mkdir /etc/rkt
mount --bind /mnt/$PARTNAME/var/lib/rkt-etc /etc/rkt

if [ ! -d /var/lib/rkt/pods ]; then
systemd-tmpfiles --create rkt.conf
fi

if [ -e "/userdata.tar" ]; then
mv /userdata.tar /var/lib/boot2docker/
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Unit]
Description=minikube automount
Requires=systemd-udev-settle.service
Before=docker.service rkt-api.service rkt-metadata.service
Before=docker.service
After=systemd-udev-settle.service

[Service]
Expand Down
4 changes: 0 additions & 4 deletions deploy/iso/minikube-iso/package/rkt-bin/Config.in

This file was deleted.

9 changes: 0 additions & 9 deletions deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.hash

This file was deleted.

74 changes: 0 additions & 74 deletions deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk

This file was deleted.

16 changes: 0 additions & 16 deletions deploy/iso/minikube-iso/package/rktlet-master/Config.in

This file was deleted.

Binary file not shown.

This file was deleted.

59 changes: 0 additions & 59 deletions deploy/iso/minikube-iso/package/rktlet-master/rktlet-master.mk

This file was deleted.

12 changes: 0 additions & 12 deletions deploy/iso/minikube-iso/package/rktlet-master/rktlet.service

This file was deleted.

2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Cluster Configuration

* **Alternative Runtimes** ([alternative_runtimes.md](alternative_runtimes.md)): How to run minikube with rkt as the container runtime
* **Alternative Runtimes** ([alternative_runtimes.md](alternative_runtimes.md)): How to run minikube without Docker as the container runtime

* **Environment Variables** ([env_vars.md](env_vars.md)): The different environment variables that minikube understands

Expand Down
8 changes: 0 additions & 8 deletions docs/alternative_runtimes.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
# Alternative runtimes

## Using rkt container engine

To use [rkt](https://github.com/coreos/rkt) as the container runtime run:

```shell
$ minikube start --container-runtime=rkt
```

## Using CRI-O

To use [CRI-O](https://github.com/kubernetes-sigs/cri-o) as the container runtime, run:
Expand Down
2 changes: 0 additions & 2 deletions docs/contributors/minikube_iso.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ This includes the configuration for an alternative bootable ISO image meant to b
It includes:

- systemd as the init system
- rkt
- docker
- CRI-O

Expand Down Expand Up @@ -40,7 +39,6 @@ The bootable ISO image will be available in `out/minikube.iso`.

```shell
$ ./out/minikube start \
--container-runtime=rkt \
--iso-url=file://$GOPATH/src/k8s.io/minikube/out/minikube.iso
```

Expand Down
2 changes: 1 addition & 1 deletion docs/vmdriver-none.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ We'll cover these in detail below:

* When run in `none` mode, minikube has no built-in resource limit mechanism, which means you could deploy pods which would consume all of the hosts resources.

* minikube and the Kubernetes services it starts may interfere with other running software on the system. For instance, minikube will start and stop container runtimes via systemd, such as docker, rkt, containerd, cri-o.
* minikube and the Kubernetes services it starts may interfere with other running software on the system. For instance, minikube will start and stop container runtimes via systemd, such as docker, containerd, cri-o.

### Data loss

Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/console/style.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ var styles = map[string]style{
"celebrate": {Prefix: "🎉 "},
"container-runtime": {Prefix: "🎁 "},
"Docker": {Prefix: "🐳 "},
"rkt": {Prefix: "🚀 "},
"CRI-O": {Prefix: "🎁 "}, // This should be a snow-flake, but the emoji has a strange width on macOS
"containerd": {Prefix: "📦 "},
"permissions": {Prefix: "🔑 "},
Expand Down
4 changes: 1 addition & 3 deletions pkg/minikube/cruntime/cruntime.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ func New(c Config) (Manager, error) {
switch c.Type {
case "", "docker":
return &Docker{Socket: c.Socket, Runner: c.Runner}, nil
case "rkt":
return &Rkt{Socket: c.Socket, Runner: c.Runner}, nil
case "crio", "cri-o":
return &CRIO{Socket: c.Socket, Runner: c.Runner}, nil
case "containerd":
Expand All @@ -94,7 +92,7 @@ func New(c Config) (Manager, error) {
// disableOthers disables all other runtimes except for me.
func disableOthers(me Manager, cr CommandRunner) error {
// valid values returned by manager.Name()
runtimes := []string{"containerd", "crio", "rkt", "docker"}
runtimes := []string{"containerd", "crio", "docker"}
for _, name := range runtimes {
r, err := New(Config{Type: name, Runner: cr})
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion pkg/minikube/cruntime/cruntime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func TestName(t *testing.T) {
}{
{"", "Docker"},
{"docker", "Docker"},
{"rkt", "rkt"},
{"crio", "CRI-O"},
{"cri-o", "CRI-O"},
{"containerd", "containerd"},
Expand Down
Loading