Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/backend/resources/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ type Object struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec interface{} `json:"spec,omitempty"`
Status interface{} `json:"status,omitempty"`
// for endpoint only
Subsets interface{} `json:"subsets,omitempty"`
Spec interface{} `json:"spec,omitempty"`
Status interface{} `json:"status,omitempty"`
}
6 changes: 6 additions & 0 deletions src/frontend/src/app/admin/admin-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ import { TrashAutoscaleComponent } from './autoscale/trash-autoscale/trash-autos
import { AutoscaletplComponent } from './autoscaletpl/autoscaletpl.component';
import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component';
import { KubePodComponent } from './kubernetes/pod/kube-pod.component';
import { KubeServiceComponent } from './kubernetes/service/kube-service.component';
import { KubeEndpointComponent } from './kubernetes/endpoint/kube-endpoint.component';


const routes: Routes = [
Expand Down Expand Up @@ -151,6 +153,10 @@ const routes: Routes = [
{path: 'kubernetes/namespace/:cluster', component: KubeNamespaceComponent},
{path: 'kubernetes/pod', component: KubePodComponent},
{path: 'kubernetes/pod/:cluster', component: KubePodComponent},
{path: 'kubernetes/service', component: KubeServiceComponent},
{path: 'kubernetes/service/:cluster', component: KubeServiceComponent},
{path: 'kubernetes/endpoint', component: KubeEndpointComponent},
{path: 'kubernetes/endpoint/:cluster', component: KubeEndpointComponent},
...ADMINROUTES
]
}
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/src/app/admin/admin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ import { ListAutoscaletplComponent } from './autoscaletpl/list-autoscaletpl/list
import { TrashAutoscaletplComponent } from './autoscaletpl/trash-autoscaletpl/trash-autoscaletpl.component';
import { SidenavModule } from './sidenav/sidenav.module';
import { KubePodModule } from './kubernetes/pod/kube-pod.module';
import { KubeServiceModule } from './kubernetes/service/kube-service.module';
import { KubeEndpointModule } from './kubernetes/endpoint/kube-endpoint.module';

