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

Update all glog flags to log-level.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-01-17 19:33:00 +00:00
parent 3d68005c04
commit 144ff3989b
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -107,7 +107,7 @@ sudo containerd
``` ```
2. Start `cri-containerd` as root in a second terminal: 2. Start `cri-containerd` as root in a second terminal:
```bash ```bash
sudo cri-containerd -v 2 --alsologtostderr sudo cri-containerd
``` ```
3. From the Kubernetes project directory startup a local cluster using `cri-containerd`: 3. From the Kubernetes project directory startup a local cluster using `cri-containerd`:
```bash ```bash

2
cluster/gce/cloud-init/master.yaml
View File

@ -82,7 +82,7 @@ write_files:
# cri-containerd on master uses the cni binary and config in the # cri-containerd on master uses the cni binary and config in the
# release tarball. # release tarball.
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--logtostderr --v=4 \ --log-level=debug \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \ --network-bin-dir=/home/cri-containerd/opt/cni/bin \
--network-conf-dir=/home/cri-containerd/etc/cni/net.d --network-conf-dir=/home/cri-containerd/etc/cni/net.d

2
cluster/gce/cloud-init/node.yaml
View File

@ -85,7 +85,7 @@ write_files:
# Point to /home/kubernetes/bin where calico setup cni binary in kube-up.sh. # Point to /home/kubernetes/bin where calico setup cni binary in kube-up.sh.
# Point to /etc/cni/net.d where calico put cni config in kube-up.sh. # Point to /etc/cni/net.d where calico put cni config in kube-up.sh.
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--logtostderr --v=4 \ --log-level=debug \
--network-bin-dir=/home/kubernetes/bin \ --network-bin-dir=/home/kubernetes/bin \
--network-conf-dir=/etc/cni/net.d --network-conf-dir=/etc/cni/net.d

2
contrib/systemd-units/cri-containerd.service
View File

@ -11,7 +11,7 @@ LimitNOFILE=1048576
# in the kernel. We recommend using cgroups to do container-local accounting. # in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
ExecStart=/usr/local/bin/cri-containerd --logtostderr ExecStart=/usr/local/bin/cri-containerd
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
hack/test-utils.sh
View File

@ -51,7 +51,7 @@ test_setup() {
# Start cri-containerd # Start cri-containerd
if ${STANDALONE_CRI_CONTAINERD}; then if ${STANDALONE_CRI_CONTAINERD}; then
keepalive "sudo ${ROOT}/_output/cri-containerd --alsologtostderr --v 4 ${CRI_CONTAINERD_FLAGS}" \ keepalive "sudo ${ROOT}/_output/cri-containerd --log-level=debug ${CRI_CONTAINERD_FLAGS}" \
${RESTART_WAIT_PERIOD} &> ${report_dir}/cri-containerd.log & ${RESTART_WAIT_PERIOD} &> ${report_dir}/cri-containerd.log &
cri_containerd_pid=$! cri_containerd_pid=$!
fi fi

2
test/e2e_node/init.yaml
View File

@ -79,7 +79,7 @@ write_files:
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--logtostderr --v=4 \ --log-level=debug \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \ --network-bin-dir=/home/cri-containerd/opt/cni/bin \
--network-conf-dir=/home/cri-containerd/etc/cni/net.d --network-conf-dir=/home/cri-containerd/etc/cni/net.d