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

Dev to alpha #1980

Merged
merged 7 commits into from
Apr 8, 2019
Merged

Dev to alpha #1980

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
c9ca4bf
Update CA
aermakov-zalando Apr 5, 2019
1e911a0
Merge pull request #1976 from zalando-incubator/update-ca
aermakov-zalando Apr 5, 2019
5e8296c
Add a config item for compliance checker integration
aermakov-zalando Apr 5, 2019
0842475
Update prometheus to v2.8.1
mikkeloscar Apr 7, 2019
5ef4ec9
Merge pull request #1979 from zalando-incubator/prometheus-v2.8.1
mikkeloscar Apr 8, 2019
b47d3aa
Merge pull request #1977 from zalando-incubator/cc
mikkeloscar Apr 8, 2019
324203c
Merge branch 'dev' into dev-to-alpha
aermakov-zalando Apr 8, 2019
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
1 change: 1 addition & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ image_policy: "trusted"
{{else}}
image_policy: "dev"
{{end}}
compliance_checker_enabled: "false"

# Egress configuration
nat_cidr_blocks: "172.31.64.0/28,172.31.64.16/28,172.31.64.32/28"
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/kube-cluster-autoscaler/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
labels:
application: kube-cluster-autoscaler
version: v1.12.2-internal49
version: v1.12.2-internal63
spec:
selector:
matchLabels:
Expand All @@ -16,7 +16,7 @@ spec:
metadata:
labels:
application: kube-cluster-autoscaler
version: v1.12.2-internal49
version: v1.12.2-internal63
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-autoscaler"
config/pool-sizes: "{{range .NodePools}}{{.Name}}-{{.MinSize}}-{{.MaxSize}} {{end}}"
Expand All @@ -33,7 +33,7 @@ spec:
effect: NoSchedule
containers:
- name: cluster-autoscaler
image: registry.opensource.zalan.do/teapot/kube-cluster-autoscaler:v1.12.2-internal49
image: registry.opensource.zalan.do/teapot/kube-cluster-autoscaler:v1.12.2-internal63
command:
- ./cluster-autoscaler
- --v=4
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/prometheus/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
labels:
application: prometheus
version: v2.6.0
version: v2.8.1
name: prometheus
namespace: kube-system
spec:
Expand All @@ -17,7 +17,7 @@ spec:
metadata:
labels:
application: prometheus
version: v2.6.0
version: v2.8.1
annotations:
config/hash: {{"configmap.yaml" | manifestHash}}
spec:
Expand All @@ -28,7 +28,7 @@ spec:
priorityClassName: system-cluster-critical
containers:
- name: prometheus
image: registry.opensource.zalan.do/teapot/prometheus:v2.6.0
image: registry.opensource.zalan.do/teapot/prometheus:v2.8.1
args:
- "--config.file=/etc/prometheus/prometheus.yml"
- "--storage.tsdb.path=/prometheus/"
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.clc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ storage:
value: https://identity.zalando.com/.well-known/openid-configuration
- name: ENABLE_INTROSPECTION
value: "true"
- image: registry.opensource.zalan.do/teapot/image-policy-webhook:v0.4.1
- image: registry.opensource.zalan.do/teapot/image-policy-webhook:{{if eq .Cluster.ConfigItems.compliance_checker_enabled "true"}}master-44{{else}}v0.4.1{{end}}
name: image-policy-webhook
args:
- --policy={{ .Cluster.ConfigItems.image_policy }}
Expand Down