Revert "Split CMD into ENTRYPOINT and CMD for Dockerfile"

Dockerfile

@@ -27,5 +27,4 @@ USER 1000
 
 COPY --from=0 /go/src/sigs.k8s.io/descheduler/_output/bin/descheduler /bin/descheduler
 
-ENTRYPOINT ["/bin/descheduler"]
+CMD ["/bin/descheduler", "--help"]
-CMD ["--help"]

Dockerfile.dev

@@ -19,5 +19,4 @@ USER 1000
 
 COPY _output/bin/descheduler /bin/descheduler
 
-ENTRYPOINT ["/bin/descheduler"]
+CMD ["/bin/descheduler", "--help"]
-CMD ["--help"]

charts/descheduler/templates/cronjob.yaml

@@ -65,6 +65,8 @@ 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"

charts/descheduler/templates/deployment.yaml

@@ -43,6 +43,8 @@ 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"

kubernetes/cronjob/cronjob.yaml

@@ -20,6 +20,8 @@ spec:
             volumeMounts:
             - mountPath: /policy-dir
               name: policy-volume
+            command:
+              - "/bin/descheduler"
             args:
               - "--policy-config-file"
               - "/policy-dir/policy.yaml"

kubernetes/deployment/deployment.yaml

@@ -21,6 +21,8 @@ spec:
         - name: descheduler
           image: registry.k8s.io/descheduler/descheduler:v0.25.1
           imagePullPolicy: IfNotPresent
+          command:
+            - "/bin/descheduler"
           args:
             - "--policy-config-file"
             - "/policy-dir/policy.yaml"

kubernetes/job/job.yaml

@@ -18,6 +18,8 @@ spec:
           volumeMounts:
           - mountPath: /policy-dir
             name: policy-volume
+          command:
+            - "/bin/descheduler"
           args:
             - "--policy-config-file"
             - "/policy-dir/policy.yaml"