Merge pull request #8397 from wjiangjay/master

fix descheduler pod should be critical pod

roles/openshift_descheduler/templates/descheduler-cronjob.yaml.j2

@@ -3,14 +3,14 @@ kind: CronJob
 metadata:
   name: "{{ openshift_descheduler_cronjob_name }}"
   namespace: openshift-descheduler
-  annotations:
-    scheduler.alpha.kubernetes.io/critical-pod: ''
 spec:
   schedule: "{{ openshift_descheduler_cronjob_schedule }}"
   jobTemplate:
     spec:
       template:
         metadata:
+          annotations:
+            scheduler.alpha.kubernetes.io/critical-pod: ''
           name: "{{ openshift_descheduler_cronjob_name }}"
         spec:
           containers: