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

Update 1.11 branch #1337

Merged
merged 9 commits into from
Aug 20, 2018
Merged

Update 1.11 branch #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
00920a5
#1327 run downscaler in prod
hjacobs Aug 16, 2018
476a3a8
Make all cluster wide HPA settings configurable
mikkeloscar Aug 17, 2018
ec3d697
Merge pull request #1328 from zalando-incubator/run-downscaler-in-prod
hjacobs Aug 17, 2018
239f195
Merge pull request #1329 from zalando-incubator/hpa-config
mikkeloscar Aug 17, 2018
c791298
Disable CFS quota (if disable_cfs_quota is set)
aermakov-zalando May 15, 2018
8d463f6
Settings for new node drainer
aermakov-zalando Aug 17, 2018
241ff28
Merge pull request #1335 from zalando-incubator/disable-cpu-quota-con…
aermakov-zalando Aug 20, 2018
02f962e
Merge pull request #1333 from zalando-incubator/drain-settings
aermakov-zalando Aug 20, 2018
cb8397a
Merge branch 'dev' into dev-to-kube-1.11
aermakov-zalando Aug 20, 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
21 changes: 21 additions & 0 deletions cluster/config-defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,24 @@ downscaler_default_uptime: "Mon-Fri 07:30-20:30 CET"
{{else}}
downscaler_default_uptime: "always"
{{end}}

# HPA settings (defaults from https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/)
horizontal_pod_autoscaler_downscale_delay: "5m0s"
horizontal_pod_autoscaler_sync_period: "30s"
horizontal_pod_autoscaler_tolerance: "0.1"
horizontal_pod_autoscaler_upscale_delay: "3m0s"

# Cluster update settings
{{if eq .Environment "production"}}
drain_grace_period: "6h"
drain_min_pod_lifetime: "72h"
drain_min_healthy_sibling_lifetime: "1h"
drain_min_unhealthy_sibling_lifetime: "6h"
drain_force_evict_interval: "5m"
{{else}}
drain_grace_period: "2h"
drain_min_pod_lifetime: "8h"
drain_min_healthy_sibling_lifetime: "1h"
drain_min_unhealthy_sibling_lifetime: "1h"
drain_force_evict_interval: "5m"
{{end}}
2 changes: 0 additions & 2 deletions cluster/manifests/kube-downscaler/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{ if ne .Environment "production" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -39,4 +38,3 @@ spec:
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
{{ end }}
8 changes: 8 additions & 0 deletions 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 @@ -174,6 +174,9 @@ systemd:
--cloud-provider=aws \
--feature-gates=ExperimentalCriticalPodAnnotation=true,TaintBasedEvictions=true \
--pod-infra-container-image=registry.opensource.zalan.do/teapot/pause-amd64:3.1 \
{{- if index .Cluster.ConfigItems "disable_cfs_quota" }}
--cpu-cfs-quota=false \
{{- end }}
--system-reserved=cpu=100m,memory=164Mi \
--kube-reserved=cpu=100m,memory=282Mi
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
Expand Down Expand Up @@ -488,6 +491,11 @@ storage:
- --use-service-account-credentials=true
- --allocate-node-cidrs=true
- --cluster-cidr=10.2.0.0/16
- --horizontal-pod-autoscaler-use-rest-clients=true
- --horizontal-pod-autoscaler-downscale-delay={{ .Cluster.ConfigItems.horizontal_pod_autoscaler_downscale_delay }}
- --horizontal-pod-autoscaler-sync-period={{ .Cluster.ConfigItems.horizontal_pod_autoscaler_sync_period }}
- --horizontal-pod-autoscaler-tolerance={{ .Cluster.ConfigItems.horizontal_pod_autoscaler_tolerance }}
- --horizontal-pod-autoscaler-upscale-delay={{ .Cluster.ConfigItems.horizontal_pod_autoscaler_upscale_delay }}
resources:
requests:
cpu: 100m
Expand Down
3 changes: 3 additions & 0 deletions cluster/node-pools/worker-default/userdata.clc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ systemd:
--cloud-provider=aws \
--feature-gates=ExperimentalCriticalPodAnnotation=true,TaintBasedEvictions=true \
--pod-infra-container-image=registry.opensource.zalan.do/teapot/pause-amd64:3.1 \
{{- if index .Cluster.ConfigItems "disable_cfs_quota" }}
--cpu-cfs-quota=false \
{{- end }}
--system-reserved=cpu=100m,memory=164Mi \
--kube-reserved=cpu=100m,memory=282Mi
ExecStop=-/usr/bin/rkt stop --uuid-file=/var/run/kubelet-pod.uuid
Expand Down