From 2ce9d46b8cf7bce0b34409e7cdf824042c3eeff0 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Fri, 3 May 2024 14:32:21 +0300 Subject: [PATCH 1/3] allow 'falsey' value in cmdOption --- charts/descheduler/templates/cronjob.yaml | 2 +- charts/descheduler/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/descheduler/templates/cronjob.yaml b/charts/descheduler/templates/cronjob.yaml index 73e3714b9..d97eeb62d 100644 --- a/charts/descheduler/templates/cronjob.yaml +++ b/charts/descheduler/templates/cronjob.yaml @@ -81,7 +81,7 @@ spec: args: - --policy-config-file=/policy-dir/policy.yaml {{- range $key, $value := .Values.cmdOptions }} - - {{ printf "--%s" $key }}{{ if $value }}={{ $value }}{{ end }} + - {{ printf "--%s=%s" $key (toString $value) }} {{- end }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 16 }} diff --git a/charts/descheduler/templates/deployment.yaml b/charts/descheduler/templates/deployment.yaml index ff90a6602..8cbfeda64 100644 --- a/charts/descheduler/templates/deployment.yaml +++ b/charts/descheduler/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: - --policy-config-file=/policy-dir/policy.yaml - --descheduling-interval={{ required "deschedulingInterval required for running as Deployment" .Values.deschedulingInterval }} {{- range $key, $value := .Values.cmdOptions }} - - {{ printf "--%s" $key }}{{ if $value }}={{ $value }}{{ end }} + - {{printf "--%s=%s" $key (toString $value)}} {{- end }} {{- include "descheduler.leaderElection" . | nindent 12 }} ports: From 149a4c11c48392d7a116cb09d2e5d6aab7eb9003 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Fri, 3 May 2024 17:37:32 +0300 Subject: [PATCH 2/3] Added speaces --- charts/descheduler/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/descheduler/templates/deployment.yaml b/charts/descheduler/templates/deployment.yaml index 8cbfeda64..c09d8363d 100644 --- a/charts/descheduler/templates/deployment.yaml +++ b/charts/descheduler/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: - --policy-config-file=/policy-dir/policy.yaml - --descheduling-interval={{ required "deschedulingInterval required for running as Deployment" .Values.deschedulingInterval }} {{- range $key, $value := .Values.cmdOptions }} - - {{printf "--%s=%s" $key (toString $value)}} + - {{ printf "--%s=%s" $key (toString $value) }} {{- end }} {{- include "descheduler.leaderElection" . | nindent 12 }} ports: From 9f5fc14410feb61d8486af9fa34b92ae3cac4533 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Wed, 8 May 2024 17:42:40 +0300 Subject: [PATCH 3/3] Fixed options without value --- charts/descheduler/templates/cronjob.yaml | 4 ++++ charts/descheduler/templates/deployment.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/charts/descheduler/templates/cronjob.yaml b/charts/descheduler/templates/cronjob.yaml index d97eeb62d..9d18adf09 100644 --- a/charts/descheduler/templates/cronjob.yaml +++ b/charts/descheduler/templates/cronjob.yaml @@ -81,7 +81,11 @@ spec: args: - --policy-config-file=/policy-dir/policy.yaml {{- range $key, $value := .Values.cmdOptions }} + {{- if ne $value nil }} - {{ printf "--%s=%s" $key (toString $value) }} + {{- else }} + - {{ printf "--%s" $key }} + {{- end }} {{- end }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 16 }} diff --git a/charts/descheduler/templates/deployment.yaml b/charts/descheduler/templates/deployment.yaml index c09d8363d..92c75f0ef 100644 --- a/charts/descheduler/templates/deployment.yaml +++ b/charts/descheduler/templates/deployment.yaml @@ -53,7 +53,11 @@ spec: - --policy-config-file=/policy-dir/policy.yaml - --descheduling-interval={{ required "deschedulingInterval required for running as Deployment" .Values.deschedulingInterval }} {{- range $key, $value := .Values.cmdOptions }} + {{- if ne $value nil }} - {{ printf "--%s=%s" $key (toString $value) }} + {{- else }} + - {{ printf "--%s" $key }} + {{- end }} {{- end }} {{- include "descheduler.leaderElection" . | nindent 12 }} ports: