Rename ocid to crio.

The ocid project was renamed to CRI-O, months ago, it is time that we moved
all of the code to the new name.  We want to elminate the name ocid from use.
Move fully to crio.

Also cric is being renamed to crioctl for the time being.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

cmd/crio/config.go

@@ -9,8 +9,8 @@ import (
 )
 
 var commentedConfigTemplate = template.Must(template.New("config").Parse(`
-# The "ocid" table contains all of the server options.
-[ocid]
+# The "crio" table contains all of the server options.
+[crio]
 
 # root is a path to the "root directory". OCID stores all of its data,
 # including container images, in this directory.
@@ -28,23 +28,23 @@ storage_driver = "{{ .Storage }}"
 storage_option = [
 {{ range $opt := .StorageOptions }}{{ printf "\t%q,\n" $opt }}{{ end }}]
 
-# The "ocid.api" table contains settings for the kubelet/gRPC
-# interface (which is also used by ocic).
-[ocid.api]
+# The "crio.api" table contains settings for the kubelet/gRPC
+# interface (which is also used by crioctl).
+[crio.api]
 
-# listen is the path to the AF_LOCAL socket on which ocid will listen.
+# listen is the path to the AF_LOCAL socket on which crio will listen.
 listen = "{{ .Listen }}"
 
-# The "ocid.runtime" table contains settings pertaining to the OCI
+# The "crio.runtime" table contains settings pertaining to the OCI
 # runtime used and options for how to set up and manage the OCI runtime.
-[ocid.runtime]
+[crio.runtime]
 
-# runtime is a path to the OCI runtime which ocid will be using.
+# runtime is a path to the OCI runtime which crio will be using.
 runtime = "{{ .Runtime }}"
 
-# runtime_host_privileged is a path to the OCI runtime which ocid
+# runtime_host_privileged is a path to the OCI runtime which crio
 # will be using for host privileged operations.
-# If this string is empty, ocid will not try to use the "runtime"
+# If this string is empty, crio will not try to use the "runtime"
 # for all operations.
 runtime_host_privileged = "{{ .RuntimeHostPrivileged }}"
 
@@ -73,9 +73,9 @@ apparmor_profile = "{{ .ApparmorProfile }}"
 # for the runtime.
 cgroup_manager = "{{ .CgroupManager }}"
 
-# The "ocid.image" table contains settings pertaining to the
+# The "crio.image" table contains settings pertaining to the
 # management of OCI images.
-[ocid.image]
+[crio.image]
 
 # default_transport is the prefix we try prepending to an image name if the
 # image name as we receive it can't be parsed as a valid source reference
@@ -95,9 +95,9 @@ pause_command = "{{ .PauseCommand }}"
 # unspecified so that the default system-wide policy will be used.
 signature_policy = "{{ .SignaturePolicyPath }}"
 
-# The "ocid.network" table contains settings pertaining to the
+# The "crio.network" table contains settings pertaining to the
 # management of CNI plugins.
-[ocid.network]
+[crio.network]
 
 # network_dir is is where CNI network configuration
 # files are stored.
@@ -112,7 +112,7 @@ plugin_dir = "{{ .PluginDir }}"
 
 var configCommand = cli.Command{
 	Name:  "config",
-	Usage: "generate ocid configuration files",
+	Usage: "generate crio configuration files",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "default",

cmd/crio/main.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 )
 
-const ociConfigPath = "/etc/ocid/ocid.conf"
+const ociConfigPath = "/etc/crio/crio.conf"
 
 func mergeConfig(config *server.Config, ctx *cli.Context) error {
 	// Don't parse the config if the user explicitly set it to "".
@@ -117,8 +117,8 @@ func main() {
 		return
 	}
 	app := cli.NewApp()
-	app.Name = "ocid"
-	app.Usage = "ocid server"
+	app.Name = "crio"
+	app.Usage = "crio server"
 	app.Version = "0.3"
 	app.Metadata = map[string]interface{}{
 		"config": server.DefaultConfig(),
@@ -140,7 +140,7 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:  "listen",
-			Usage: "path to ocid socket",
+			Usage: "path to crio socket",
 		},
 		cli.StringFlag{
 			Name:  "log",
@@ -166,11 +166,11 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:  "root",
-			Usage: "ocid root dir",
+			Usage: "crio root dir",
 		},
 		cli.StringFlag{
 			Name:  "runroot",
-			Usage: "ocid state dir",
+			Usage: "crio state dir",
 		},
 		cli.StringFlag{
 			Name:  "storage-driver",
@@ -194,7 +194,7 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:  "apparmor-profile",
-			Usage: "default apparmor profile name (default: \"ocid-default\")",
+			Usage: "default apparmor profile name (default: \"crio-default\")",
 		},
 		cli.BoolFlag{
 			Name:  "selinux",

cmd/crioctl/main.go

@@ -65,8 +65,8 @@ func loadContainerConfig(path string) (*pb.ContainerConfig, error) {
 
 func main() {
 	app := cli.NewApp()
-	app.Name = "ocic"
-	app.Usage = "client for ocid"
+	app.Name = "crioctl"
+	app.Usage = "client for crio"
 	app.Version = "0.3"
 
 	app.Commands = []cli.Command{
@@ -79,7 +79,7 @@ func main() {
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "connect",
-			Value: "/var/run/ocid.sock",
+			Value: "/var/run/crio.sock",
 			Usage: "Socket to connect to",
 		},
 		cli.DurationFlag{

cmd/kpod/README.md

@@ -1,8 +1,8 @@
 # kpod - Simple debugging tool for pods and images
 kpod is a simple client only tool to help with debugging issues when daemons such as CRI runtime and the kubelet are not responding or
 failing. A shared API layer could be created to share code between the daemon and kpod. kpod does not require any daemon running. kpod
-utilizes the same underlying components that ocid uses i.e. containers/image, container/storage, oci-runtime-tool/generate, runc or
-any other OCI compatible runtime. kpod shares state with ocid and so has the capability to debug pods/images created by ocid.
+utilizes the same underlying components that crio uses i.e. containers/image, container/storage, oci-runtime-tool/generate, runc or
+any other OCI compatible runtime. kpod shares state with crio and so has the capability to debug pods/images created by crio.
 
 ## Use cases
 1. List pods.