merge master

src/frontend/src/app/admin/admin-routing.module.ts

@@ -58,6 +58,10 @@ import { KubernetesDashboardComponent } from './kubernetes-dashboard/kubernetes-
 import { NotificationComponent } from './notification/notification.component';
 import { NodesComponent } from './node/nodes.component';
 import { ADMINROUTES } from '../../../lib/admin/library-routing-admin';
+import { IngressComponent } from './ingress/ingress.component';
+import { TrashIngressComponent } from './ingress/trash-ingress/trash-ingress.component';
+import { IngressTplComponent } from './ingresstpl/ingresstpl.component';
+import { TrashIngressTplComponent } from './ingresstpl/trash-ingresstpl/trash-ingresstpl.component';
 import { KubeDeploymentComponent } from './kubernetes/deployment/kube-deployment.component';
 
 
@@ -140,6 +144,10 @@ const routes: Routes = [
       {path: 'kubernetes/persistentvolume/:cluster', component: PersistentVolumeComponent},
       {path: 'kubernetes/persistentvolume/:cluster/edit/:name', component: CreateEditPersistentVolumeComponent},
       {path: 'kubernetes/persistentvolume/:cluster/edit', component: CreateEditPersistentVolumeComponent},
+      {path: 'ingress', component: IngressComponent},
+      {path: 'ingress/trash', component: TrashIngressComponent},
+      {path: 'ingress/tpl', component: IngressTplComponent},
+      {path: 'ingress/tpl/trash', component: TrashIngressTplComponent},
       {path: 'kubernetes/deployment', component: KubeDeploymentComponent},
       {path: 'kubernetes/deployment/:cluster', component: KubeDeploymentComponent},
       ...ADMINROUTES

src/frontend/src/app/admin/admin.module.ts

@@ -34,6 +34,8 @@ import { NavModule } from './nav/nav.module';
 import { NotificationModule } from './notification/notification.module';
 import { NodesModule } from './node/nodes.module';
 import { LibraryAdminModule } from '../../../lib/admin/library-admin.module';
+import { IngressModule } from './ingress/ingress.module';
+import { IngressTplModule } from './ingresstpl/ingresstpl.module';
 import { KubeDeploymentModule } from './kubernetes/deployment/kube-deployment.module';
 import { TplDetailModule } from '../shared/tpl-detail/tpl-detail.module';
 
@@ -71,6 +73,8 @@ import { TplDetailModule } from '../shared/tpl-detail/tpl-detail.module';
     NotificationModule,
     NodesModule,
     LibraryAdminModule,
+    IngressModule,
+    IngressTplModule,
     KubeDeploymentModule,
     TplDetailModule
   ],