From 93e549b5b682d25a23ae84f7f0e6e51b64bfb18b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandor=20Sz=C3=BCcs?= Date: Tue, 1 Oct 2024 14:27:07 +0200 Subject: [PATCH 1/2] fix: topology spread timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit disable: set to 0 defaults: 7m change via CR Signed-off-by: Sandor Szücs --- cluster/config-defaults.yaml | 8 +++++++- cluster/manifests/skipper/deployment.yaml | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml index 8eff24a28b..ad0ab89843 100644 --- a/cluster/config-defaults.yaml +++ b/cluster/config-defaults.yaml @@ -84,12 +84,18 @@ skipper_ingress_max_replicas: "50" {{end}} skipper_ingress_cpu: "1000m" skipper_ingress_memory: "1500Mi" + +skipper_topology_spread_enabled: "true" +skipper_topology_spread_timeout: "7m" + +# PHC skipper_ingress_health_check_options: "period=10s,min-requests=10,min-drop-probability=0.05,max-drop-probability=0.9,max-unhealthy-endpoints-ratio=0.9" # Enables deployment of canary version skipper_ingress_canary_enabled: "true" skipper_ingress_test_single_pod: "false" skipper_canary_controller_enabled: "false" + # When set to true (and dedicated node pool for skipper is also true) the # daemonset overhead will be subtracted from the cpu settings such # that skipper will perfectly fit on the node. @@ -98,9 +104,9 @@ skipper_ingress_binpack: "true" {{else}} skipper_ingress_binpack: "false" {{end}} + # skipper node-pool enable_dedicate_nodepool_skipper: "true" -skipper_topology_spread_enabled: "true" {{if eq .Cluster.Environment "e2e"}} skipper_attach_only_to_skipper_node_pool: "false" {{else}} diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml index efa6c6326d..feedfd9f54 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -68,8 +68,8 @@ spec: prometheus.io/path: /metrics prometheus.io/port: "9911" prometheus.io/scrape: "true" -{{- if eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true" }} - zalando.org/topology-spread-timeout: 7m +{{- if and (eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true") (ne .Cluster.ConfigItems.skipper_topology_spread_timeout "0"}} + zalando.org/topology-spread-timeout: {{ .Cluster.ConfigItems.skipper_topology_spread_timeout }} {{- end }} spec: {{- if eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true" }} From c4aaeb606f73f0e4d735e728d60b1fae69a1f412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandor=20Sz=C3=BCcs?= Date: Tue, 1 Oct 2024 17:23:01 +0200 Subject: [PATCH 2/2] Update cluster/manifests/skipper/deployment.yaml Co-authored-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/skipper/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml index feedfd9f54..3e44834153 100644 --- a/cluster/manifests/skipper/deployment.yaml +++ b/cluster/manifests/skipper/deployment.yaml @@ -68,7 +68,7 @@ spec: prometheus.io/path: /metrics prometheus.io/port: "9911" prometheus.io/scrape: "true" -{{- if and (eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true") (ne .Cluster.ConfigItems.skipper_topology_spread_timeout "0"}} +{{- if and (eq .Cluster.ConfigItems.skipper_topology_spread_enabled "true") (ne .Cluster.ConfigItems.skipper_topology_spread_timeout "0")}} zalando.org/topology-spread-timeout: {{ .Cluster.ConfigItems.skipper_topology_spread_timeout }} {{- end }} spec: