Merge pull request #372 from wilhelmguo/feature/add_template_default_values

Add template default values

Author: wilhelmguo

src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.html

@@ -64,6 +64,25 @@ <h3 class="header-title" id="创建计划任务模版">{{'CRONJOB.CREATE_TMP' |
           </div>
         </label>
       </div>
+      <div class="form-group form-group-padding">
+        <label class="clr-col-md-3 form-group-label-override">保留成功 Job 数
+          <a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg">
+            <clr-icon shape="info-circle" size="24"></clr-icon>
+            <span class="tooltip-content">允许保留的成功的任务个数</span>
+          </a>
+        </label>
+        <input type="number" name="successfulJobsHistoryLimit"
+               [(ngModel)]="kubeResource.spec.successfulJobsHistoryLimit">
+        <label class="clr-col-md-3 form-group-label-override" style="color: #000">保留失败 Job 数
+          <a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg">
+            <clr-icon shape="info-circle" size="24"></clr-icon>
+            <span class="tooltip-content">允许保留的失败的任务个数</span>
+          </a>
+        </label>
+        <input type="number" name="failedJobsHistoryLimit"
+               [(ngModel)]="kubeResource.spec.failedJobsHistoryLimit">
+      </div>
+
       <div class="form-group form-group-padding">
         <label class="clr-col-md-3 form-group-label-override">失败重试次数
           <a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg">
@@ -79,9 +98,11 @@ <h3 class="header-title" id="创建计划任务模版">{{'CRONJOB.CREATE_TMP' |
             <span class="tooltip-content">标志任务结束需要成功运行的容器组个数</span>
           </a>
         </label>
-        <input type="text" name="completions"
+        <input type="number" name="completions"
                [(ngModel)]="kubeResource.spec.jobTemplate.spec.completions">
       </div>
+
+
       <div class="form-group form-group-padding">
         <label class="clr-col-md-3 form-group-label-override">允许并发数
           <a role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg">
@@ -97,7 +118,7 @@ <h3 class="header-title" id="创建计划任务模版">{{'CRONJOB.CREATE_TMP' |
             <span class="tooltip-content">{{'CRONJOB.MAX_EXECUTE_TIME_MESSAGE' | translate}}</span>
           </a>
         </label>
-        <input type="text" name="activeDeadlineSeconds"
+        <input type="number" name="activeDeadlineSeconds"
                [(ngModel)]="kubeResource.spec.jobTemplate.spec.activeDeadlineSeconds">
       </div>
 

src/frontend/src/app/portal/cronjob/create-edit-cronjobtpl/create-edit-cronjobtpl.component.ts

@@ -215,6 +215,7 @@ export class CreateEditCronjobTplComponent extends ContainerTpl implements OnIni
     container.resources.limits = {'memory': '', 'cpu': ''};
     container.env = [];
     container.envFrom = [];
+    container.imagePullPolicy = 'IfNotPresent';
     return container;
   }
 

src/frontend/src/app/portal/cronjob/list-job/list-job.component.html

@@ -43,14 +43,6 @@ <h3 class="modal-title">
                   {{kubeObj.spec.schedule}}
                 </div>
               </div>
-              <div class="clr-row group">
-                <div class="clr-col-sm-3" style="font-weight:600">
-                  执行中的任务数
-                </div>
-                <div class="clr-col-sm-9">
-                  {{kubeObj.status.active?.lenght}}
-                </div>
-              </div>
               <div class="clr-row group">
                 <div class="clr-col-sm-3" style="font-weight:600">
                   最大执行时间
@@ -83,12 +75,20 @@ <h3 class="modal-title">
                   {{kubeObj.spec.jobTemplate.spec.parallelism}}
                 </div>
               </div>
+              <div class="clr-row group">
+                <div class="clr-col-sm-3" style="font-weight:600">
+                  已激活任务数
+                </div>
+                <div class="clr-col-sm-9">
+                  {{ kubeObj.status.active?.length }}
+                </div>
+              </div>
               <div class="clr-row group">
                 <div class="clr-col-sm-3" style="font-weight:600">
                   最后调度时间
                 </div>
                 <div class="clr-col-sm-9">
-                  {{kubeObj.status.lastScheduleTime}}
+                  {{kubeObj.status.lastScheduleTime | date:'yyyy-MM-dd HH:mm:ss' }}
                 </div>
               </div>
             </section>

src/frontend/src/app/portal/daemonset/create-edit-daemonsettpl/create-edit-daemonsettpl.component.ts

@@ -344,6 +344,7 @@ export class CreateEditDaemonSetTplComponent extends ContainerTpl implements OnI
     container.resources.limits = {'memory': '', 'cpu': ''};
     container.env = [];
     container.envFrom = [];
+    container.imagePullPolicy = 'IfNotPresent';
     return container;
   }
 

src/frontend/src/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts

@@ -175,6 +175,7 @@ export class CreateEditDeploymentTplComponent extends ContainerTpl implements On
     container.resources.limits = {'memory': '', 'cpu': ''};
     container.env = [];
     container.envFrom = [];
+    container.imagePullPolicy = 'IfNotPresent';
     return container;
   }
 

src/frontend/src/app/portal/statefulset/create-edit-statefulsettpl/create-edit-statefulsettpl.component.ts

@@ -329,6 +329,7 @@ export class CreateEditStatefulsettplComponent extends ContainerTpl implements O
     container.resources.limits = {'memory': '', 'cpu': ''};
     container.env = [];
     container.envFrom = [];
+    container.imagePullPolicy = 'IfNotPresent';
     return container;
   }
 

src/frontend/src/app/shared/default-models/cronjob.const.ts

@@ -10,19 +10,26 @@ export const defaultCronJob = `{
         }
       },
       "spec": {
+        "activeDeadlineSeconds": 30,
+        "parallelism": 1,
+        "completions": 1,
+        "backoffLimit": 6,
         "template": {
           "metadata": {
             "labels": {
             }
           },
           "spec": {
-            "restartPolicy":"Never",
+            "restartPolicy": "Never",
             "containers": []
           }
         }
       }
     },
     "concurrencyPolicy": "Allow",
-    "schedule": "*/1 * * * *"
+    "schedule": "*/1 * * * *",
+    "successfulJobsHistoryLimit": 3,
+    "failedJobsHistoryLimit": 1
   }
-}`;
+}
+`;