提交 abb5fc0a 编写于 作者: A Anders F Björklund

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/
上级 de6782cd
[Unit] [Unit]
Description=Open Container Initiative Daemon 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 After=network-online.target minikube-automount.service
Requires=minikube-automount.service Requires=minikube-automount.service
......
...@@ -9,7 +9,7 @@ $ minikube start --container-runtime=rkt ...@@ -9,7 +9,7 @@ $ minikube start --container-runtime=rkt
### Using CRI-O ### 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 ```shell
$ minikube start --container-runtime=cri-o $ minikube start --container-runtime=cri-o
......
...@@ -30,7 +30,7 @@ type CRIO struct { ...@@ -30,7 +30,7 @@ type CRIO struct {
// Name is a human readable name for CRIO // Name is a human readable name for CRIO
func (r *CRIO) Name() string { func (r *CRIO) Name() string {
return "CRIO" return "CRI-O"
} }
// SocketPath returns the path to the socket file for CRIO // SocketPath returns the path to the socket file for CRIO
......
...@@ -31,8 +31,8 @@ func TestName(t *testing.T) { ...@@ -31,8 +31,8 @@ func TestName(t *testing.T) {
}{ }{
{"", "Docker"}, {"", "Docker"},
{"docker", "Docker"}, {"docker", "Docker"},
{"crio", "CRIO"}, {"crio", "CRI-O"},
{"cri-o", "CRIO"}, {"cri-o", "CRI-O"},
{"containerd", "containerd"}, {"containerd", "containerd"},
} }
for _, tc := range tests { for _, tc := range tests {
......
...@@ -209,7 +209,7 @@ func (m *MinikubeRunner) Start() { ...@@ -209,7 +209,7 @@ func (m *MinikubeRunner) Start() {
case "containerd": case "containerd":
opts = "--container-runtime=containerd --docker-opt containerd=/var/run/containerd/containerd.sock" opts = "--container-runtime=containerd --docker-opt containerd=/var/run/containerd/containerd.sock"
case "crio": 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) m.RunCommand(fmt.Sprintf("start %s %s %s --alsologtostderr --v=5", m.StartArgs, m.Args, opts), true)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册