Merge pull request #747 from Random-Liu/fix-fluentd-support

Add KUBE_CONTAINER_RUNTIME_NAME to fix fluentd support.
containerd · Apr 20, 2018 · 59d7112 · 59d7112
2 parents b590633 + b3d15cf
commit 59d7112
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cluster/gce/env b/cluster/gce/env
@@ -12,6 +12,7 @@ export KUBE_MASTER_EXTRA_METADATA="user-data=${GCE_DIR}/cloud-init/master.yaml,c
 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_ENDPOINT="/run/containerd/containerd.sock"
+export KUBE_CONTAINER_RUNTIME_NAME=containerd
 export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load"
 export NETWORK_PROVIDER=""
 export NON_MASQUERADE_CIDR="0.0.0.0/0"