From b0e9f0eba8160dffa8336bd30d832b12ecefc407 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Wed, 18 Oct 2017 16:33:58 -0700 Subject: [PATCH] Revert "Move crio default sock to /var/run/crio/crio.sock" Signed-off-by: Mrunal Patel --- README.md | 2 +- cmd/crio/main.go | 5 ----- cmd/crioctl/main.go | 2 +- contrib/test/integration/build/kubernetes.yml | 2 +- docs/crio.8.md | 2 +- docs/crio.conf.5.md | 2 +- kubernetes.md | 2 +- server/config.go | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e71a8a09..5391522c 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ You can run a local version of kubernetes with CRI-O using `local-up-cluster.sh` ```shell CGROUP_DRIVER=systemd \ 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 ``` diff --git a/cmd/crio/main.go b/cmd/crio/main.go index 42bf5a91..95289956 100644 --- a/cmd/crio/main.go +++ b/cmd/crio/main.go @@ -8,7 +8,6 @@ import ( _ "net/http/pprof" "os" "os/signal" - "path/filepath" "sort" "strings" @@ -420,10 +419,6 @@ func main() { 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 if _, err := os.Stat(config.Listen); err == nil { if err := os.Remove(config.Listen); err != nil { diff --git a/cmd/crioctl/main.go b/cmd/crioctl/main.go index 3a4446e5..3d77867f 100644 --- a/cmd/crioctl/main.go +++ b/cmd/crioctl/main.go @@ -97,7 +97,7 @@ func main() { app.Flags = []cli.Flag{ cli.StringFlag{ Name: "connect", - Value: "/var/run/crio/crio.sock", + Value: "/var/run/crio.sock", Usage: "Socket to connect to", }, cli.DurationFlag{ diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml index 15070937..206cba44 100644 --- a/contrib/test/integration/build/kubernetes.yml +++ b/contrib/test/integration/build/kubernetes.yml @@ -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 CONTAINER_RUNTIME=remote 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_PRIVILEGED=1 export DNS_SERVER_IP={{ ansible_eth0.ipv4.address }} diff --git a/docs/crio.8.md b/docs/crio.8.md index 31e0b1d5..2c9d4857 100644 --- a/docs/crio.8.md +++ b/docs/crio.8.md @@ -94,7 +94,7 @@ set the CPU profile file path ignore: All volumes are just ignored and no action is taken. **--listen**="" - Path to CRI-O socket (default: "/var/run/crio/crio.sock") + Path to CRI-O socket (default: "/var/run/crio.sock") **--log**="" Set the log file path where internal debug information is written diff --git a/docs/crio.conf.5.md b/docs/crio.conf.5.md index c2f3f358..32cac7a4 100644 --- a/docs/crio.conf.5.md +++ b/docs/crio.conf.5.md @@ -68,7 +68,7 @@ Example: ## CRIO.API TABLE **listen**="" - Path to crio socket (default: "/var/run/crio/crio.sock") + Path to crio socket (default: "/var/run/crio.sock") ## CRIO.RUNTIME TABLE diff --git a/kubernetes.md b/kubernetes.md index 96ef5d89..a88a76a3 100644 --- a/kubernetes.md +++ b/kubernetes.md @@ -79,7 +79,7 @@ KUBELET_ARGS="--pod-manifest-path=/etc/kubernetes/manifests 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. * `--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. Kubelet is prepared now. diff --git a/server/config.go b/server/config.go index cbb692b5..6c2d26cd 100644 --- a/server/config.go +++ b/server/config.go @@ -104,7 +104,7 @@ func DefaultConfig() *Config { return &Config{ Config: *libkpod.DefaultConfig(), APIConfig: APIConfig{ - Listen: "/var/run/crio/crio.sock", + Listen: "/var/run/crio.sock", StreamAddress: "", StreamPort: "10010", },