From 4d203c5e0cfb28e1bce2abfa33e6127922d4ff52 Mon Sep 17 00:00:00 2001
From: Bobonium <bobonium@gmail.com>
Date: Thu, 27 Oct 2022 12:33:00 +0200
Subject: [PATCH 1/2] Split CMD into ENTRYPOINT and CMD for Dockerfile

--help is now an CMD which means explicitly providing a command override in kubernetes is no longer required. You can now simply provide the necessary arguments
---
 Dockerfile                                   | 4 +++-
 Dockerfile.dev                               | 3 ++-
 charts/descheduler/templates/cronjob.yaml    | 2 --
 charts/descheduler/templates/deployment.yaml | 2 --
 kubernetes/cronjob/cronjob.yaml              | 2 --
 kubernetes/deployment/deployment.yaml        | 2 --
 kubernetes/job/job.yaml                      | 2 --
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5f1a128c6..d4ff84cd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,4 +27,6 @@ USER 1000
 
 COPY --from=0 /go/src/sigs.k8s.io/descheduler/_output/bin/descheduler /bin/descheduler
 
-CMD ["/bin/descheduler", "--help"]
+ENTRYPOINT ["/bin/descheduler"]
+CMD ["--help"]
+
diff --git a/Dockerfile.dev b/Dockerfile.dev
index c5522f1ca..f1d39d47c 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -19,4 +19,5 @@ USER 1000
 
 COPY _output/bin/descheduler /bin/descheduler
 
-CMD ["/bin/descheduler", "--help"]
+ENTRYPOINT ["/bin/descheduler"]
+CMD ["--help"]
diff --git a/charts/descheduler/templates/cronjob.yaml b/charts/descheduler/templates/cronjob.yaml
index 0fe1aa2da..09858c55d 100644
--- a/charts/descheduler/templates/cronjob.yaml
+++ b/charts/descheduler/templates/cronjob.yaml
@@ -62,8 +62,6 @@ spec:
             - name: {{ .Chart.Name }}
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
               imagePullPolicy: {{ .Values.image.pullPolicy }}
-              command:
-                - "/bin/descheduler"
               args:
                 - "--policy-config-file"
                 - "/policy-dir/policy.yaml"
diff --git a/charts/descheduler/templates/deployment.yaml b/charts/descheduler/templates/deployment.yaml
index d7d7b2260..0d8d7e206 100644
--- a/charts/descheduler/templates/deployment.yaml
+++ b/charts/descheduler/templates/deployment.yaml
@@ -43,8 +43,6 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - "/bin/descheduler"
           args:
             - "--policy-config-file"
             - "/policy-dir/policy.yaml"
diff --git a/kubernetes/cronjob/cronjob.yaml b/kubernetes/cronjob/cronjob.yaml
index 4dc9895d0..c8e3a2c93 100644
--- a/kubernetes/cronjob/cronjob.yaml
+++ b/kubernetes/cronjob/cronjob.yaml
@@ -20,8 +20,6 @@ spec:
             volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume
-            command:
-              - "/bin/descheduler"
             args:
               - "--policy-config-file"
               - "/policy-dir/policy.yaml"
diff --git a/kubernetes/deployment/deployment.yaml b/kubernetes/deployment/deployment.yaml
index 4f5b21c73..235d28cff 100644
--- a/kubernetes/deployment/deployment.yaml
+++ b/kubernetes/deployment/deployment.yaml
@@ -21,8 +21,6 @@ spec:
         - name: descheduler
           image: k8s.gcr.io/descheduler/descheduler:v0.25.0
           imagePullPolicy: IfNotPresent
-          command:
-            - "/bin/descheduler"
           args:
             - "--policy-config-file"
             - "/policy-dir/policy.yaml"
diff --git a/kubernetes/job/job.yaml b/kubernetes/job/job.yaml
index a2eaf1436..51de1f70d 100644
--- a/kubernetes/job/job.yaml
+++ b/kubernetes/job/job.yaml
@@ -18,8 +18,6 @@ spec:
           volumeMounts:
           - mountPath: /policy-dir
             name: policy-volume
-          command:
-            - "/bin/descheduler"
           args:
             - "--policy-config-file"
             - "/policy-dir/policy.yaml"

From 646e2a72be241f4f6d01463d5470e1c46d1334ce Mon Sep 17 00:00:00 2001
From: Jochen Dick <Bobonium@users.noreply.github.com>
Date: Wed, 28 Dec 2022 10:06:55 +0100
Subject: [PATCH 2/2] Update Dockerfile

remove redundant empty line from end of file

Co-authored-by: Amir Alavi <amiralavi7@gmail.com>
---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d4ff84cd5..ce1d886ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,4 +29,3 @@ COPY --from=0 /go/src/sigs.k8s.io/descheduler/_output/bin/descheduler /bin/desch
 
 ENTRYPOINT ["/bin/descheduler"]
 CMD ["--help"]
-