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.

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 #2647

Merged
merged 45 commits into from
Nov 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f2e511a
update skipper version
aryszka Oct 15, 2019
c5b0274
cleanup defaults which are not used
szuecs Oct 17, 2019
36673eb
CA: parameterize the version temporarily
aermakov-zalando Oct 18, 2019
6543122
Specify support-listener address for apiserver skippers
mikkeloscar Oct 20, 2019
22673d3
Merge pull request #2610 from zalando-incubator/cleanup
mikkeloscar Oct 21, 2019
c1e894f
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 21, 2019
9b733c3
Update to metrics-server v0.3.6
mikkeloscar Oct 21, 2019
adb7b63
Merge pull request #2616 from zalando-incubator/api-server-skipper-su…
szuecs Oct 21, 2019
8834dc7
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 21, 2019
ea51715
Merge pull request #2615 from zalando-incubator/autoscaler-update
aermakov-zalando Oct 21, 2019
b0b9a7f
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 21, 2019
b868cbf
Merge pull request #2618 from zalando-incubator/metrics-server-0.3.6
mikkeloscar Oct 21, 2019
a6faa5a
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 21, 2019
913e2e3
Merge pull request #2608 from zalando-incubator/skipper-release-v0-11-1
szuecs Oct 22, 2019
dd6347d
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 22, 2019
390af24
Update kube-metrics-adapter
aermakov-zalando Oct 22, 2019
3358ece
Merge pull request #2620 from zalando-incubator/update-metrics-adapter
aermakov-zalando Oct 24, 2019
ed8cae9
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 24, 2019
53075d8
OpenAPI v2 Publishing for CRD's
Oct 25, 2019
e9cea42
rename scalyr-region environment variable (bugfix)
KonMann Oct 25, 2019
7e60142
OpenAPI v2 Publishing for CRD's
Oct 25, 2019
714d78b
Merge pull request #2621 from zalando-incubator/publish-customresource
linki Oct 28, 2019
aa95cc8
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 28, 2019
66c9ffc
Merge pull request #2622 from pheanex/scalyr-region-bugfix
aermakov-zalando Oct 28, 2019
fb4bc64
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 28, 2019
29df2d1
Update admission controller
aermakov-zalando Oct 28, 2019
98c562c
Merge pull request #2623 from zalando-incubator/update-admission-cont…
szuecs Oct 28, 2019
22b4724
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 28, 2019
956da0a
Merge pull request #2617 from zalando-incubator/dev-to-alpha
gargravarr Oct 29, 2019
d777136
Merge alpha to alpha-to-beta
zalando-teapot-robot Oct 29, 2019
d030c8e
Update worker and scheduler
vetinari Oct 29, 2019
dba4889
Merge pull request #2625 from zalando-incubator/update-worker-scheduler
mikkeloscar Oct 29, 2019
5bbb4ee
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 29, 2019
a6a9f9f
Merge pull request #2626 from zalando-incubator/dev-to-alpha
Oct 29, 2019
f9d194c
Merge alpha to alpha-to-beta
zalando-teapot-robot Oct 29, 2019
700ee79
Disable CustomResourcePublishOpenAPI by default
Oct 30, 2019
17957bc
Drop quota from visibility namespace
mikkeloscar Oct 30, 2019
29ec1c4
Merge pull request #2627 from zalando-incubator/disable-custom-resour…
mikkeloscar Oct 30, 2019
c01421c
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 30, 2019
fd1fbc1
Merge pull request #2628 from zalando-incubator/remove-quote
aermakov-zalando Oct 30, 2019
6c835b2
Merge dev to dev-to-alpha
zalando-teapot-robot Oct 30, 2019
0c33914
Merge pull request #2629 from zalando-incubator/dev-to-alpha
mikkeloscar Oct 30, 2019
03766cb
Merge alpha to alpha-to-beta
zalando-teapot-robot Oct 30, 2019
2bdb45f
Merge pull request #2624 from zalando-incubator/alpha-to-beta
mikkeloscar Oct 31, 2019
2b61b4e
Merge beta to beta-to-stable
zalando-teapot-robot Nov 1, 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
9 changes: 8 additions & 1 deletion cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ autoscaling_buffer_pods: "0"
cluster_autoscaler_cpu: "100m"
cluster_autoscaler_memory: "300Mi"

# Temporarily moved to a config item so we could test the new version
cluster_autoscaler_version: "v1.12.2-internal.4"

