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
47 changes: 47 additions & 0 deletions src/backend/client/api/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
batchv1beta1 "k8s.io/api/batch/v1beta1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
Expand All @@ -33,6 +34,11 @@ const (
ResourceNameStatefulSet ResourceName = "statefulsets"
ResourceNameEndpoint ResourceName = "endpoints"
ResourceNameStorageClass ResourceName = "storageclasses"
ResourceNameRole ResourceName = "roles"
ResourceNameRoleBinding ResourceName = "rolebindings"
ResourceNameClusterRole ResourceName = "clusterroles"
ResourceNameClusterRoleBinding ResourceName = "clusterrolebindings"
ResourceNameServiceAccount ResourceName = "serviceaccounts"
)

type ResourceMap struct {
Expand Down Expand Up @@ -194,4 +200,45 @@ var KindToResourceMap = map[string]ResourceMap{
},
Namespaced: false,
},

ResourceNameRole: {
GroupVersionResource: schema.GroupVersionResource{
Group: rbacv1.GroupName,
Version: rbacv1.SchemeGroupVersion.Version,
Resource: ResourceNameRole,
},
Namespaced: true,
},
ResourceNameRoleBinding: {
GroupVersionResource: schema.GroupVersionResource{
Group: rbacv1.GroupName,
Version: rbacv1.SchemeGroupVersion.Version,
Resource: ResourceNameRoleBinding,
},
Namespaced: true,
},
ResourceNameClusterRole: {
GroupVersionResource: schema.GroupVersionResource{
Group: rbacv1.GroupName,
Version: rbacv1.SchemeGroupVersion.Version,
Resource: ResourceNameClusterRole,
},
Namespaced: false,
},
ResourceNameClusterRoleBinding: {
GroupVersionResource: schema.GroupVersionResource{
Group: rbacv1.GroupName,
Version: rbacv1.SchemeGroupVersion.Version,
Resource: ResourceNameClusterRoleBinding,
},
Namespaced: false,
},
ResourceNameServiceAccount: {
GroupVersionResource: schema.GroupVersionResource{
Group: corev1.GroupName,
Version: corev1.SchemeGroupVersion.Version,
Resource: ResourceNameServiceAccount,
},
Namespaced: true,
},
}
3 changes: 3 additions & 0 deletions src/backend/client/clientfactory.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
Expand All @@ -29,6 +30,8 @@ func (h *resourceHandler) getClientByGroupVersion(groupVersion schema.GroupVersi
return h.client.ExtensionsV1beta1().RESTClient()
case storagev1.GroupName:
return h.client.StorageV1().RESTClient()
case rbacv1.GroupName:
return h.client.RbacV1().RESTClient()
default:
return h.client.CoreV1().RESTClient()
}
Expand Down
3 changes: 3 additions & 0 deletions src/backend/resources/common/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ type Object struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

// for ServiceAccount
Secrets []v1.ObjectReference `json:"secrets,omitempty"`

// for StorageClass
Provisioner string `json:"provisioner,omitempty"`
ReclaimPolicy *v1.PersistentVolumeReclaimPolicy `json:"reclaimPolicy,omitempty"`
Expand Down
15 changes: 15 additions & 0 deletions src/frontend/src/app/admin/admin-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ import { KubePvcComponent } from './kubernetes/pvc/kube-pvc.component';
import { KubeReplicasetComponent } from './kubernetes/replicaset/kube-replicaset.component';
import { KubeStorageclassComponent } from './kubernetes/storageclass/kube-storageclass.component';
import { KubeHpaComponent } from './kubernetes/hpa/kube-hpa.component';
import { KubeRoleComponent } from './kubernetes/role/kube-role.component';
import { KubeRolebindingComponent } from './kubernetes/rolebinding/kube-rolebinding.component';
import { KubeServiceaccountComponent } from './kubernetes/serviceaccount/kube-serviceaccount.component';
import { KubeClusterroleComponent } from './kubernetes/clusterrole/kube-clusterrole.component';
import { KubeClusterrolebindingComponent } from './kubernetes/clusterrolebinding/kube-clusterrolebinding.component';


const routes: Routes = [
Expand Down Expand Up @@ -190,6 +195,16 @@ const routes: Routes = [
{path: 'kubernetes/storageclass/:cluster', component: KubeStorageclassComponent},
{path: 'kubernetes/horizontalpodautoscaler', component: KubeHpaComponent},
{path: 'kubernetes/horizontalpodautoscaler/:cluster', component: KubeHpaComponent},
{path: 'kubernetes/role', component: KubeRoleComponent},
{path: 'kubernetes/role/:cluster', component: KubeRoleComponent},
{path: 'kubernetes/rolebinding', component: KubeRolebindingComponent},
{path: 'kubernetes/rolebinding/:cluster', component: KubeRolebindingComponent},
{path: 'kubernetes/serviceaccount', component: KubeServiceaccountComponent},
{path: 'kubernetes/serviceaccount/:cluster', component: KubeServiceaccountComponent},
{path: 'kubernetes/clusterrole', component: KubeClusterroleComponent},
{path: 'kubernetes/clusterrole/:cluster', component: KubeClusterroleComponent},
{path: 'kubernetes/clusterrolebinding', component: KubeClusterrolebindingComponent},
{path: 'kubernetes/clusterrolebinding/:cluster', component: KubeClusterrolebindingComponent},
...ADMINROUTES
]
}
Expand Down
13 changes: 12 additions & 1 deletion src/frontend/src/app/admin/admin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ import { KubeReplicasetModule } from './kubernetes/replicaset/kube-replicaset.mo
import { KubePvcModule } from './kubernetes/pvc/kube-pvc.module';
import { KubeStorageclassModule } from './kubernetes/storageclass/kube-storageclass.module';
import { KubeHpaModule } from './kubernetes/hpa/kube-hpa.module';
import { KubeRoleModule } from './kubernetes/role/kube-role.module';
import { KubeRolebindingModule } from './kubernetes/rolebinding/kube-rolebinding.module';
import { KubeServiceaccountModule } from './kubernetes/serviceaccount/kube-serviceaccount.module';
import { KubeClusterroleModule } from './kubernetes/clusterrole/kube-clusterrole.module';
import { KubeClusterrolebindingModule } from './kubernetes/clusterrolebinding/kube-clusterrolebinding.module';

