From 9db3994fdf7d3e78c47ae778b3d7f60c0b006b39 Mon Sep 17 00:00:00 2001 From: Max Falk Date: Mon, 10 Jul 2023 11:38:34 +0200 Subject: [PATCH 1/2] PAASTA-17941: fix topology spread constraint option by using snake_case instead of camelCase Signed-off-by: Max Falk --- paasta_tools/kubernetes_tools.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/paasta_tools/kubernetes_tools.py b/paasta_tools/kubernetes_tools.py index 6d93d9c81f..4b313dfef9 100644 --- a/paasta_tools/kubernetes_tools.py +++ b/paasta_tools/kubernetes_tools.py @@ -1978,9 +1978,9 @@ def get_pod_template_spec( topology_spread_constraints=system_paasta_config.get_topology_spread_constraints(), ) if pod_topology_spread_constraints: - constraints = pod_spec_kwargs.get("topologySpreadConstraints", []) + constraints = pod_spec_kwargs.get("topology_spread_constraints", []) constraints += pod_topology_spread_constraints - pod_spec_kwargs["topologySpreadConstraints"] = constraints + pod_spec_kwargs["topology_spread_constraints"] = constraints termination_grace_period = self.get_termination_grace_period() if termination_grace_period is not None: @@ -2081,6 +2081,9 @@ def get_pod_template_spec( labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group() labels["paasta.yelp.com/scrape_piscina_prometheus"] = "true" + if self.get_service() == "compute-infra-test-service": + print(pod_spec_kwargs) + return V1PodTemplateSpec( metadata=V1ObjectMeta( labels=labels, From 853a0f4f207e2eae03a786b1b38ab3dea540510e Mon Sep 17 00:00:00 2001 From: Max Falk Date: Mon, 10 Jul 2023 11:39:16 +0200 Subject: [PATCH 2/2] remove print statement Signed-off-by: Max Falk --- paasta_tools/kubernetes_tools.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/paasta_tools/kubernetes_tools.py b/paasta_tools/kubernetes_tools.py index 4b313dfef9..5151d42acf 100644 --- a/paasta_tools/kubernetes_tools.py +++ b/paasta_tools/kubernetes_tools.py @@ -2081,9 +2081,6 @@ def get_pod_template_spec( labels["paasta.yelp.com/deploy_group"] = self.get_deploy_group() labels["paasta.yelp.com/scrape_piscina_prometheus"] = "true" - if self.get_service() == "compute-infra-test-service": - print(pod_spec_kwargs) - return V1PodTemplateSpec( metadata=V1ObjectMeta( labels=labels,