From 2f4c8471433178d28bacd4e45e19306b2fe05361 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Tue, 1 Nov 2016 13:12:57 -0700
Subject: [PATCH] Remove remaining 'controller' occurrences

---
 hack/cluster-monitoring/deploy                     |  2 +-
 hack/cluster-monitoring/teardown                   |  2 +-
 manifests/{operators => }/prometheus-operator.yaml | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename manifests/{operators => }/prometheus-operator.yaml (69%)

diff --git a/hack/cluster-monitoring/deploy b/hack/cluster-monitoring/deploy
index eaca3f0121..5d20f8a6ee 100755
--- a/hack/cluster-monitoring/deploy
+++ b/hack/cluster-monitoring/deploy
@@ -10,7 +10,7 @@ kctl() {
     kubectl --kubeconfig="$KUBECONFIG" -n "monitoring" "$@"
 }
 
-kctl apply -f manifests/controllers/prometheus-controller.yaml
+kctl apply -f manifests/prometheus-operator.yaml
 
 # Wait for TPRs to be ready.
 until kctl get servicemonitor; do sleep 0.1; done
diff --git a/hack/cluster-monitoring/teardown b/hack/cluster-monitoring/teardown
index 54b35adabf..a6edb0ae20 100755
--- a/hack/cluster-monitoring/teardown
+++ b/hack/cluster-monitoring/teardown
@@ -15,4 +15,4 @@ kctl delete -f manifests/prometheus
 # Hack: wait a bit to let the controller delete the deployed Prometheus server.
 sleep 5
 
-kctl delete -f manifests/controllers/prometheus-controller.yaml
+kctl delete -f manifests/prometheus-operator.yaml
diff --git a/manifests/operators/prometheus-operator.yaml b/manifests/prometheus-operator.yaml
similarity index 69%
rename from manifests/operators/prometheus-operator.yaml
rename to manifests/prometheus-operator.yaml
index c6fa2f5303..abedb9325f 100644
--- a/manifests/operators/prometheus-operator.yaml
+++ b/manifests/prometheus-operator.yaml
@@ -1,18 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: prometheus-controller
+  name: prometheus-operator
   labels:
-    controller: prometheus 
+    operator: prometheus
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        controller: prometheus
+        operator: prometheus
     spec:
       containers:
-       - name: prometheus-controller
+       - name: prometheus-operator
          image: quay.io/coreos/prometheus-operator:latest
          resources:
            requests:
@@ -20,4 +20,4 @@ spec:
              memory: 50Mi
            limits:
              cpu: 200m
-             memory: 100Mi
+             memory: 300Mi