@NgModule({
imports: [
Expand Down Expand Up @@ -117,7 +122,13 @@ import { KubeHpaModule } from './kubernetes/hpa/kube-hpa.module';
KubeJobModule,
KubePvcModule,
KubeStorageclassModule,
KubeHpaModule
KubeHpaModule,
KubeRoleModule,
KubeRolebindingModule,
KubeServiceaccountModule,
KubeClusterroleModule,
KubeClusterrolebindingModule,
KubeNamespaceModule
],
providers: [
AdminAuthCheckGuard,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<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.CLUSTERROLE.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.CLUSTERROLE.LIST.NAME' | translate}}</wayne-checkbox>
<wayne-checkbox value="label">{{'ADMIN.KUBERNETES.CLUSTERROLE.LIST.LABEL' | translate}}</wayne-checkbox>
<wayne-checkbox value="age">{{'ADMIN.KUBERNETES.CLUSTERROLE.LIST.AGE' | translate}}</wayne-checkbox>
</wayne-checkbox-group>
</wayne-filter-box>
</div>
</div>

<wayne-list-clusterrole
[resources]="resources"
[showState]="showState"
(delete)="onDeleteResourceEvent($event)"
(edit)="onEditResourceEvent($event)"
[page]="pageState.page"
[cluster]="cluster"
(paginate)="retrieveResource($event)">
</wayne-list-clusterrole>
</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,54 @@
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 { KubeResourceClusterRole } from '../../../shared/shared.const';
import { DeletionDialogComponent } from '../../../shared/deletion-dialog/deletion-dialog.component';
import { KubernetesUnNamespacedResource } from '../../../shared/base/kubernetes-namespaced/kubernetes-unnamespaced-resource';
import { ListClusterroleComponent } from './list-clusterrole/list-clusterrole.component';

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

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

export class KubeClusterroleComponent extends KubernetesUnNamespacedResource implements OnInit, OnDestroy {
@ViewChild(ListClusterroleComponent)
listResourceComponent: ListClusterroleComponent;

@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('clusterrole');
super.registKubeResource(KubeResourceClusterRole);
super.registShowSate(showState);
}

ngOnInit() {
super.ngOnInit();
}

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

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

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

export class KubeClusterroleModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<clr-datagrid (clrDgRefresh)="refresh($event)">
<clr-dg-column class="col-app-name" [clrDgField]="'name'">
<ng-container *clrDgHideableColumn="showState['name']">
{{'ADMIN.KUBERNETES.CLUSTERROLE.LIST.NAME' | translate}}
</ng-container>
</clr-dg-column>
<clr-dg-column>
<ng-container *clrDgHideableColumn="showState['label']">
{{'ADMIN.KUBERNETES.CLUSTERROLE.LIST.LABEL' | translate}}
</ng-container>
</clr-dg-column>
<clr-dg-column [clrDgField]="'creationTimestamp'">
<ng-container *clrDgHideableColumn="showState['age']">
{{'ADMIN.KUBERNETES.CLUSTERROLE.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 class="col-app-name"> {{ obj.metadata.name }} </clr-dg-cell>
<clr-dg-cell>
<div *ngFor="let label of obj.metadata.labels | keyvalue" class="version-text">
<a href="javascript:" (click)="versionDetail(label.key + ': ' + label.value)">{{label.key}}: {{label.value}}</a>
</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,18 @@
import { Component, Input } from '@angular/core';
import { KubernetesListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-list-resource';
import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service';

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

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

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

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<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.CLUSTERROLEBINDING.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.CLUSTERROLEBINDING.LIST.NAME' | translate}}</wayne-checkbox>
<wayne-checkbox value="label">{{'ADMIN.KUBERNETES.CLUSTERROLEBINDING.LIST.LABEL' | translate}}</wayne-checkbox>
<wayne-checkbox value="age">{{'ADMIN.KUBERNETES.CLUSTERROLEBINDING.LIST.AGE' | translate}}</wayne-checkbox>
</wayne-checkbox-group>
</wayne-filter-box>
</div>
</div>

<wayne-list-clusterrolebinding
[resources]="resources"
[showState]="showState"
(delete)="onDeleteResourceEvent($event)"
(edit)="onEditResourceEvent($event)"
[page]="pageState.page"
[cluster]="cluster"
(paginate)="retrieveResource($event)">
</wayne-list-clusterrolebinding>
</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>
Loading