Skip to content

K
k3s
Commit 66a644b2 authored by Jerzy Szczepkowski's avatar Jerzy Szczepkowski
Browse files
Options

Merge pull request #13237 from andyzheng0831/trusty

Support kube-registry-proxy addon in trusty nodes
parents 3f1a94f4 9f28e784
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
cluster/gce/trusty/node.yaml
View file @ 66a644b2
...@@ -358,13 +358,18 @@ script ...@@ -358,13 +358,18 @@ script
# Configuration files are located at /etc/saltbase. # Configuration files are located at /etc/saltbase.
. /etc/kube-env . /etc/kube-env
if [ "${ENABLE_NODE_LOGGING}" = "true" ]; then # Fluentd
if [ "${LOGGING_DESTINATION}" = "gcp" ]; then 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/ 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/ cp /etc/saltbase/kubernetes/saltbase/salt/fluentd-es/fluentd-es.yaml /etc/kubernetes/manifests/
fi fi
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 end script
--===============6024533374511606659==-- --===============6024533374511606659==--
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment