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

beta to stable #1984

Closed
wants to merge 15 commits into from
Closed

beta to stable #1984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dbc3f00
feat: upgrade skipper to v0.10.200 (#1965)
Apr 3, 2019
a55234b
feat: configure Skipper to use default filters (#1965)
maxim-tschumak Apr 4, 2019
86f27ed
Merge pull request #1966 from zalando-incubator/1965-upgrade-skipper-…
mikkeloscar Apr 4, 2019
432eddc
kube-downscaler v0.12
hjacobs Apr 4, 2019
9c6cf15
Merge pull request #1972 from zalando-incubator/kube-downscaler-v0.12
hjacobs Apr 4, 2019
b121c80
Only run e2e on PR
mikkeloscar Apr 4, 2019
2db17d5
Merge pull request #1973 from zalando-incubator/e2e-pr-only
mikkeloscar Apr 4, 2019
8f0e8f5
Merge branch 'dev' into dev-to-alpha
szuecs Apr 5, 2019
f312f3e
Merge pull request #1975 from zalando-incubator/dev-to-alpha
szuecs Apr 5, 2019
27c57f5
Merge branch 'alpha' into alpha-to-beta
szuecs Apr 5, 2019
d36dc95
Merge pull request #1978 from zalando-incubator/alpha-to-beta
szuecs Apr 8, 2019
d5bbd38
Merge beta to beta-to-stable
aermakov-zalando Apr 8, 2019
560d78e
Add a config item for compliance checker integration
aermakov-zalando Apr 5, 2019
0892011
Merge pull request #1989 from zalando-incubator/compliance-checker-to…
gargravarr Apr 9, 2019
e79e3dd
Merge beta to beta-to-stable
zalando-teapot-robot Apr 9, 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 @@ -65,6 +65,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-downscaler/deployment.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-downscaler
version: v0.6
version: v0.12
spec:
replicas: 1
selector:
Expand All @@ -15,7 +15,7 @@ spec:
metadata:
labels:
application: kube-downscaler
version: v0.7
version: v0.12
spec:
dnsConfig:
options:
Expand All @@ -26,7 +26,7 @@ spec:
containers:
- name: downscaler
# see https://github.com/hjacobs/kube-downscaler/releases
image: registry.opensource.zalan.do/teapot/kube-downscaler:0.7
image: registry.opensource.zalan.do/teapot/kube-downscaler:0.12
args:
- --interval=30
- --exclude-namespaces=kube-system,visibility
Expand Down
7 changes: 4 additions & 3 deletions cluster/manifests/skipper/deployment.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: skipper-ingress
version: v0.10.195
version: v0.10.200
component: ingress
spec:
strategy:
Expand All @@ -18,7 +18,7 @@ spec:
metadata:
labels:
application: skipper-ingress
version: v0.10.195
version: v0.10.200
component: ingress
annotations:
kubernetes-log-watcher/scalyr-parser: |
Expand All @@ -42,7 +42,7 @@ spec:
hostNetwork: true
containers:
- name: skipper-ingress
image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.195
image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.200
ports:
- name: ingress-port
containerPort: 9999
Expand Down Expand Up @@ -80,6 +80,7 @@ spec:
- "-api-usage-monitoring-realm-keys=https://identity.zalando.com/realm"
- "-api-usage-monitoring-client-keys=https://identity.zalando.com/managed-id,sub"
- "-api-usage-monitoring-default-client-tracking-pattern=services[.].*"
- "-default-filters-dir=/etc/config/default-filters"
{{ end }}
- "-max-audit-body=0"
{{ if eq .ConfigItems.skipper_clusterratelimit "true"}}
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
4 changes: 4 additions & 0 deletions delivery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ version: "2017-09-20"
allow_concurrent_steps: true
pipeline:
- id: build
when:
event: pull_request
vm: large # speed up building kubernetes/kubernetes
overlay: ci/golang
cache:
Expand All @@ -15,6 +17,8 @@ pipeline:
VERSION="$CDP_BUILD_VERSION" make -C test/e2e build.push

- id: e2e-tests
when:
event: pull_request
depends_on: [build]
type: process
desc: "Kubernetes e2e tests"
Expand Down