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

Alpha to beta #1364

Merged
merged 7 commits into from
Aug 28, 2018
Merged

Alpha to beta #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f071fa
prometheus-node-exporter: increase memory for the conntrack exporter
aermakov-zalando Aug 28, 2018
6bdee40
Merge pull request #1360 from zalando-incubator/node-exporter-mem
linki Aug 28, 2018
c75280d
Merge branch 'dev' into dev-to-alpha
aermakov-zalando Aug 28, 2018
6b203a2
Merge pull request #1362 from zalando-incubator/dev-to-alpha
linki Aug 28, 2018
3fc7ead
ZMON: use a user-defined priority class
aermakov-zalando Aug 10, 2018
b7f8930
Merge pull request #1363 from zalando-incubator/cherrypick-zmon-alpha
aermakov-zalando Aug 28, 2018
42de13d
Merge branch 'alpha' into alpha-to-beta
aermakov-zalando Aug 28, 2018
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
7 changes: 7 additions & 0 deletions cluster/manifests/01-visibility/priority.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: scheduling.k8s.io/v1alpha1
kind: PriorityClass
metadata:
name: visibility-zmon
value: 1000000000
globalDefault: false
description: "This priority class is used by ZMON components."
4 changes: 2 additions & 2 deletions cluster/manifests/prometheus-node-exporter/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ spec:
resources:
limits:
cpu: 10m
memory: 20Mi
memory: 40Mi
requests:
cpu: 10m
memory: 20Mi
memory: 40Mi
securityContext:
privileged: true
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-agent/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
spec:
priorityClassName: system-cluster-critical
priorityClassName: visibility-zmon
initContainers:
- name: gerry-init
image: registry.opensource.zalan.do/teapot/gerry:v0.0.14
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-aws-agent/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
spec:
priorityClassName: system-cluster-critical
priorityClassName: visibility-zmon
initContainers:
- name: gerry-init
image: registry.opensource.zalan.do/teapot/gerry:v0.0.14
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-redis/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
application: "zmon-redis"
version: "v0.1"
spec:
priorityClassName: system-cluster-critical
priorityClassName: visibility-zmon
containers:
- name: zmon-redis
image: registry.opensource.zalan.do/zmon/redis:3.2.9
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-scheduler/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
spec:
priorityClassName: system-cluster-critical
priorityClassName: visibility-zmon
initContainers:
- name: gerry-init
image: registry.opensource.zalan.do/teapot/gerry:v0.0.14
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-worker/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
spec:
priorityClassName: system-cluster-critical
priorityClassName: visibility-zmon
initContainers:
- name: gerry-init
image: registry.opensource.zalan.do/teapot/gerry:v0.0.14
Expand Down