Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifests: rename controllers to operators and use deployments #3

Merged
merged 1 commit into from
Nov 1, 2016
Merged

manifests: rename controllers to operators and use deployments #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions manifests/controllers/alertmanager-controller.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ts/controllers/prometheus-controller.yaml → manifests/operators/prometheus-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: extensions/v1beta1
kind: ReplicaSet
kind: Deployment
metadata:
name: prometheus-controller
labels:
Expand All @@ -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