diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 13897f39195..b2b3a951849 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -699,24 +699,6 @@ function restart-apiserver { ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart" } -# Setup monitoring firewalls using heapster and InfluxDB -function setup-monitoring-firewall { - if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then - return - fi - - # TODO: Support monitoring firewall - echo "Cluster monitoring setup is not (yet) supported on AWS" -} - -function teardown-monitoring-firewall { - if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then - return - fi - - # TODO: Support monitoring firewall -} - function setup-logging-firewall { # If logging with Fluentd to Elasticsearch is enabled then create pods # and services for Elasticsearch (for ingesting logs) and Kibana (for diff --git a/cluster/azure/util.sh b/cluster/azure/util.sh index c5da546970b..c83c25105ac 100644 --- a/cluster/azure/util.sh +++ b/cluster/azure/util.sh @@ -562,15 +562,6 @@ function restart-apiserver { ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart" } -# Setup monitoring using heapster and InfluxDB -function setup-monitoring-firewall { - echo "not implemented" >/dev/null -} - -function teardown-monitoring-firewall { - echo "not implemented" >/dev/null -} - function setup-logging-firewall { echo "TODO: setup logging" } diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 588932d5c7c..88e786dd452 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -925,32 +925,6 @@ function restart-apiserver { ssh-to-node "$1" "sudo /etc/init.d/kube-apiserver restart" } -# Setup monitoring firewalls using heapster and InfluxDB -function setup-monitoring-firewall { - if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then - return - fi - - echo "Setting up firewalls to Heapster based cluster monitoring." - - detect-project - gcloud compute firewall-rules create "${INSTANCE_PREFIX}-monitoring-heapster" --project "${PROJECT}" \ - --allow tcp:80 tcp:8083 tcp:8086 --target-tags="${MINION_TAG}" --network="${NETWORK}" - - echo - echo -e "${color_green}Grafana dashboard will be available at ${color_yellow}https://${KUBE_MASTER_IP}/api/v1beta1/proxy/services/monitoring-grafana/${color_green}. Wait for the monitoring dashboard to be online.${color_norm}" - echo -} - -function teardown-monitoring-firewall { - if [[ "${ENABLE_CLUSTER_MONITORING}" != "true" ]]; then - return - fi - - detect-project - gcloud compute firewall-rules delete -q "${INSTANCE_PREFIX}-monitoring-heapster" --project "${PROJECT}" || true -} - function setup-logging-firewall { # If logging with Fluentd to Elasticsearch is enabled then create pods # and services for Elasticsearch (for ingesting logs) and Kibana (for diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index 97a74c24d09..be0cbba12da 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -114,12 +114,6 @@ function kube-up() { --network="${NETWORK}" } -# Called during cluster/kube-up.sh -function setup-monitoring-firewall() { - echo "... in setup-monitoring-firewall()" >&2 - # TODO(mbforbes): This isn't currently supported in GKE. -} - # Execute prior to running tests to initialize required structure. This is # called from hack/e2e-go only when running -up (it is run after kube-up, so # the cluster already exists at this point). @@ -261,12 +255,6 @@ function test-teardown() { "${KUBE_ROOT}/cluster/kube-down.sh" } -# Tears down monitoring. -function teardown-monitoring-firewall() { - echo "... in teardown-monitoring-firewall()" >&2 - # TODO(mbforbes): This isn't currently supported in GKE. -} - # Actually take down the cluster. This is called from test-teardown. # # Assumed vars: diff --git a/cluster/kube-down.sh b/cluster/kube-down.sh index cb431f13697..a6bfb96d3ae 100755 --- a/cluster/kube-down.sh +++ b/cluster/kube-down.sh @@ -27,7 +27,6 @@ source "${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" echo "Bringing down cluster using provider: $KUBERNETES_PROVIDER" verify-prereqs -teardown-monitoring-firewall teardown-logging-firewall kube-down diff --git a/cluster/kube-up.sh b/cluster/kube-up.sh index 6972ad80a70..71e2356bede 100755 --- a/cluster/kube-up.sh +++ b/cluster/kube-up.sh @@ -39,9 +39,6 @@ kube-up echo "... calling validate-cluster" >&2 "${KUBE_ROOT}/cluster/validate-cluster.sh" -echo "... calling setup-monitoring-firewall" >&2 -setup-monitoring-firewall - echo "... calling setup-logging-firewall" >&2 setup-logging-firewall diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index 64d7eb9553b..aefe351a818 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -286,14 +286,6 @@ function get-password { echo "TODO get-password" } -function setup-monitoring-firewall { - echo "TODO" 1>&2 -} - -function teardown-monitoring-firewall { - echo "TODO" 1>&2 -} - # Perform preparations required to run e2e tests function prepare-e2e() { echo "libvirt-coreos doesn't need special preparations for e2e tests" 1>&2 diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh index 8f67cced9bd..bc6437dbbe9 100644 --- a/cluster/rackspace/util.sh +++ b/cluster/rackspace/util.sh @@ -347,14 +347,6 @@ kube-up() { echo } -function setup-monitoring-firewall { - echo "TODO" -} - -function teardown-monitoring-firewall { - echo "TODO" -} - function setup-logging-firewall { echo "TODO: setup logging" } diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index 8b466f7dc97..a7c9c48b4de 100644 --- a/cluster/vagrant/util.sh +++ b/cluster/vagrant/util.sh @@ -333,14 +333,6 @@ function restart-apiserver { ssh-to-node "$1" "sudo systemctl restart kube-apiserver" } -function setup-monitoring-firewall { - echo "TODO" 1>&2 -} - -function teardown-monitoring-firewall { - echo "TODO" 1>&2 -} - # Perform preparations required to run e2e tests function prepare-e2e() { echo "Vagrant doesn't need special preparations for e2e tests" 1>&2 diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index 28a6e5a0a99..a227ae6d63f 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -479,14 +479,6 @@ function test-teardown { echo "TODO" } -function setup-monitoring-firewall { - echo "TODO" -} - -function teardown-monitoring-firewall { - echo "TODO" -} - function setup-logging-firewall { echo "TODO: setup logging" }