github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7665 from vmarmol/cluster-rkt

Browse Source 
Provide container_runtime flag to Kubelet in CoreOS.
This commit is contained in:
Yu-Ju Hong 2015-05-04 10:06:58 -07:00
commit c3ba88296b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/coreos/helper.sh
View File

@ -48,6 +48,7 @@ KUBELET_TOKEN: $(yaml-quote ${KUBELET_TOKEN:-})
KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-}) KUBE_PROXY_TOKEN: $(yaml-quote ${KUBE_PROXY_TOKEN:-})
ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-}) ADMISSION_CONTROL: $(yaml-quote ${ADMISSION_CONTROL:-})
MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE}) MASTER_IP_RANGE: $(yaml-quote ${MASTER_IP_RANGE})
KUBERNETES_CONTAINER_RUNTIME: $(yaml-quote ${CONTAINER_RUNTIME})
EOF EOF
else else
cat >>$file <<EOF cat >>$file <<EOF
@ -78,6 +79,7 @@ ZONE=$(yaml-quote ${ZONE})
EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS}) EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS})
ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false}) ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
PROJECT_ID=$(yaml-quote ${PROJECT}) PROJECT_ID=$(yaml-quote ${PROJECT})
KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME})
EOF EOF
fi fi
} }

3
cluster/gce/coreos/node.yaml
View File

@ -129,7 +129,8 @@ coreos:
--v=2 \ --v=2 \
--cluster_dns=10.0.0.10 \ --cluster_dns=10.0.0.10 \
--cluster_domain=kubernetes.local \ --cluster_domain=kubernetes.local \
--logtostderr=true --logtostderr=true \
--container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
Restart=always Restart=always
RestartSec=10 RestartSec=10