# ALB config created by kube-aws-ingress-controller
kube_aws_ingress_controller_ssl_policy: "ELBSecurityPolicy-TLS-1-2-2017-01"
kube_aws_ingress_controller_idle_timeout: "1m"
Expand Down Expand Up @@ -127,7 +130,7 @@ zmon_worker_cpu: "750m"
zmon_worker_count: "16"
{{end}}
zmon_scalyr_region: "eu"
zmon_worker_version: "v209-py2eol-2-gcd9ec1c-v251-py2eol"
zmon_worker_version: "v209-py2eol-11-g0a79b03-v251-py2eol"
logging_watcher_mem: "200Mi"
logging_scalyr_mem: "175Mi"
logging_slo_heartbeat_mem: "25Mi"
Expand Down Expand Up @@ -251,6 +254,10 @@ audit_pod_events: "true"
# https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definition-versioning/#webhook-conversion
custom_resource_webhook_conversion: "false"

# Feature toggle for CustomResourcePublishOpenAPI (alpha in v1.14)
# https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#publish-validation-schema-in-openapi-v2
custom_resource_publish_openapi: "false"

# CIDR configuration for nodes and pods
# Changing this will change the number of nodes and pods we can schedule in the
# cluster
Expand Down
8 changes: 0 additions & 8 deletions cluster/manifests/01-visibility/quota.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion cluster/manifests/admission-control/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
effect: NoSchedule
containers:
- name: cluster-autoscaler
image: registry.opensource.zalan.do/teapot/admission-controller:master-35
image: registry.opensource.zalan.do/teapot/admission-controller:master-37
command:
- /registry-proxy
- --address=127.0.0.1:8285
Expand Down
10 changes: 10 additions & 0 deletions cluster/manifests/admission-control/teapot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,13 @@ webhooks:
apiGroups: ["apiextensions.k8s.io"]
apiVersions: ["v1", "v1beta1"]
resources: ["customresourcedefinitions"]
- name: ingress-admitter.teapot.zalan.do
clientConfig:
url: "https://localhost:8085/ingress"
caBundle: "{{ .ConfigItems.ca_cert_decompressed }}"
failurePolicy: Fail
rules:
- operations: ["CREATE", "UPDATE"]
apiGroups: ["extensions", "networking.k8s.io"]
apiVersions: ["v1beta1"]
resources: ["ingresses"]
5 changes: 1 addition & 4 deletions cluster/manifests/deletions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ pre_apply: []
# everything defined under here will be deleted after applying the manifests
post_apply:
- name: compute-resources
namespace: default
kind: ResourceQuota
- name: compute-resources
namespace: kube-system
namespace: visibility
kind: ResourceQuota
{{ if eq .ConfigItems.teapot_admission_controller_process_resources "true" }}
- name: limits
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/kube-cluster-autoscaler/daemonset.yaml
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-internal.4
version: {{.Cluster.ConfigItems.cluster_autoscaler_version}}
spec:
selector:
matchLabels:
Expand All @@ -16,7 +16,7 @@ spec:
metadata:
labels:
application: kube-cluster-autoscaler
version: v1.12.2-internal.4
version: {{.Cluster.ConfigItems.cluster_autoscaler_version}}
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-internal.4
image: registry.opensource.zalan.do/teapot/kube-cluster-autoscaler:{{.Cluster.ConfigItems.cluster_autoscaler_version}}
command:
- ./cluster-autoscaler
- --v=4
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-metrics-adapter/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
serviceAccountName: custom-metrics-apiserver
containers:
- name: kube-metrics-adapter
image: registry.opensource.zalan.do/teapot/kube-metrics-adapter:v0.0.3
image: registry.opensource.zalan.do/teapot/kube-metrics-adapter:v0.0.4
{{ if eq .ConfigItems.kube_aws_iam_controller_kube_system_enable "true"}}
env:
# must be set for the AWS SDK/AWS CLI to find the credentials file.
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/metrics-server/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: kube-system
labels:
application: metrics-server
version: v0.3.5
version: v0.3.6
spec:
replicas: 1
selector:
Expand All @@ -16,7 +16,7 @@ spec:
name: metrics-server
labels:
application: metrics-server
version: v0.3.5
version: v0.3.6
spec:
dnsConfig:
options:
Expand All @@ -26,7 +26,7 @@ spec:
serviceAccountName: metrics-server
containers:
- name: metrics-server
image: registry.opensource.zalan.do/teapot/metrics-server:v0.3.5
image: registry.opensource.zalan.do/teapot/metrics-server:v0.3.6
resources:
limits:
cpu: "{{.ConfigItems.metrics_service_cpu}}"
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/skipper/deployment.yaml
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.295
version: v0.11.1
component: ingress
spec:
strategy:
Expand All @@ -18,7 +18,7 @@ spec:
metadata:
labels:
application: skipper-ingress
version: v0.10.295
version: v0.11.1
component: ingress
annotations:
kubernetes-log-watcher/scalyr-parser: |
Expand All @@ -43,7 +43,7 @@ spec:
hostNetwork: true
containers:
- name: skipper-ingress
image: registry.opensource.zalan.do/pathfinder/skipper:v0.10.295
image: registry.opensource.zalan.do/pathfinder/skipper:v0.11.1
ports:
- name: ingress-port
containerPort: 9999
Expand Down
6 changes: 3 additions & 3 deletions cluster/manifests/zmon-scheduler/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: visibility
labels:
application: zmon-scheduler
version: "v46-51-g0a0ad78-0.1.6-master-88"
version: "v46-55-gd1b34bc-0.1.6-master-92"
spec:
replicas: {{.ConfigItems.zmon_scheduler_replicas}}
selector:
Expand All @@ -15,7 +15,7 @@ spec:
metadata:
labels:
application: zmon-scheduler
version: "v46-51-g0a0ad78-0.1.6-master-88"
version: "v46-55-gd1b34bc-0.1.6-master-92"
annotations:
iam.amazonaws.com/role: "{{ .LocalID }}-app-zmon"
spec:
Expand Down Expand Up @@ -47,7 +47,7 @@ spec:

