Merge pull request #395 from BennieMeng/hotfix/deployment-strategy-ch…

…ange-error fix: deployment strategy changeto rollingupdate error
Qihoo360 · Apr 15, 2019 · 0e5f858 · 0e5f858
2 parents 0f6055a + 00c147b
commit 0e5f858
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.../app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html b/.../app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.html
@@ -23,12 +23,12 @@ <h3 class="header-title" id="创建模版">
           <label class="clr-col-md-3 form-group-label-override required">{{'TEMPLATE.UPDATE_WAY' | translate}}</label>
           <div class="radio-inline">
             <input type="radio" name="statefulSetStrategyType" id="statefulSetStrategyType1" value="RollingUpdate"
-                   [(ngModel)]="kubeResource.spec.strategy.type" checked>
+                   [(ngModel)]="kubeResource.spec.strategy.type" checked (change)="strategyTypeChange()">
             <label for="statefulSetStrategyType1">{{'TEMPLATE.SCROLL_UPDATE' | translate}}</label>
           </div>
           <div class="radio-inline">
             <input type="radio" name="statefulSetStrategyType" id="statefulSetStrategyType2" value="Recreate"
-                   [(ngModel)]="kubeResource.spec.strategy.type">
+                   [(ngModel)]="kubeResource.spec.strategy.type" (change)="strategyTypeChange()">
             <label for="statefulSetStrategyType2">{{'TEMPLATE.REBUILD' | translate}}</label>
           </div>
         </div>

diff --git a/...rc/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts b/...rc/app/portal/deployment/create-edit-deploymenttpl/create-edit-deploymenttpl.component.ts
@@ -164,6 +164,14 @@ export class CreateEditDeploymentTplComponent extends ContainerTpl implements On
     return cpuLimit;
   }
 
+  strategyTypeChange() {
+    if (this.kubeResource.spec.strategy.type === 'RollingUpdate' && !this.kubeResource.spec.strategy.rollingUpdate) {
+      this.kubeResource.spec.strategy.rollingUpdate = new RollingUpdateDeployment();
+      this.kubeResource.spec.strategy.rollingUpdate.maxSurge = '20%';
+      this.kubeResource.spec.strategy.rollingUpdate.maxUnavailable = 1;
+    }
+  }
+
   initDefault() {
     this.kubeResource = JSON.parse(defaultDeployment);
     this.kubeResource.spec.template.spec.containers.push(this.defaultContainer());

diff --git a/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts b/src/frontend/src/app/portal/pod-logging/pod-logging.component.ts
@@ -93,7 +93,8 @@ export class PodLoggingComponent implements OnInit, OnDestroy {
       this.messageHandlerService.showInfo('缺少机房信息，请联系管理员');
     }
     const command = this.selectedPod ?
-      `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} --${this.resourceType} ` +
+      `kubetool log --source ${this.logSource === undefined ? '' : this.logSource}` +
+      ` --${this.resourceType === 'deployments' ? 'deployment' : this.resourceType} ` +
       `${this.resourceName} --pod=${this.selectedPod.metadata.name} --container=${this.selectedContainer}  --layout=log` : '';
     this.copyService.copy(command);
     this.switchCopyButton();

diff --git a/src/frontend/src/app/shared/list-pod/list-pod.component.ts b/src/frontend/src/app/shared/list-pod/list-pod.component.ts
@@ -200,7 +200,8 @@ export class ListPodComponent implements OnDestroy {
       this.messageHandlerService.showInfo('缺少机房信息，请联系管理员');
     }
     const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} ` +
-      ` --${this.resourceType} ${this.resourceName} --pod=${pod.metadata.name} --layout=log`;
+      ` --${this.resourceType === 'deployments' ? 'deployment' : this.resourceType} ${this.resourceName}` +
+      ` --pod=${pod.metadata.name} --layout=log`;
     this.copyService.copy(kubeToolCmd);
     this.switchCopyButton();
   }