Remove remaining 'controller' occurrences

prometheus-operator · Nov 1, 2016 · 2f4c847 · 2f4c847
1 parent f89302b
commit 2f4c847
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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 → manifests/prometheus-operator.yaml b/manifests/operators/prometheus-operator.yaml → manifests/prometheus-operator.yaml
@@ -1,23 +1,23 @@
 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:
              cpu: 100m
              memory: 50Mi
            limits:
              cpu: 200m
-             memory: 100Mi
+             memory: 300Mi