From f48543aba54e7edd545389fd104695463f0a354b Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Thu, 23 Jul 2015 20:30:53 +0200 Subject: [PATCH] Made enabling Kube UI configurable --- cluster/aws/config-default.sh | 3 +++ cluster/aws/config-test.sh | 3 +++ cluster/aws/templates/create-dynamic-salt-files.sh | 1 + cluster/aws/util.sh | 1 + cluster/azure/config-default.sh | 3 +++ cluster/gce/config-default.sh | 3 +++ cluster/gce/config-test.sh | 3 +++ cluster/gce/configure-vm.sh | 1 + cluster/gce/coreos/helper.sh | 2 ++ cluster/gce/debian/helper.sh | 1 + cluster/gke/config-common.sh | 1 + cluster/rackspace/config-default.sh | 3 +++ cluster/saltbase/salt/kube-addons/init.sls | 2 +- cluster/ubuntu/config-default.sh | 3 +++ cluster/vagrant/config-default.sh | 3 +++ cluster/vagrant/provision-master.sh | 1 + cluster/vsphere/config-default.sh | 3 +++ cluster/vsphere/templates/create-dynamic-salt-files.sh | 1 + 18 files changed, 37 insertions(+), 1 deletion(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 6da9ae8fd9a..5f938b55527 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -77,6 +77,9 @@ DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index b4c8c29c556..2a13bbab400 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -73,6 +73,9 @@ DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/aws/templates/create-dynamic-salt-files.sh b/cluster/aws/templates/create-dynamic-salt-files.sh index af1bd99b6ec..594fdf6308a 100644 --- a/cluster/aws/templates/create-dynamic-salt-files.sh +++ b/cluster/aws/templates/create-dynamic-salt-files.sh @@ -27,6 +27,7 @@ allocate_node_cidrs: '$(echo "$ALLOCATE_NODE_CIDRS" | sed -e "s/'/''/g")' service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")' enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' +enable_cluster_ui: '$(echo "$ENABLE_CLUSTER_UI" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")' diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 18260322cd3..99df8895abd 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -816,6 +816,7 @@ function kube-up { echo "readonly LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'" echo "readonly ELASTICSEARCH_LOGGING_REPLICAS='${ELASTICSEARCH_LOGGING_REPLICAS:-}'" echo "readonly ENABLE_CLUSTER_DNS='${ENABLE_CLUSTER_DNS:-false}'" + echo "readonly ENABLE_CLUSTER_UI='${ENABLE_CLUSTER_UI:-false}'" echo "readonly DNS_REPLICAS='${DNS_REPLICAS:-}'" echo "readonly DNS_SERVER_IP='${DNS_SERVER_IP:-}'" echo "readonly DNS_DOMAIN='${DNS_DOMAIN:-}'" diff --git a/cluster/azure/config-default.sh b/cluster/azure/config-default.sh index c8d35ce4472..6dd8bd0ff60 100644 --- a/cluster/azure/config-default.sh +++ b/cluster/azure/config-default.sh @@ -51,5 +51,8 @@ ELASTICSEARCH_LOGGING_REPLICAS=1 # google - Heapster, Google Cloud Monitoring, and Google Cloud Logging ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 6282d70ea09..051b421a24d 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -75,6 +75,9 @@ DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Optional: Create autoscaler for cluster's nodes. # NOT WORKING YET! ENABLE_NODE_AUTOSCALER="${KUBE_ENABLE_NODE_AUTOSCALER:-false}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d8df1d6f87a..4918331c8b0 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -72,6 +72,9 @@ DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Optional: Create autoscaler for cluster's nodes. # NOT WORKING YET! ENABLE_NODE_AUTOSCALER="${KUBE_ENABLE_NODE_AUTOSCALER:-false}" diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index 6593049149a..5501e01a86d 100644 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -267,6 +267,7 @@ allocate_node_cidrs: '$(echo "$ALLOCATE_NODE_CIDRS" | sed -e "s/'/''/g")' service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")' enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' +enable_cluster_ui: '$(echo "$ENABLE_CLUSTER_UI" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")' diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index 76e83d21157..f251b08b6da 100755 --- a/cluster/gce/coreos/helper.sh +++ b/cluster/gce/coreos/helper.sh @@ -38,6 +38,7 @@ SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE}) ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false}) ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none}) ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) +ENABLE_CLUSTER_UI: $(yaml-quote ${ENABLE_CLUSTER_UI:-false}) ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-}) @@ -71,6 +72,7 @@ SERVER_BINARY_TAR_URL=$(yaml-quote ${SERVER_BINARY_TAR_URL}) SERVICE_CLUSTER_IP_RANGE=$(yaml-quote ${SERVICE_CLUSTER_IP_RANGE}) ENABLE_CLUSTER_MONITORING=$(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none}) ENABLE_CLUSTER_LOGGING=$(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) +ENABLE_CLUSTER_UI=$(yaml-quote ${ENABLE_CLUSTER_UI:-false}) ENABLE_NODE_LOGGING=$(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION=$(yaml-quote ${LOGGING_DESTINATION:-}) ELASTICSEARCH_LOGGING_REPLICAS=$(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-}) diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh index 4425721a1a4..8326c650197 100755 --- a/cluster/gce/debian/helper.sh +++ b/cluster/gce/debian/helper.sh @@ -36,6 +36,7 @@ KUBERNETES_MASTER_NAME: $(yaml-quote ${MASTER_NAME}) ALLOCATE_NODE_CIDRS: $(yaml-quote ${ALLOCATE_NODE_CIDRS:-false}) ENABLE_CLUSTER_MONITORING: $(yaml-quote ${ENABLE_CLUSTER_MONITORING:-none}) ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) +ENABLE_CLUSTER_UI: $(yaml-quote ${ENABLE_CLUSTER_UI:-false}) ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-}) diff --git a/cluster/gke/config-common.sh b/cluster/gke/config-common.sh index 63625ab799c..2c770e3148e 100644 --- a/cluster/gke/config-common.sh +++ b/cluster/gke/config-common.sh @@ -30,6 +30,7 @@ GCLOUD="${GCLOUD:-gcloud}" CMD_GROUP="${CMD_GROUP:-alpha}" GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}" ENABLE_CLUSTER_DNS=false +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" MINION_SCOPES="${MINION_SCOPES:-"compute-rw,storage-ro"}" # This is a hack, but I keep setting this when I run commands manually, and diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index ebee43c794e..dd436130eac 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -57,3 +57,6 @@ ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="10.0.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 + +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls index ceac24e703f..5dab9c8fa5d 100644 --- a/cluster/saltbase/salt/kube-addons/init.sls +++ b/cluster/saltbase/salt/kube-addons/init.sls @@ -94,7 +94,7 @@ addon-dir-create: - file_mode: 644 {% endif %} -{% if pillar.get('enable_cluster_ui', 'true').lower() == 'true' %} +{% if pillar.get('enable_cluster_ui', '').lower() == 'true' %} /etc/kubernetes/addons/kube-ui: file.recurse: - source: salt://kube-addons/kube-ui diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index c35df00d6cb..c31ad7842d7 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -60,5 +60,8 @@ DNS_SERVER_IP=${DNS_SERVER_IP:-"192.168.3.10"} DNS_DOMAIN=${DNS_DOMAIN:-"cluster.local"} DNS_REPLICAS=${DNS_REPLICAS:-1} +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev #RUNTIME_CONFIG="" diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index da6d74519f0..6cec037741b 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -79,6 +79,9 @@ DNS_SERVER_IP="10.247.0.10" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" + # Optional: Enable setting flags for kube-apiserver to turn on behavior in active-dev #RUNTIME_CONFIG="" RUNTIME_CONFIG="api/v1" diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 23d7306147a..2d1f99fdf9f 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -109,6 +109,7 @@ cat </srv/salt-overlay/pillar/cluster-params.sls cert_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")' enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' + enable_cluster_ui: '$(echo "$ENABLE_CLUSTER_UI" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' elasticsearch_replicas: '$(echo "$ELASTICSEARCH_LOGGING_REPLICAS" | sed -e "s/'/''/g")' diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index be2b9a5a430..3cb73a2be58 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -52,3 +52,6 @@ ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}" DNS_SERVER_IP="10.244.240.240" DNS_DOMAIN="cluster.local" DNS_REPLICAS=1 + +# Optional: Install Kubernetes UI +ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" diff --git a/cluster/vsphere/templates/create-dynamic-salt-files.sh b/cluster/vsphere/templates/create-dynamic-salt-files.sh index b474f9561e6..c9468cd4803 100755 --- a/cluster/vsphere/templates/create-dynamic-salt-files.sh +++ b/cluster/vsphere/templates/create-dynamic-salt-files.sh @@ -25,6 +25,7 @@ node_instance_prefix: $NODE_INSTANCE_PREFIX service_cluster_ip_range: $SERVICE_CLUSTER_IP_RANGE enable_cluster_monitoring: $ENABLE_CLUSTER_MONITORING enable_cluster_logging: $ENABLE_CLUSTER_LOGGING +enable_cluster_ui: $ENABLE_CLUSTER_UI enable_node_logging: $ENABLE_NODE_LOGGING logging_destination: $LOGGING_DESTINATION elasticsearch_replicas: $ELASTICSEARCH_LOGGING_REPLICAS