github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #748 from Random-Liu/use-full-sock-path

Browse Source 
Add `unix://` prefix for socket addresses used by CRI remote client.
This commit is contained in:
Lantao Liu 2018-04-23 09:52:07 -07:00 committed by GitHub
commit 09ff081784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -121,7 +121,7 @@ sudo containerd
``` ```
2. From the Kubernetes project directory startup a local cluster using `containerd`: 2. From the Kubernetes project directory startup a local cluster using `containerd`:
```bash ```bash
CONTAINER_RUNTIME=remote CONTAINER_RUNTIME_ENDPOINT='/run/containerd/containerd.sock' ./hack/local-up-cluster.sh CONTAINER_RUNTIME=remote CONTAINER_RUNTIME_ENDPOINT='unix:///run/containerd/containerd.sock' ./hack/local-up-cluster.sh
``` ```
### Test ### Test
See [here](./docs/testing.md) for information about test. See [here](./docs/testing.md) for information about test.

2
cluster/gce/env
View File

@ -11,7 +11,7 @@ fi
export KUBE_MASTER_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/master.yaml,containerd-configure-sh=${GCE_DIR}/configure.sh,containerd-env=${version_file}" export KUBE_MASTER_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/master.yaml,containerd-configure-sh=${GCE_DIR}/configure.sh,containerd-env=${version_file}"
export KUBE_NODE_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/node.yaml,containerd-configure-sh=${GCE_DIR}/configure.sh,containerd-env=${version_file}" export KUBE_NODE_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/node.yaml,containerd-configure-sh=${GCE_DIR}/configure.sh,containerd-env=${version_file}"
export KUBE_CONTAINER_RUNTIME="remote" export KUBE_CONTAINER_RUNTIME="remote"
export KUBE_CONTAINER_RUNTIME_ENDPOINT="/run/containerd/containerd.sock" export KUBE_CONTAINER_RUNTIME_ENDPOINT="unix:///run/containerd/containerd.sock"
export KUBE_CONTAINER_RUNTIME_NAME=containerd export KUBE_CONTAINER_RUNTIME_NAME=containerd
export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load" export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load"
export NETWORK_PROVIDER="" export NETWORK_PROVIDER=""

4
contrib/ansible/cri-containerd.yaml
View File

@ -46,7 +46,7 @@
- name: "Add runtime args in kubelet conf" - name: "Add runtime args in kubelet conf"
lineinfile: lineinfile:
dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf" dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/system.slice/containerd.service --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=/run/containerd/containerd.sock\"" line: "Environment=\"KUBELET_EXTRA_ARGS= --runtime-cgroups=/system.slice/containerd.service --container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock\""
insertafter: '\[Service\]' insertafter: '\[Service\]'
when: check_args.stdout == "" when: check_args.stdout == ""
@ -57,5 +57,5 @@
- name: "Pre-pull pause container image" - name: "Pre-pull pause container image"
shell: | shell: |
/usr/local/bin/ctr pull k8s.gcr.io/pause:3.1 /usr/local/bin/ctr pull k8s.gcr.io/pause:3.1
/usr/local/bin/crictl --runtime-endpoint /run/containerd/containerd.sock \ /usr/local/bin/crictl --runtime-endpoint unix:///run/containerd/containerd.sock \
pull k8s.gcr.io/pause:3.1 pull k8s.gcr.io/pause:3.1

6
docs/crictl.md
View File

@ -22,8 +22,8 @@ so you don't have to repeatedly specify the runtime sock used to connect crictl
to the container runtime: to the container runtime:
```console ```console
$ cat /etc/crictl.yaml $ cat /etc/crictl.yaml
runtime-endpoint: /run/containerd/containerd.sock runtime-endpoint: unix:///run/containerd/containerd.sock
image-endpoint: /run/containerd/containerd.sock image-endpoint: unix:///run/containerd/containerd.sock
timeout: 10 timeout: 10
debug: true debug: true
``` ```
@ -188,7 +188,7 @@ $ crictl info
"sandboxImage": "k8s.gcr.io/pause:3.1", "sandboxImage": "k8s.gcr.io/pause:3.1",
"statsCollectPeriod": 10, "statsCollectPeriod": 10,
"containerdRootDir": "/var/lib/containerd", "containerdRootDir": "/var/lib/containerd",
"containerdEndpoint": "/run/containerd/containerd.sock", "containerdEndpoint": "unix:///run/containerd/containerd.sock",
"rootDir": "/var/lib/containerd/io.containerd.grpc.v1.cri", "rootDir": "/var/lib/containerd/io.containerd.grpc.v1.cri",
"stateDir": "/run/containerd/io.containerd.grpc.v1.cri", "stateDir": "/run/containerd/io.containerd.grpc.v1.cri",
}, },

2
hack/install/install-critools.sh
View File

@ -33,7 +33,7 @@ make
${SUDO} make install -e BINDIR=${CRITOOL_DIR} GOPATH=${GOPATH} ${SUDO} make install -e BINDIR=${CRITOOL_DIR} GOPATH=${GOPATH}
${SUDO} mkdir -p ${CRICTL_CONFIG_DIR} ${SUDO} mkdir -p ${CRICTL_CONFIG_DIR}
${SUDO} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF ${SUDO} bash -c 'cat >'${CRICTL_CONFIG_DIR}'/crictl.yaml <<EOF
runtime-endpoint: /run/containerd/containerd.sock runtime-endpoint: unix:///run/containerd/containerd.sock
EOF' EOF'
# Clean the tmp GOPATH dir. # Clean the tmp GOPATH dir.

2
hack/test-utils.sh
View File

@ -27,7 +27,7 @@ if [ -f "${CONTAINERD_CONFIG_FILE}" ]; then
CONTAINERD_FLAGS+="--config ${CONTAINERD_CONFIG_FILE} " CONTAINERD_FLAGS+="--config ${CONTAINERD_CONFIG_FILE} "
fi fi
CONTAINERD_SOCK=/run/containerd/containerd.sock CONTAINERD_SOCK=unix:///run/containerd/containerd.sock
containerd_pid= containerd_pid=

2
hack/utils.sh
View File

@ -17,7 +17,7 @@
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/.. ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
# Not from vendor.conf. # Not from vendor.conf.
CRITOOL_VERSION=db53d78569a8116fff1f60366a8de3130e767eeb CRITOOL_VERSION=f37a5a1edb69ee742c6e42c57413fe6b63788085
CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools CRITOOL_PKG=github.com/kubernetes-incubator/cri-tools
CRITOOL_REPO=github.com/kubernetes-incubator/cri-tools CRITOOL_REPO=github.com/kubernetes-incubator/cri-tools

2
integration/test_utils.go
View File

@ -51,7 +51,7 @@ var (
criPluginClient api.CRIPluginServiceClient criPluginClient api.CRIPluginServiceClient
) )
var criEndpoint = flag.String("cri-endpoint", "/run/containerd/containerd.sock", "The endpoint of cri plugin.") var criEndpoint = flag.String("cri-endpoint", "unix:///run/containerd/containerd.sock", "The endpoint of cri plugin.")
var criRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.") var criRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.")
func init() { func init() {