From 9f28e784dc70da9c63322c31939f19f688a190ab Mon Sep 17 00:00:00 2001 From: Andy Zheng Date: Wed, 26 Aug 2015 15:29:47 -0700 Subject: [PATCH] Support kube-registry-proxy addon in trusty nodes --- cluster/gce/trusty/node.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 4485dcd2ee7..f386adde215 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -358,13 +358,18 @@ script # Configuration files are located at /etc/saltbase. . /etc/kube-env - if [ "${ENABLE_NODE_LOGGING}" = "true" ]; then - if [ "${LOGGING_DESTINATION}" = "gcp" ]; then + # Fluentd + if [ "${ENABLE_NODE_LOGGING:-}" = "true" ]; then + if [ "${LOGGING_DESTINATION:-}" = "gcp" ]; then cp /etc/saltbase/kubernetes/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml /etc/kubernetes/manifests/ - elif [ "${LOGGING_DESTINATION}" = "elasticsearch" ]; then + elif [ "${LOGGING_DESTINATION:-}" = "elasticsearch" ]; then cp /etc/saltbase/kubernetes/saltbase/salt/fluentd-es/fluentd-es.yaml /etc/kubernetes/manifests/ fi fi + # Kube-registry-proxy + if [ "${ENABLE_CLUSTER_REGISTRY:-}" = "true" ]; then + cp /etc/saltbase/kubernetes/saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml /etc/kubernetes/manifests/ + fi end script --===============6024533374511606659==--