frontend: change log copy command deployments to deployment

Qihoo360 · Apr 12, 2019 · 00c147b · 00c147b
1 parent 071eee0
commit 00c147b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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();
   }