Merge pull request #3944 from afbjorklund/rkt-remove

Remove the rkt container runtime

deploy/iso/minikube-iso/board/coreos/minikube/users

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

deploy/iso/minikube-iso/package/Config.in

@@ -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"

deploy/iso/minikube-iso/package/automount/minikube-automount

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

deploy/iso/minikube-iso/package/automount/minikube-automount.service

@@ -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]

docs/README.md

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

docs/alternative_runtimes.md

@@ -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:

docs/contributors/minikube_iso.md

@@ -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
 
@@ -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
 ```
 

docs/vmdriver-none.md

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

pkg/minikube/console/style.go

@@ -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: "🔑  "},

pkg/minikube/cruntime/cruntime.go

@@ -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":
@@ -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 {

pkg/minikube/cruntime/cruntime_test.go

@@ -33,7 +33,6 @@ func TestName(t *testing.T) {
 	}{
 		{"", "Docker"},
 		{"docker", "Docker"},
-		{"rkt", "rkt"},
 		{"crio", "CRI-O"},
 		{"cri-o", "CRI-O"},
 		{"containerd", "containerd"},