@NgModule({
imports: [
Expand Down Expand Up @@ -91,6 +93,8 @@ import { KubePodModule } from './kubernetes/pod/kube-pod.module';
TplDetailModule,
SidenavModule,
KubePodModule,
KubeServiceModule,
KubeEndpointModule
],
providers: [
AdminAuthCheckGuard,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<div class="clr-row">
<div class="clr-col-lg-12 clr-col-md-12 clr-col-sm-12 clr-col-xs-12">
<div class="table-search">
<div class="table-search-left">
<button class="wayne-button normal" (click)="createResource()">
{{'ADMIN.KUBERNETES.ENDPOINT.CREATE' | translate}}
</button>
<button class="wayne-button normal" (click)="retrieveResource()">
{{'ADMIN.KUBERNETES.ACTION.REFRESH' | translate}}
</button>
<wayne-filter-box (confirm)="onConfirmEvent()" (cancel)="onCancelEvent()">
<wayne-checkbox-group [(ngModel)]="showList">
<wayne-checkbox value="name">{{'ADMIN.KUBERNETES.ENDPOINT.LIST.NAME' | translate}}</wayne-checkbox>
<wayne-checkbox value="port"> {{'ADMIN.KUBERNETES.ENDPOINT.LIST.PORT' | translate}}</wayne-checkbox>
<wayne-checkbox value="ip">{{'ADMIN.KUBERNETES.ENDPOINT.LIST.IP' | translate}}</wayne-checkbox>
<wayne-checkbox value="age">{{'ADMIN.KUBERNETES.ENDPOINT.LIST.AGE' | translate}}</wayne-checkbox>
</wayne-checkbox-group>
</wayne-filter-box>
<label for="namespace_name" class="clr-col-md-3">{{'ADMIN.KUBERNETES.LABEL.NAMESPACE' | translate}}</label>
<wayne-select [(ngModel)]="namespace" (change)="retrieveResource()"
searchable
name="namespace_name"
[placeholder]="'PLACEHOLDER.CHOOSE' | translate"
style="margin-left: 12px;">
<wayne-option *ngFor="let ns of namespaces" [value]="ns">{{ns}}</wayne-option>
</wayne-select>
</div>
</div>

<wayne-list-endpoint
[resources]="resources"
[showState]="showState"
(delete)="onDeleteResourceEvent($event)"
(edit)="onEditResourceEvent($event)"
[page]="pageState.page"
(paginate)="retrieveResource($event)">
</wayne-list-endpoint>
</div>
</div>
<deletion-dialog (outputObj)="confirmDeleteEvent($event)"></deletion-dialog>
<wayne-ace-editor (createOutputObj)="onCreateResourceEvent($event)" (outputObj)="onSaveResourceEvent($event)"></wayne-ace-editor>
<wayne-float-window value="{{ cluster }}">
<wayne-float-window-item *ngFor="let cluster of clusters" [value]="cluster"
(click)="jumpToHref(cluster)"></wayne-float-window-item>
</wayne-float-window>
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service';
import { ClusterService } from '../../../shared/client/v1/cluster.service';
import { AuthService } from '../../../shared/auth/auth.service';
import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component';
import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes';
import { KubeResourceEndpoint } from '../../../shared/shared.const';
import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource';
import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component';
import { ListEndpointComponent } from './list-endpoint/list-endpoint.component';

const showState = {
'name': {hidden: false},
'port': {hidden: false},
'ip': {hidden: false},
'age': {hidden: false},
};

@Component({
selector: 'wayne-kube-endpoint',
templateUrl: './kube-endpoint.component.html'
})

export class KubeEndpointComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy {
@ViewChild(ListEndpointComponent)
listResourceComponent: ListEndpointComponent;

@ViewChild(AceEditorComponent)
aceEditorModal: AceEditorComponent;

@ViewChild(DeletionDialogComponent)
deletionDialogComponent: DeletionDialogComponent;

constructor(public kubernetesClient: KubernetesClient,
public route: ActivatedRoute,
public router: Router,
public clusterService: ClusterService,
public authService: AuthService,
public messageHandlerService: MessageHandlerService) {
super(kubernetesClient, route, router, clusterService, authService, messageHandlerService);
super.registResourceType('endpoint');
super.registKubeResource(KubeResourceEndpoint);
super.registShowSate(showState);
}

ngOnInit() {
super.ngOnInit();
}

ngOnDestroy(): void {
super.ngOnDestroy();
}




}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { NgModule } from '@angular/core';
import { SharedModule } from '../../../shared/shared.module';
import { ReactiveFormsModule } from '@angular/forms';
import { KubeEndpointComponent } from './kube-endpoint.component';
import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes';
import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module';
import { ListEndpointComponent } from './list-endpoint/list-endpoint.component';

@NgModule({
imports: [
SharedModule,
ReactiveFormsModule,
DeletionDialogModule
],
providers: [
KubernetesClient
],
exports: [
KubeEndpointComponent,
ListEndpointComponent
],
declarations: [
KubeEndpointComponent,
ListEndpointComponent
]
})

export class KubeEndpointModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<clr-datagrid (clrDgRefresh)="refresh($event)">
<clr-dg-column [clrDgField]="'name'">
<ng-container *clrDgHideableColumn="showState['name']">
{{'ADMIN.KUBERNETES.ENDPOINT.LIST.NAME' | translate}}
</ng-container>
</clr-dg-column>
<clr-dg-column>
<ng-container *clrDgHideableColumn="showState['port']">
{{'ADMIN.KUBERNETES.ENDPOINT.LIST.PORT' | translate}}
</ng-container>
</clr-dg-column>
<clr-dg-column>
<ng-container *clrDgHideableColumn="showState['ip']">
{{'ADMIN.KUBERNETES.ENDPOINT.LIST.IP' | translate}}
</ng-container>
</clr-dg-column>
<clr-dg-column [clrDgField]="'creationTimestamp'">
<ng-container *clrDgHideableColumn="showState['age']">
{{'ADMIN.KUBERNETES.ENDPOINT.LIST.AGE' | translate}}
</ng-container>
</clr-dg-column>


<clr-dg-row *ngFor="let obj of resources" [clrDgItem]="obj">
<clr-dg-action-overflow>
<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>
</clr-dg-action-overflow>
<clr-dg-cell> {{ obj.metadata.name }} </clr-dg-cell>
<clr-dg-cell>
<div *ngFor="let subset of obj.subsets">
<div *ngFor="let port of subset.ports">
{{ port.port }} / {{ port.protocol }}
</div>
</div>
</clr-dg-cell>
<clr-dg-cell>
<div *ngFor="let subset of obj.subsets">
<div *ngFor="let addresse of subset.addresses">
{{ addresse.ip }}
</div>
</div>
</clr-dg-cell>
<clr-dg-cell> {{ obj.metadata.creationTimestamp | relativeTime}} </clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<wayne-paginate
[(currentPage)]="currentPage"
[total]="page.totalCount"
[pageSizes]="[10, 20, 50]"
(sizeChange)="pageSizeChange($event)">
</wayne-paginate>
</clr-dg-footer>
</clr-datagrid>
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { Component, Input } from '@angular/core';
import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource';
import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service';
import { KubeService } from '../../../../../../lib/shared/model/kubernetes/service';

@Component({
selector: 'wayne-list-endpoint',
templateUrl: './list-endpoint.component.html'
})

export class ListEndpointComponent extends KubernetesNamespacedListResource {
@Input() resources: any[];
@Input() showState: object;

constructor(public tplDetailService: TplDetailService) {
super(tplDetailService);
}


getPort(obj: KubeService) {
const result = Array<string>();
for (const port of obj.spec.ports) {
if (port.nodePort) {
result.push(`${port.targetPort}:${port.port}:${port.nodePort}/${port.protocol}`);
} else {
result.push(`${port.targetPort}:${port.port}/${port.protocol}`);
}
}
return result.join(', ');
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<div class="clr-row">
<div class="clr-col-lg-12 clr-col-md-12 clr-col-sm-12 clr-col-xs-12">
<div class="table-search">
<div class="table-search-left">
<button class="wayne-button normal" (click)="createResource()">
{{'ADMIN.KUBERNETES.SERVICE.CREATE' | translate}}
</button>
<button class="wayne-button normal" (click)="retrieveResource()">
{{'ADMIN.KUBERNETES.ACTION.REFRESH' | translate}}
</button>
<wayne-filter-box (confirm)="onConfirmEvent()" (cancel)="onCancelEvent()">
<wayne-checkbox-group [(ngModel)]="showList">
<wayne-checkbox value="name">{{'ADMIN.KUBERNETES.SERVICE.LIST.NAME' | translate}}</wayne-checkbox>
<wayne-checkbox value="type">{{'ADMIN.KUBERNETES.SERVICE.LIST.TYPE' | translate}}</wayne-checkbox>
<wayne-checkbox value="label">{{'ADMIN.KUBERNETES.SERVICE.LIST.LABEL' | translate}}</wayne-checkbox>
<wayne-checkbox value="clusterIP">{{'ADMIN.KUBERNETES.SERVICE.LIST.CLUSTERIP' | translate}}</wayne-checkbox>
<wayne-checkbox value="port"> {{'ADMIN.KUBERNETES.SERVICE.LIST.PORT' | translate}}</wayne-checkbox>
<wayne-checkbox value="externalIP">{{'ADMIN.KUBERNETES.SERVICE.LIST.EXTERNALIP' | translate}}</wayne-checkbox>
<wayne-checkbox value="age">{{'ADMIN.KUBERNETES.SERVICE.LIST.AGE' | translate}}</wayne-checkbox>
</wayne-checkbox-group>
</wayne-filter-box>
<label for="namespace_name" class="clr-col-md-3">{{'ADMIN.KUBERNETES.LABEL.NAMESPACE' | translate}}</label>
<wayne-select [(ngModel)]="namespace" (change)="retrieveResource()"
searchable
name="namespace_name"
[placeholder]="'PLACEHOLDER.CHOOSE' | translate"
style="margin-left: 12px;">
<wayne-option *ngFor="let ns of namespaces" [value]="ns">{{ns}}</wayne-option>
</wayne-select>
</div>
</div>

<wayne-list-service
[resources]="resources"
[showState]="showState"
(delete)="onDeleteResourceEvent($event)"
(edit)="onEditResourceEvent($event)"
[page]="pageState.page"
[cluster]="cluster"
(migration)="migration($event)"
(paginate)="retrieveResource($event)">
</wayne-list-service>
</div>
</div>
<kube-migration></kube-migration>
<deletion-dialog (outputObj)="confirmDeleteEvent($event)"></deletion-dialog>
<wayne-ace-editor (createOutputObj)="onCreateResourceEvent($event)" (outputObj)="onSaveResourceEvent($event)"></wayne-ace-editor>
<wayne-float-window value="{{ cluster }}">
<wayne-float-window-item *ngFor="let cluster of clusters" [value]="cluster"
(click)="jumpToHref(cluster)"></wayne-float-window-item>
</wayne-float-window>
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { MessageHandlerService } from '../../../shared/message-handler/message-handler.service';
import { ClusterService } from '../../../shared/client/v1/cluster.service';
import { AuthService } from '../../../shared/auth/auth.service';
import { AceEditorComponent } from '../../../shared/ace-editor/ace-editor.component';
import { ListServiceComponent } from './list-service/list-service.component';
import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes';
import { KubeResourceService } from '../../../shared/shared.const';
import { KubernetesNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-resource';
import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component';
import { MigrationComponent } from './migration/migration.component';

const showState = {
'name': {hidden: false},
'type': {hidden: false},
'label': {hidden: false},
'clusterIP': {hidden: false},
'port': {hidden: false},
'externalIP': {hidden: false},
'age': {hidden: false},
};

@Component({
selector: 'wayne-kube-service',
templateUrl: './kube-service.component.html'
})

export class KubeServiceComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy {
@ViewChild(ListServiceComponent)
listResourceComponent: ListServiceComponent;

@ViewChild(AceEditorComponent)
aceEditorModal: AceEditorComponent;

@ViewChild(DeletionDialogComponent)
deletionDialogComponent: DeletionDialogComponent;

@ViewChild(MigrationComponent)
migrationComponent: MigrationComponent;

constructor(public kubernetesClient: KubernetesClient,
public route: ActivatedRoute,
public router: Router,
public clusterService: ClusterService,
public authService: AuthService,
public messageHandlerService: MessageHandlerService) {
super(kubernetesClient, route, router, clusterService, authService, messageHandlerService);
super.registResourceType('service');
super.registKubeResource(KubeResourceService);
super.registShowSate(showState);
}

ngOnInit() {
super.ngOnInit();
}

ngOnDestroy(): void {
super.ngOnDestroy();
}


migration(obj: any) {
this.migrationComponent.openModal(this.cluster, obj);
}

}
Loading