Add Kubernetes pod enter container action

src/backend/controllers/kubernetes/pod/pod.go

@@ -104,6 +104,7 @@ func (c *KubePodController) List() {
 	deployment := c.Input().Get("deployment")
 	statefulset := c.Input().Get("statefulset")
 	daemonSet := c.Input().Get("daemonSet")
+	podName := c.Input().Get("pod")
 	job := c.Input().Get("job")
 	manager, err := client.Manager(cluster)
 	if err == nil {
@@ -117,6 +118,10 @@ func (c *KubePodController) List() {
 			result, err = pod.GetPodsByDaemonSet(manager.CacheFactory, namespace, daemonSet)
 		} else if job != "" {
 			result, err = pod.GetPodsByJob(manager.CacheFactory, namespace, job)
+		} else if podName != "" {
+			var podInfo *pod.Pod
+			podInfo, err = pod.GetPodByName(manager.Client, namespace, podName)
+			result = []*pod.Pod{podInfo}
 		} else {
 			err = fmt.Errorf("unknown resource type. ")
 		}

src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.html

@@ -33,6 +33,7 @@
 
     <wayne-list-pod
       [resources]="resources"
+      [cluster]="cluster"
       [showState]="showState"
       (delete)="onDeleteResourceEvent($event)"
       (edit)="onEditResourceEvent($event)"

src/frontend/src/app/admin/kubernetes/pod/kube-pod.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service';
 import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service';
 import { ClusterService } from '../../../shared/client/v1/cluster.service';
 import { AuthService } from '../../../shared/auth/auth.service';

src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.html

@@ -46,6 +46,8 @@
       <button class="action-item" (click)="onEditEvent(obj)">{{'ADMIN.KUBERNETES.ACTION.EDIT' | translate}}</button>
       <button class="action-item" (click)="onDeleteEvent(obj)">{{'ADMIN.KUBERNETES.ACTION.DELETE' | translate}}</button>
       <button class="action-item" (click)="onForceDeleteEvent(obj)">{{'ADMIN.KUBERNETES.ACTION.FORCEDELETE' | translate}}</button>
+      <button class="action-item" (click)="enterContainer(obj)">{{'ADMIN.KUBERNETES.ACTION.ENTER_CONTAINER' | translate}}</button>
+      <button class="action-item" (click)="podLog(obj)">{{'ADMIN.KUBERNETES.ACTION.LOG' | translate}}</button>
     </clr-dg-action-overflow>
     <clr-dg-cell> {{ obj.metadata.name }} </clr-dg-cell>
     <clr-dg-cell class="col-version">

src/frontend/src/app/admin/kubernetes/pod/list-pod/list-pod.component.ts

@@ -12,11 +12,24 @@ import { KubePod } from '../../../../shared/model/v1/kubernetes/kubepod';
 export class ListPodComponent extends KubernetesListResource {
   @Input() resources: any[];
   @Input() showState: object;
+  @Input() cluster: string;
 
   constructor(public tplDetailService: TplDetailService) {
     super(tplDetailService);
   }
 
+  enterContainer(pod: KubePod): void {
+    const url = `portal/namespace/0/app/0/pod` +
+      `/${pod.metadata.name}/pod/${pod.metadata.name}/terminal/${this.cluster}/${pod.metadata.namespace}`;
+    window.open(url, '_blank');
+  }
+
+  podLog(pod: KubePod): void {
+    const url = `portal/logging/namespace/0/app/0/pod/${pod.metadata.name}` +
+      `/pod/${pod.metadata.name}/${this.cluster}/${pod.metadata.namespace}`;
+    window.open(url, '_blank');
+  }
+
   // getPodStatus returns the pod state
   getPodStatus(pod: KubePod): string {
     // Terminating

src/frontend/src/app/shared/list-pod/list-pod.component.ts

@@ -27,7 +27,7 @@ import { AuthService } from '../auth/auth.service';
   styleUrls: ['list-pod.scss']
 })
 
-export class ListPodComponent implements  OnDestroy {
+export class ListPodComponent implements OnDestroy {
   @Input() Type: string;
   checkOnGoing = false;
   isSubmitOnGoing = false;
@@ -38,7 +38,7 @@ export class ListPodComponent implements  OnDestroy {
   timeComparator = new TimeComparator();
   stateComparator = new StateComparator();
   currentCluster: string;
-  deployment: string;
+  resourceName: string;
   logSource: string;
   timer: any;
   whetherHotReflash = true;
@@ -87,9 +87,9 @@ export class ListPodComponent implements  OnDestroy {
     clearInterval(this.timer);
   }
 
-  openModal(cluster: string, deployment: string) {
+  openModal(cluster: string, resourceName: string) {
     this.currentCluster = cluster;
-    this.deployment = deployment;
+    this.resourceName = resourceName;
     this.pods = null;
     this.logSource = null;
     this.modalOpened = true;
@@ -125,12 +125,14 @@ export class ListPodComponent implements  OnDestroy {
       if (!this.modalOpened) {
         clearInterval(this.timer);
       }
-      if (this.whetherHotReflash) { this.refresh(); }
+      if (this.whetherHotReflash) {
+        this.refresh();
+      }
     }, 5000);
   }
 
   refresh() {
-    this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, this.Type, this.deployment).subscribe(
+    this.podClient.listByResouce(this.appId, this.currentCluster, this.cacheService.kubeNamespace, this.Type, this.resourceName).subscribe(
       response => {
         const pods = response.data;
         this.inventory.size = pods.length;
@@ -159,7 +161,7 @@ export class ListPodComponent implements  OnDestroy {
   enterContainer(pod: Pod): void {
     const appId = this.route.parent.snapshot.params['id'];
     const url = `portal/namespace/${this.cacheService.namespaceId}/app/${appId}/${this.Type}` +
-    `/${this.deployment}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`;
+      `/${this.resourceName}/pod/${pod.name}/terminal/${this.currentCluster}/${this.cacheService.kubeNamespace}`;
     window.open(url, '_blank');
   }
 
@@ -174,17 +176,17 @@ export class ListPodComponent implements  OnDestroy {
     if (this.logSource === undefined) {
       this.messageHandlerService.showInfo('缺少机房信息，请联系管理员');
     }
-    const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource}  --${this.Type} ${this.deployment} ` +
-      `--pod=${pod.name} --layout=log`;
+    const kubeToolCmd = `kubetool log --source ${this.logSource === undefined ? '' : this.logSource} ` +
+      ` --${this.Type} ${this.resourceName} --pod=${pod.name} --layout=log`;
     this.copyService.copy(kubeToolCmd);
     this.switchCopyButton();
   }
 
 
   podLog(pod: Pod): void {
     const appId = this.route.parent.snapshot.params['id'];
-    const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/${this.Type}/${this.deployment}` +
-    `/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`;
+    const url = `portal/logging/namespace/${this.cacheService.namespaceId}/app/${appId}/${this.Type}/${this.resourceName}` +
+      `/pod/${pod.name}/${this.currentCluster}/${this.cacheService.kubeNamespace}`;
     window.open(url, '_blank');
   }
 }

src/frontend/src/assets/i18n/zh-Hans.json

@@ -603,7 +603,9 @@
         "MIGRATION": "迁移",
         "DELETE": "删除",
         "FORCEDELETE": "强制删除",
-        "REFRESH": "刷新"
+        "REFRESH": "刷新",
+        "ENTER_CONTAINER": "进入容器",
+        "LOG": "查看日志"
       },
       "LABEL": {
         "NAMESPACE": "命名空间:"