From c0472c78e6ba1b25b38911f03cc9f11feea9221a Mon Sep 17 00:00:00 2001 From: Camil Blanaru Date: Sun, 23 Oct 2016 06:34:18 +0200 Subject: [PATCH] Remove nodeSelector from PetSet definition. Update cleanup.sh --- definitions/cleanup.sh | 1 + definitions/init.sh | 2 +- definitions/k8s/prometheus/02-prometheus.svc.petset.yaml | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/definitions/cleanup.sh b/definitions/cleanup.sh index edabab8..51385f1 100755 --- a/definitions/cleanup.sh +++ b/definitions/cleanup.sh @@ -1,5 +1,6 @@ git checkout k8s/ingress/01-basic-auth.secret.yaml git checkout k8s/prometheus/01-prometheus.configmap.yaml git checkout k8s/prometheus/03-alertmanager.configmap.yaml +git checkout k8s/grafana/grafana.svc.deployment.yaml rm auth rm dhparam.pem diff --git a/definitions/init.sh b/definitions/init.sh index 2c41fb6..a384bd6 100755 --- a/definitions/init.sh +++ b/definitions/init.sh @@ -130,7 +130,7 @@ sed -i -e 's/slack_channel/'"$slack_channel"'/g' k8s/prometheus/03-alertmanager. #remove "sed" generated files -rm k8s/prometheus/*.yaml-e && rm k8s/ingress/*.yaml-e +rm k8s/prometheus/*.yaml-e && rm k8s/ingress/*.yaml-e && rm k8s/grafana/*.yaml-e echo diff --git a/definitions/k8s/prometheus/02-prometheus.svc.petset.yaml b/definitions/k8s/prometheus/02-prometheus.svc.petset.yaml index fd66e1d..e8bb40c 100644 --- a/definitions/k8s/prometheus/02-prometheus.svc.petset.yaml +++ b/definitions/k8s/prometheus/02-prometheus.svc.petset.yaml @@ -32,8 +32,6 @@ spec: annotations: pod.alpha.kubernetes.io/initialized: "true" spec: - nodeSelector: - role: monitoring terminationGracePeriodSeconds: 0 containers: - name: prometheus-prom-1