CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-24 14:51:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return Prometheus deployment to be a worker workload

Browse Source 
* Expose etcd metrics to workers so Prometheus can
run on a worker, rather than a controller
* Drop temporary firewall rules allowing Prometheus
to run on a controller and scrape targes
* Related to https://github.com/poseidon/typhoon/pull/175
This commit is contained in:
Dalton Hubble
2018-04-07 23:16:27 -07:00
parent b76126db93
commit f4b2396718
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
google-cloud/container-linux/kubernetes/network.tf
View File

@ -56,6 +56,20 @@ resource "google_compute_firewall" "internal-etcd" {
target_tags = ["${var.cluster_name}-controller"]
}
# Allow Prometheus to scrape etcd metrics
resource "google_compute_firewall" "internal-etcd-metrics" {
name = "${var.cluster_name}-internal-etcd-metrics"
network = "${google_compute_network.network.name}"
allow {
protocol = "tcp"
ports = [2381]
}
source_tags = ["${var.cluster_name}-worker"]
target_tags = ["${var.cluster_name}-controller"]
}
# Calico BGP and IPIP
# https://docs.projectcalico.org/v2.5/reference/public-cloud/gce
resource "google_compute_firewall" "internal-calico" {
@ -103,7 +117,7 @@ resource "google_compute_firewall" "internal-node-exporter" {
ports = [9100]
}
source_tags = ["${var.cluster_name}-controller", "${var.cluster_name}-worker"]
source_tags = ["${var.cluster_name}-worker"]
target_tags = ["${var.cluster_name}-controller", "${var.cluster_name}-worker"]
}