vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Move crio default sock to /var/run/crio/crio.sock"

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2017-10-18 16:33:58 -07:00
parent 3be3936d7d
commit b0e9f0eba8
8 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -242,7 +242,7 @@ You can run a local version of kubernetes with CRI-O using `local-up-cluster.sh`
```shell ```shell
CGROUP_DRIVER=systemd \ CGROUP_DRIVER=systemd \
CONTAINER_RUNTIME=remote \ CONTAINER_RUNTIME=remote \
CONTAINER_RUNTIME_ENDPOINT='/var/run/crio/crio.sock --runtime-request-timeout=15m' \ CONTAINER_RUNTIME_ENDPOINT='/var/run/crio.sock --runtime-request-timeout=15m' \
./hack/local-up-cluster.sh ./hack/local-up-cluster.sh
``` ```

5
cmd/crio/main.go
View file

@ -8,7 +8,6 @@ import (
_ "net/http/pprof" _ "net/http/pprof"
"os" "os"
"os/signal" "os/signal"
"path/filepath"
"sort" "sort"
"strings" "strings"
@ -420,10 +419,6 @@ func main() {
return fmt.Errorf("invalid --runtime value %q", err) return fmt.Errorf("invalid --runtime value %q", err)
} }
if err := os.MkdirAll(filepath.Dir(config.Listen), 0755); err != nil {
return err
}
// Remove the socket if it already exists // Remove the socket if it already exists
if _, err := os.Stat(config.Listen); err == nil { if _, err := os.Stat(config.Listen); err == nil {
if err := os.Remove(config.Listen); err != nil { if err := os.Remove(config.Listen); err != nil {

2
cmd/crioctl/main.go
View file

@ -97,7 +97,7 @@ func main() {
app.Flags = []cli.Flag{ app.Flags = []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "connect", Name: "connect",
Value: "/var/run/crio/crio.sock", Value: "/var/run/crio.sock",
Usage: "Socket to connect to", Usage: "Socket to connect to",
}, },
cli.DurationFlag{ cli.DurationFlag{

2
contrib/test/integration/build/kubernetes.yml
View file

@ -38,7 +38,7 @@
export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/ export PATH=/usr/local/go/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/root/bin:{{ ansible_env.GOPATH }}/bin:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/third_party/etcd:{{ ansible_env.GOPATH }}/src/k8s.io/kubernetes/_output/local/bin/linux/amd64/
export CONTAINER_RUNTIME=remote export CONTAINER_RUNTIME=remote
export CGROUP_DRIVER=systemd export CGROUP_DRIVER=systemd
export CONTAINER_RUNTIME_ENDPOINT='/var/run/crio/crio.sock --runtime-request-timeout=5m' export CONTAINER_RUNTIME_ENDPOINT='/var/run/crio.sock --runtime-request-timeout=5m'
export ALLOW_SECURITY_CONTEXT="," export ALLOW_SECURITY_CONTEXT=","
export ALLOW_PRIVILEGED=1 export ALLOW_PRIVILEGED=1
export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }} export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }}

2
docs/crio.8.md
View file

@ -94,7 +94,7 @@ set the CPU profile file path
ignore: All volumes are just ignored and no action is taken. ignore: All volumes are just ignored and no action is taken.
**--listen**="" **--listen**=""
Path to CRI-O socket (default: "/var/run/crio/crio.sock") Path to CRI-O socket (default: "/var/run/crio.sock")
**--log**="" **--log**=""
Set the log file path where internal debug information is written Set the log file path where internal debug information is written

2
docs/crio.conf.5.md
View file

@ -68,7 +68,7 @@ Example:
## CRIO.API TABLE ## CRIO.API TABLE
**listen**="" **listen**=""
Path to crio socket (default: "/var/run/crio/crio.sock") Path to crio socket (default: "/var/run/crio.sock")
## CRIO.RUNTIME TABLE ## CRIO.RUNTIME TABLE

2
kubernetes.md
View file

@ -79,7 +79,7 @@ KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests
You need to add following parameters to `KUBELET_ARGS`: You need to add following parameters to `KUBELET_ARGS`:
* `--experimental-cri=true` - Use Container Runtime Interface. Will be true by default from kubernetes 1.6 release. * `--experimental-cri=true` - Use Container Runtime Interface. Will be true by default from kubernetes 1.6 release.
* `--container-runtime=remote` - Use remote runtime with provided socket. * `--container-runtime=remote` - Use remote runtime with provided socket.
* `--container-runtime-endpoint=/var/run/crio/crio.sock` - Socket for remote runtime (default `crio` socket localization). * `--container-runtime-endpoint=/var/run/crio.sock` - Socket for remote runtime (default `crio` socket localization).
* `--runtime-request-timeout=10m` - Optional but useful. Some requests, especially pulling huge images, may take longer than default (2 minutes) and will cause an error. * `--runtime-request-timeout=10m` - Optional but useful. Some requests, especially pulling huge images, may take longer than default (2 minutes) and will cause an error.
Kubelet is prepared now. Kubelet is prepared now.

2
server/config.go
View file

@ -104,7 +104,7 @@ func DefaultConfig() *Config {
return &Config{ return &Config{
Config: *libkpod.DefaultConfig(), Config: *libkpod.DefaultConfig(),
APIConfig: APIConfig{ APIConfig: APIConfig{
Listen: "/var/run/crio/crio.sock", Listen: "/var/run/crio.sock",
StreamAddress: "", StreamAddress: "",
StreamPort: "10010", StreamPort: "10010",
}, },