Remove nodeSelector from PetSet definition. Update cleanup.sh

camilb · Oct 23, 2016 · c0472c7 · c0472c7
1 parent 56bfbbd
commit c0472c7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -32,8 +32,6 @@ spec:
       annotations:
         pod.alpha.kubernetes.io/initialized: "true"
     spec:
-      nodeSelector:
-        role: monitoring
       terminationGracePeriodSeconds: 0
       containers:
       - name: prometheus-prom-1
-Original file line number
+Diff line change
@@ Expand Up @@
     #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
@@ Expand Down @@