diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index eace78ebf50..5e1d08e3701 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -50,9 +50,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" # Otherwise amazon-given public ip will be used (it'll change with reboot). MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" - # Optional: Cluster monitoring to setup as part of the cluster bring up: # none - No cluster monitoring setup # influxdb - Heapster, InfluxDB, and Grafana diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh index f05c9b0b1b0..2ca00e721a3 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -46,10 +46,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}" # Otherwise amazon-given public ip will be used (it'll change with reboot). MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}" - -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" - # Optional: Cluster monitoring to setup as part of the cluster bring up: # none - No cluster monitoring setup # influxdb - Heapster, InfluxDB, and Grafana diff --git a/cluster/aws/templates/create-dynamic-salt-files.sh b/cluster/aws/templates/create-dynamic-salt-files.sh index 428659ca2b3..361dc696077 100644 --- a/cluster/aws/templates/create-dynamic-salt-files.sh +++ b/cluster/aws/templates/create-dynamic-salt-files.sh @@ -26,7 +26,6 @@ cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")' 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_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index f47f9931d56..614c13faef8 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -741,7 +741,6 @@ function kube-up { echo "readonly KUBE_PASSWORD='${KUBE_PASSWORD}'" echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'" echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-none}'" - echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "readonly ENABLE_CLUSTER_LOGGING='${ENABLE_CLUSTER_LOGGING:-false}'" echo "readonly ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'" echo "readonly LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'" diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 56e2a029e38..66a5468a86e 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -47,9 +47,6 @@ POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET ALLOCATE_NODE_CIDRS=true -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" - # Optional: Cluster monitoring to setup as part of the cluster bring up: # none - No cluster monitoring setup # influxdb - Heapster, InfluxDB, and Grafana diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 0e4ffbd4dea..64ab568d129 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -47,9 +47,6 @@ MINION_SCOPES=("storage-ro" "compute-rw" "https://www.googleapis.com/auth/loggin POLL_SLEEP_INTERVAL=3 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}" - # Optional: Cluster monitoring to setup as part of the cluster bring up: # none - No cluster monitoring setup # influxdb - Heapster, InfluxDB, and Grafana diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh index 5ac6abc0533..f1dff09d2db 100644 --- a/cluster/gce/configure-vm.sh +++ b/cluster/gce/configure-vm.sh @@ -266,7 +266,6 @@ cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")' 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_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index 27cdb087a79..2fc38e1d790 100644 --- a/cluster/gce/coreos/helper.sh +++ b/cluster/gce/coreos/helper.sh @@ -37,7 +37,6 @@ SALT_TAR_HASH: $(yaml-quote ${SALT_TAR_HASH}) 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_NODE_MONITORING: $(yaml-quote ${ENABLE_NODE_MONITORING:-false}) ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) @@ -71,7 +70,6 @@ NODE_INSTANCE_PREFIX=$(yaml-quote ${NODE_INSTANCE_PREFIX}) 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_NODE_MONITORING=$(yaml-quote ${ENABLE_NODE_MONITORING:-false}) ENABLE_CLUSTER_LOGGING=$(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) ENABLE_NODE_LOGGING=$(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION=$(yaml-quote ${LOGGING_DESTINATION:-}) diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh index 1f677072ef3..142cab11787 100644 --- a/cluster/gce/debian/helper.sh +++ b/cluster/gce/debian/helper.sh @@ -35,7 +35,6 @@ SERVICE_CLUSTER_IP_RANGE: $(yaml-quote ${SERVICE_CLUSTER_IP_RANGE}) 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_NODE_MONITORING: $(yaml-quote ${ENABLE_NODE_MONITORING:-false}) ENABLE_CLUSTER_LOGGING: $(yaml-quote ${ENABLE_CLUSTER_LOGGING:-false}) ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false}) LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-}) diff --git a/cluster/libvirt-coreos/config-default.sh b/cluster/libvirt-coreos/config-default.sh index 7cdcca8769a..d6e407f376f 100644 --- a/cluster/libvirt-coreos/config-default.sh +++ b/cluster/libvirt-coreos/config-default.sh @@ -48,9 +48,6 @@ MINION_CONTAINER_SUBNETS[$NUM_MINIONS]=$MASTER_CONTAINER_SUBNET SERVICE_CLUSTER_IP_RANGE=10.11.0.0/16 # formerly PORTAL_NET -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING=true - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/cluster/rackspace/config-default.sh b/cluster/rackspace/config-default.sh index 7dffb34a534..44f897dffb9 100644 --- a/cluster/rackspace/config-default.sh +++ b/cluster/rackspace/config-default.sh @@ -38,9 +38,6 @@ MINION_NAMES=($(eval echo ${INSTANCE_PREFIX}-minion-{1..${NUM_MINIONS}})) KUBE_NETWORK="10.240.0.0/16" SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING=true - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index ca254eb09b2..d4169ca2f6a 100644 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -203,7 +203,6 @@ rax-boot-minions() { -e "s|DNS_SERVER_IP|${DNS_SERVER_IP:-}|" \ -e "s|DNS_DOMAIN|${DNS_DOMAIN:-}|" \ -e "s|ENABLE_CLUSTER_DNS|${ENABLE_CLUSTER_DNS:-false}|" \ - -e "s|ENABLE_NODE_MONITORING|${ENABLE_NODE_MONITORING:-false}|" \ -e "s|ENABLE_NODE_LOGGING|${ENABLE_NODE_LOGGING:-false}|" \ -e "s|INDEX|$((i + 1))|g" \ -e "s|KUBELET_TOKEN|${KUBELET_TOKEN}|" \ diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index 0f603d3b390..7ebcb048419 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -32,9 +32,6 @@ export FLANNEL_NET=172.16.0.0/16 # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceAutoProvision,LimitRanger,ServiceAccount,ResourceQuota -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING=true - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh index d71fb6222c4..3cf0f26818f 100755 --- a/cluster/vagrant/config-default.sh +++ b/cluster/vagrant/config-default.sh @@ -52,9 +52,6 @@ MASTER_PASSWD=vagrant # Admission Controllers to invoke prior to persisting objects in cluster ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING=true - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 3f1de6c4dcb..5100d0a0797 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -106,7 +106,6 @@ cat </srv/salt-overlay/pillar/cluster-params.sls service_cluster_ip_range: '$(echo "$SERVICE_CLUSTER_IP_RANGE" | sed -e "s/'/''/g")' cert_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")' enable_cluster_monitoring: '$(echo "$ENABLE_CLUSTER_MONITORING" | sed -e "s/'/''/g")' - enable_node_monitoring: '$(echo "$ENABLE_NODE_MONITORING" | sed -e "s/'/''/g")' enable_cluster_logging: '$(echo "$ENABLE_CLUSTER_LOGGING" | sed -e "s/'/''/g")' enable_node_logging: '$(echo "$ENABLE_NODE_LOGGING" | sed -e "s/'/''/g")' logging_destination: '$(echo "$LOGGING_DESTINATION" | sed -e "s/'/''/g")' diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index 18e865d7bca..534298566b5 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -133,7 +133,6 @@ function create-provision-scripts { echo "MASTER_PASSWD='${MASTER_PASSWD}'" echo "KUBE_USER='${KUBE_USER}'" echo "KUBE_PASSWORD='${KUBE_PASSWORD}'" - echo "ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'" echo "LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'" echo "ENABLE_CLUSTER_DNS='${ENABLE_CLUSTER_DNS:-false}'" diff --git a/cluster/vsphere/config-default.sh b/cluster/vsphere/config-default.sh index 67ca7a84968..6e7229a6f34 100755 --- a/cluster/vsphere/config-default.sh +++ b/cluster/vsphere/config-default.sh @@ -33,9 +33,6 @@ MINION_CPU=1 SERVICE_CLUSTER_IP_RANGE="10.244.240.0/20" # formerly PORTAL_NET -# Optional: Install node monitoring. -ENABLE_NODE_MONITORING=true - # Optional: Enable node logging. ENABLE_NODE_LOGGING=false LOGGING_DESTINATION=elasticsearch diff --git a/cluster/vsphere/templates/create-dynamic-salt-files.sh b/cluster/vsphere/templates/create-dynamic-salt-files.sh index 880b24757a9..b474f9561e6 100755 --- a/cluster/vsphere/templates/create-dynamic-salt-files.sh +++ b/cluster/vsphere/templates/create-dynamic-salt-files.sh @@ -24,7 +24,6 @@ instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")' node_instance_prefix: $NODE_INSTANCE_PREFIX service_cluster_ip_range: $SERVICE_CLUSTER_IP_RANGE enable_cluster_monitoring: $ENABLE_CLUSTER_MONITORING -enable_node_monitoring: $ENABLE_NODE_MONITORING enable_cluster_logging: $ENABLE_CLUSTER_LOGGING enable_node_logging: $ENABLE_NODE_LOGGING logging_destination: $LOGGING_DESTINATION diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index 19361515d4d..258c5b6e159 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -281,7 +281,6 @@ function kube-up { echo "readonly INSTANCE_PREFIX='${INSTANCE_PREFIX}'" echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'" echo "readonly SERVICE_CLUSTER_IP_RANGE='${SERVICE_CLUSTER_IP_RANGE}'" - echo "readonly ENABLE_NODE_MONITORING='${ENABLE_NODE_MONITORING:-false}'" echo "readonly ENABLE_NODE_LOGGING='${ENABLE_NODE_LOGGING:-false}'" echo "readonly LOGGING_DESTINATION='${LOGGING_DESTINATION:-}'" echo "readonly ENABLE_CLUSTER_DNS='${ENABLE_CLUSTER_DNS:-false}'"