containers:
- name: zmon-scheduler
image: "pierone.stups.zalan.do/zmon/zmon-scheduler:v46-51-g0a0ad78-0.1.6-master-88"
image: "pierone.stups.zalan.do/zmon/zmon-scheduler:v46-55-gd1b34bc-0.1.6-master-92"
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/zmon-worker/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ spec:
periodSeconds: 60

env:
- name: WORKER_SCALYR_REGION
- name: WORKER_PLUGIN_SCALYR_SCALYR_REGION
value: {{.ConfigItems.zmon_scalyr_region}}
- name: WORKER_ZMON_QUEUES
value: zmon:queue:default/{{.ConfigItems.zmon_worker_count}}
Expand Down
6 changes: 4 additions & 2 deletions cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ write_files:
- --authorization-mode=Webhook,RBAC
- --authorization-webhook-config-file=/etc/kubernetes/config/authz.yaml
- --admission-control-config-file=/etc/kubernetes/config/image-policy-webhook.yaml
- --feature-gates=TaintNodesByCondition={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}},ScheduleDaemonSetPods={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}},TTLAfterFinished=true,CustomResourceWebhookConversion={{.Cluster.ConfigItems.custom_resource_webhook_conversion}}
- --feature-gates=TaintNodesByCondition={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}},ScheduleDaemonSetPods={{.Cluster.ConfigItems.experimental_schedule_daemonset_pods}},TTLAfterFinished=true,CustomResourceWebhookConversion={{.Cluster.ConfigItems.custom_resource_webhook_conversion}},CustomResourcePublishOpenAPI={{.Cluster.ConfigItems.custom_resource_publish_openapi}}
- --anonymous-auth=false
{{ if or (eq .Cluster.Environment "production") (index .Cluster.ConfigItems "audittrail_url") }}
- --audit-webhook-config-file=/etc/kubernetes/config/audit.yaml
Expand Down Expand Up @@ -172,7 +172,7 @@ write_files:
requests:
cpu: 100m
memory: 200Mi
- image: registry.opensource.zalan.do/teapot/admission-controller:master-35
- image: registry.opensource.zalan.do/teapot/admission-controller:master-37
name: admission-controller
readinessProbe:
httpGet:
Expand Down Expand Up @@ -346,6 +346,7 @@ write_files:
args:
- skipper
- -address=:9023
- -support-listener=:9913
- -inline-routes
- |
health: Path("/healthz") -> inlineContent("ok") -> <shunt>;
Expand Down Expand Up @@ -398,6 +399,7 @@ write_files:
args:
- skipper
- -address=:8443
- -support-listener=:9911
- -tls-cert=/etc/kubernetes/ssl/apiserver.pem
- -tls-key=/etc/kubernetes/ssl/apiserver-key.pem
- -insecure
Expand Down