diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service index e1b72ac889afcda847c535cc047d84d9c13fbed8..3691e8de4e8c605593d09f34a5151b4c74daed2e 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.service +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.service @@ -1,6 +1,6 @@ [Unit] Description=Open Container Initiative Daemon -Documentation=https://github.com/kubernetes-incubator/cri-o +Documentation=https://github.com/kubernetes-sigs/cri-o After=network-online.target minikube-automount.service Requires=minikube-automount.service diff --git a/docs/alternative_runtimes.md b/docs/alternative_runtimes.md index ce811706fc9e4095b562cb9e2024f5fc00d85bca..45e40212e3404d81138cb6ce37ce3344ad9c56d2 100644 --- a/docs/alternative_runtimes.md +++ b/docs/alternative_runtimes.md @@ -9,7 +9,7 @@ $ minikube start --container-runtime=rkt ### Using CRI-O -To use [CRI-O](https://github.com/kubernetes-incubator/cri-o) as the container runtime, run: +To use [CRI-O](https://github.com/kubernetes-sigs/cri-o) as the container runtime, run: ```shell $ minikube start --container-runtime=cri-o diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go index d5841f84948ff8518dee5415a0ef91fb5272ba63..2897dd2c06d5ca5d86754ec31a4750c5005b26d1 100644 --- a/pkg/minikube/cruntime/crio.go +++ b/pkg/minikube/cruntime/crio.go @@ -30,7 +30,7 @@ type CRIO struct { // Name is a human readable name for CRIO func (r *CRIO) Name() string { - return "CRIO" + return "CRI-O" } // SocketPath returns the path to the socket file for CRIO diff --git a/pkg/minikube/cruntime/cruntime_test.go b/pkg/minikube/cruntime/cruntime_test.go index b62e284637515143892264caa795718ab74c03c4..9a77c8177850225b95fdf8544563d86795d80431 100644 --- a/pkg/minikube/cruntime/cruntime_test.go +++ b/pkg/minikube/cruntime/cruntime_test.go @@ -31,8 +31,8 @@ func TestName(t *testing.T) { }{ {"", "Docker"}, {"docker", "Docker"}, - {"crio", "CRIO"}, - {"cri-o", "CRIO"}, + {"crio", "CRI-O"}, + {"cri-o", "CRI-O"}, {"containerd", "containerd"}, } for _, tc := range tests { diff --git a/test/integration/util/util.go b/test/integration/util/util.go index 27456bd8b759222f3a07ae51839cc2b5017f1f0b..40f1841bbed87d5e39a2396b3f4612468975e751 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -209,7 +209,7 @@ func (m *MinikubeRunner) Start() { case "containerd": opts = "--container-runtime=containerd --docker-opt containerd=/var/run/containerd/containerd.sock" case "crio": - opts = "--container-runtime=crio" + opts = "--container-runtime=cri-o" } m.RunCommand(fmt.Sprintf("start %s %s %s --alsologtostderr --v=5", m.StartArgs, m.Args, opts), true)