From abb5fc0af098115305616e54b56fc0f6ec698f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= <anders.f.bjorklund@gmail.com>
Date: Tue, 12 Feb 2019 20:50:50 +0100
Subject: [PATCH] Show name as CRI-O, even if class is CRIO

Should use the proper name for display, even if we use a name more
suitable to naming classes and methods for the implementation...

Also use the --runtime=cri-o when testing, and update the github
repository now that cri-o has graduated from incubator to a sig.

See https://cri-o.io/
---
 deploy/iso/minikube-iso/package/crio-bin/crio.service | 2 +-
 docs/alternative_runtimes.md                          | 2 +-
 pkg/minikube/cruntime/crio.go                         | 2 +-
 pkg/minikube/cruntime/cruntime_test.go                | 4 ++--
 test/integration/util/util.go                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.service b/deploy/iso/minikube-iso/package/crio-bin/crio.service
index e1b72ac88..3691e8de4 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 ce811706f..45e40212e 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 d5841f849..2897dd2c0 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 b62e28463..9a77c8177 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 27456bd8b..40f1841bb 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)
 
-- 
GitLab