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>
This commit is contained in:
Dan Walsh
parent
81cfba283a
commit
4493b6f176
52 changed files with 677 additions and 677 deletions
|
|
@ -1,11 +1,11 @@
|
|||
% ocid(8) Open Container Initiative Daemon
|
||||
% crio(8) Open Container Initiative Daemon
|
||||
% Dan Walsh
|
||||
% SEPTEMBER 2016
|
||||
# NAME
|
||||
ocid - Enable OCI Kubernetes Container Runtime daemon
|
||||
crio - Enable OCI Kubernetes Container Runtime daemon
|
||||
|
||||
# SYNOPSIS
|
||||
**ocid**
|
||||
**crio**
|
||||
[**--config**=[*value*]]
|
||||
[**--conmon**=[*value*]]
|
||||
[**--debug**]
|
||||
|
|
@ -32,7 +32,7 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
|
|||
# DESCRIPTION
|
||||
OCI-based implementation of Kubernetes Container Runtime Interface Daemon
|
||||
|
||||
ocid is meant to provide an integration path between OCI conformant runtimes and the kubelet. Specifically, it implements the Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes. The scope of ocid is tied to the scope of the CRI.
|
||||
crio is meant to provide an integration path between OCI conformant runtimes and the kubelet. Specifically, it implements the Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes. The scope of crio is tied to the scope of the CRI.
|
||||
|
||||
* Support multiple image formats including the existing Docker image format
|
||||
* Support for multiple means to download images including trust & image verification
|
||||
|
|
@ -41,20 +41,20 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
|
|||
* Monitoring and logging required to satisfy the CRI
|
||||
* Resource isolation as required by the CRI
|
||||
|
||||
**ocid [GLOBAL OPTIONS]**
|
||||
**crio [GLOBAL OPTIONS]**
|
||||
|
||||
**ocid [GLOBAL OPTIONS] config [OPTIONS]**
|
||||
**crio [GLOBAL OPTIONS] config [OPTIONS]**
|
||||
|
||||
# GLOBAL OPTIONS
|
||||
|
||||
**--apparmor_profile**=""
|
||||
Name of the apparmor profile to be used as the runtime's default (default: "ocid-default")
|
||||
Name of the apparmor profile to be used as the runtime's default (default: "crio-default")
|
||||
|
||||
**--config**=""
|
||||
path to configuration file
|
||||
|
||||
**--conmon**=""
|
||||
path to the conmon executable (default: "/usr/local/libexec/ocid/conmon")
|
||||
path to the conmon executable (default: "/usr/local/libexec/crio/conmon")
|
||||
|
||||
**--debug**
|
||||
Enable debug output for logging
|
||||
|
|
@ -66,7 +66,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
|
|||
Print usage statement
|
||||
|
||||
**--listen**=""
|
||||
Path to ocid socket (default: "/var/run/ocid.sock")
|
||||
Path to crio socket (default: "/var/run/crio.sock")
|
||||
|
||||
**--log**=""
|
||||
Set the log file path where internal debug information is written
|
||||
|
|
@ -93,7 +93,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
|
|||
Enable selinux support (default: false)
|
||||
|
||||
**--seccomp-profile**=""
|
||||
Path to the seccomp json profile to be used as the runtime's default (default: "/etc/ocid/seccomp.json")
|
||||
Path to the seccomp json profile to be used as the runtime's default (default: "/etc/crio/seccomp.json")
|
||||
|
||||
**--signature-policy**=""
|
||||
Path to the signature policy json file (default: "", to use the system-wide default)
|
||||
|
|
@ -130,7 +130,7 @@ it later with **--config**. Global options will modify the output.
|
|||
Output the default configuration (without taking into account any configuration options).
|
||||
|
||||
# SEE ALSO
|
||||
ocid.conf(5)
|
||||
crio.conf(5)
|
||||
|
||||
# HISTORY
|
||||
Sept 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com> and Aleksa Sarai <asarai@suse.de>
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
% ocid.conf(5) Open Container Initiative Daemon
|
||||
% crio.conf(5) Open Container Initiative Daemon
|
||||
% Aleksa Sarai
|
||||
% OCTOBER 2016
|
||||
|
||||
# NAME
|
||||
ocid.conf - Syntax of OCID configuration file
|
||||
crio.conf - Syntax of OCID configuration file
|
||||
|
||||
# DESCRIPTION
|
||||
The OCID configuration file specifies all of the available command-line options
|
||||
for the ocid(8) program, but in a TOML format that can be more easily modified
|
||||
for the crio(8) program, but in a TOML format that can be more easily modified
|
||||
and versioned.
|
||||
|
||||
# FORMAT
|
||||
The [TOML format][toml] is used as the encoding of the configuration file.
|
||||
Every option and subtable listed here is nested under a global "ocid" table.
|
||||
Every option and subtable listed here is nested under a global "crio" table.
|
||||
No bare options are used. The format of TOML can be simplified to:
|
||||
|
||||
[table]
|
||||
|
|
@ -26,7 +26,7 @@ No bare options are used. The format of TOML can be simplified to:
|
|||
|
||||
## OCID TABLE
|
||||
|
||||
The `ocid` table supports the following options:
|
||||
The `crio` table supports the following options:
|
||||
|
||||
|
||||
**root**=""
|
||||
|
|
@ -44,12 +44,12 @@ The `ocid` table supports the following options:
|
|||
## OCID.API TABLE
|
||||
|
||||
**listen**=""
|
||||
Path to ocid socket (default: "/var/run/ocid.sock")
|
||||
Path to crio socket (default: "/var/run/crio.sock")
|
||||
|
||||
## OCID.RUNTIME TABLE
|
||||
|
||||
**conmon**=""
|
||||
Path to the conmon executable (default: "/usr/local/libexec/ocid/conmon")
|
||||
Path to the conmon executable (default: "/usr/local/libexec/crio/conmon")
|
||||
|
||||
**conmon_env**=[]
|
||||
Environment variable list for conmon process (default: ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",])
|
||||
|
|
@ -64,10 +64,10 @@ The `ocid` table supports the following options:
|
|||
Path to the signature policy json file (default: "", to use the system-wide default)
|
||||
|
||||
**seccomp_profile**=""
|
||||
Path to the seccomp json profile to be used as the runtime's default (default: "/etc/ocid/seccomp.json")
|
||||
Path to the seccomp json profile to be used as the runtime's default (default: "/etc/crio/seccomp.json")
|
||||
|
||||
**apparmor_profile**=""
|
||||
Name of the apparmor profile to be used as the runtime's default (default: "ocid-default")
|
||||
Name of the apparmor profile to be used as the runtime's default (default: "crio-default")
|
||||
|
||||
## OCID.IMAGE TABLE
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ The `ocid` table supports the following options:
|
|||
Path to CNI plugin binaries (default: "/opt/cni/bin/")
|
||||
|
||||
# SEE ALSO
|
||||
ocid(8)
|
||||
crio(8)
|
||||
|
||||
# HISTORY
|
||||
Oct 2016, Originally compiled by Aleksa Sarai <asarai@suse.de>
|
||||
|
|
@ -36,7 +36,7 @@ pull** IMAGE, before it starts the container from that image.
|
|||
Launch a pod
|
||||
|
||||
# SEE ALSO
|
||||
kpod(1), ocid(8), ocid.conf(5)
|
||||
kpod(1), crio(8), crio.conf(5)
|
||||
|
||||
# HISTORY
|
||||
Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com>
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ 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.
|
||||
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.
|
||||
|
||||
**kpod [GLOBAL OPTIONS]**
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ has the capability to debug pods/images created by ocid.
|
|||
Launch a pod
|
||||
|
||||
# SEE ALSO
|
||||
ocid(8), ocid.conf(5)
|
||||
crio(8), crio.conf(5)
|
||||
|
||||
# HISTORY
|
||||
Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue