Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
kube-prometheus
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
prometheus-operator
kube-prometheus
Commits
f89302ba
Commit
f89302ba
authored
8 years ago
by
Fabian Reinartz
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #3 from brancz/controller-deployments
manifests: rename controllers to operators and use deployments
parents
a7220767
cd0325db
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
manifests/controllers/alertmanager-controller.yaml
+0
-23
0 additions, 23 deletions
manifests/controllers/alertmanager-controller.yaml
manifests/operators/prometheus-operator.yaml
+3
-3
3 additions, 3 deletions
manifests/operators/prometheus-operator.yaml
with
3 additions
and
26 deletions
manifests/controllers/alertmanager-controller.yaml
deleted
100644 → 0
+
0
−
23
View file @
a7220767
apiVersion
:
extensions/v1beta1
kind
:
ReplicaSet
metadata
:
name
:
alertmanager-controller
labels
:
controller
:
alertmanager
spec
:
replicas
:
1
template
:
metadata
:
labels
:
controller
:
alertmanager
spec
:
containers
:
-
name
:
alertmanager-controller
image
:
quay.io/coreos/kube-alertmanager-controller:latest
resources
:
requests
:
cpu
:
100m
memory
:
50Mi
limits
:
cpu
:
200m
memory
:
100Mi
\ No newline at end of file
This diff is collapsed.
Click to expand it.
manifests/
controlle
rs/prometheus-
controlle
r.yaml
→
manifests/
operato
rs/prometheus-
operato
r.yaml
+
3
−
3
View file @
f89302ba
apiVersion
:
extensions/v1beta1
kind
:
R
epl
icaSe
t
kind
:
D
epl
oymen
t
metadata
:
name
:
prometheus-controller
labels
:
...
...
@@ -13,11 +13,11 @@ spec:
spec
:
containers
:
-
name
:
prometheus-controller
image
:
quay.io/coreos/
kube-
prometheus-
controlle
r:latest
image
:
quay.io/coreos/prometheus-
operato
r:latest
resources
:
requests
:
cpu
:
100m
memory
:
50Mi
limits
:
cpu
:
200m
memory
:
100Mi
\ No newline at end of file
memory
:
100Mi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment