Merge pull request #3 from brancz/controller-deployments

manifests: rename controllers to operators and use deployments
prometheus-operator · Nov 1, 2016 · f89302b · f89302b
2 parents a722076 + cd0325d
commit f89302b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git a/manifests/controllers/alertmanager-controller.yaml b/manifests/controllers/alertmanager-controller.yaml
diff --git a/...ts/controllers/prometheus-controller.yaml → manifests/operators/prometheus-operator.yaml b/...ts/controllers/prometheus-controller.yaml → manifests/operators/prometheus-operator.yaml
@@ -1,5 +1,5 @@
 apiVersion: extensions/v1beta1
-kind: ReplicaSet
+kind: Deployment
 metadata:
   name: prometheus-controller
   labels:
@@ -13,11 +13,11 @@ spec:
     spec:
       containers:
        - name: prometheus-controller
-         image: quay.io/coreos/kube-prometheus-controller:latest
+         image: quay.io/coreos/prometheus-operator:latest
          resources:
            requests:
              cpu: 100m
              memory: 50Mi
            limits:
              cpu: 200m
-             memory: 100Mi
+             memory: 100Mi