Add kubernetes daemonset resource

src/backend/controllers/kubernetes/service/service.go

@@ -7,12 +7,12 @@ import (
 
 	"github.com/Qihoo360/wayne/src/backend/client"
 	"github.com/Qihoo360/wayne/src/backend/controllers/base"
+	"github.com/Qihoo360/wayne/src/backend/controllers/common"
 	"github.com/Qihoo360/wayne/src/backend/models"
 	"github.com/Qihoo360/wayne/src/backend/models/response"
 	"github.com/Qihoo360/wayne/src/backend/resources/service"
 	"github.com/Qihoo360/wayne/src/backend/util/logs"
 	"github.com/Qihoo360/wayne/src/backend/workers/webhook"
-	"github.com/Qihoo360/wayne/src/backend/controllers/common"
 )
 
 type KubeServiceController struct {
@@ -131,7 +131,6 @@ func (c *KubeServiceController) Deploy() {
 		// add service predeploy
 		common.ServicePreDeploy(&kubeService, clusterModel, namespaceModel)
 
-
 		publishHistory := &models.PublishHistory{
 			Type:         models.PublishTypeService,
 			ResourceId:   int64(serviceId),

src/backend/models/namespace.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Qihoo360/wayne/src/backend/util/hack"
 	"github.com/Qihoo360/wayne/src/backend/util/logs"
-
 )
 
 const (

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

@@ -75,6 +75,7 @@ import { KubeConfigmapComponent } from './kubernetes/configmap/kube-configmap.co
 import { KubeSecretComponent } from './kubernetes/secret/kube-secret.component';
 import { KubeIngressComponent } from './kubernetes/ingress/kube-ingress.component';
 import { KubeStatefulsetComponent } from './kubernetes/statefulset/kube-statefulset.component';
+import { KubeDaemonsetComponent } from './kubernetes/daemonset/kube-daemonset.component';
 
 
 const routes: Routes = [
@@ -169,6 +170,8 @@ const routes: Routes = [
       {path: 'kubernetes/ingress/:cluster', component: KubeIngressComponent},
       {path: 'kubernetes/statefulset', component: KubeStatefulsetComponent},
       {path: 'kubernetes/statefulset/:cluster', component: KubeStatefulsetComponent},
+      {path: 'kubernetes/daemonset', component: KubeDaemonsetComponent},
+      {path: 'kubernetes/daemonset/:cluster', component: KubeDaemonsetComponent},
       ...ADMINROUTES
     ]
   }

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

@@ -55,6 +55,7 @@ import { KubeConfigmapModule } from './kubernetes/configmap/kube-configmap.modul
 import { KubeSecretModule } from './kubernetes/secret/kube-secret.module';
 import { KubeIngressModule } from './kubernetes/ingress/kube-ingress.module';
 import { KubeStatefulsetModule } from './kubernetes/statefulset/kube-statefulset.module';
+import { KubeDaemonsetModule } from './kubernetes/daemonset/kube-daemonset.module';
 
 @NgModule({
   imports: [
@@ -102,7 +103,8 @@ import { KubeStatefulsetModule } from './kubernetes/statefulset/kube-statefulset
     KubeConfigmapModule,
     KubeSecretModule,
     KubeIngressModule,
-    KubeStatefulsetModule
+    KubeStatefulsetModule,
+    KubeDaemonsetModule
   ],
   providers: [
     AdminAuthCheckGuard,

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

@@ -0,0 +1,49 @@
+<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.DAEMONSET.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.DAEMONSET.LIST.NAME' | translate}}</wayne-checkbox>
+            <wayne-checkbox value="label">{{'ADMIN.KUBERNETES.DAEMONSET.LIST.LABEL' | translate}}</wayne-checkbox>
+            <wayne-checkbox value="containers">{{'ADMIN.KUBERNETES.DAEMONSET.LIST.IMAGES' | translate}}</wayne-checkbox>
+            <wayne-checkbox value="status">{{'ADMIN.KUBERNETES.DAEMONSET.LIST.STATUS' | translate}}</wayne-checkbox>
+            <wayne-checkbox value="age">{{'ADMIN.KUBERNETES.DAEMONSET.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-daemonset
+      [resources]="resources"
+      [showState]="showState"
+      (delete)="onDeleteResourceEvent($event)"
+      (edit)="onEditResourceEvent($event)"
+      [page]="pageState.page"
+      [cluster]="cluster"
+      (migration)="migration($event)"
+      (paginate)="retrieveResource($event)">
+    </wayne-list-daemonset>
+  </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>

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

@@ -0,0 +1,65 @@
+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 { KubeResourceDaemonSet } 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';
+import { ListDaemonsetComponent } from './list-daemonset/list-daemonset.component';
+
+const showState = {
+  'name': {hidden: false},
+  'label': {hidden: false},
+  'containers': {hidden: false},
+  'status': {hidden: false},
+  'age': {hidden: false},
+};
+
+@Component({
+  selector: 'wayne-kube-daemonset',
+  templateUrl: './kube-daemonset.component.html'
+})
+
+export class KubeDaemonsetComponent extends KubernetesNamespacedResource implements OnInit, OnDestroy {
+  @ViewChild(ListDaemonsetComponent)
+  listResourceComponent: ListDaemonsetComponent;
+
+  @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('daemonset');
+    super.registKubeResource(KubeResourceDaemonSet);
+    super.registShowSate(showState);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+  }
+
+
+  migration(obj: any) {
+    this.migrationComponent.openModal(this.cluster, obj);
+  }
+
+}

src/frontend/src/app/admin/kubernetes/daemonset/kube-daemonset.module.ts

@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../../../shared/shared.module';
+import { ReactiveFormsModule } from '@angular/forms';
+import { KubeDaemonsetComponent } from './kube-daemonset.component';
+import { KubernetesClient } from '../../../shared/client/v1/kubernetes/kubernetes';
+import { DeletionDialogModule } from '../../../shared/deletion-dialog/deletion-dialog.module';
+import { MigrationComponent } from './migration/migration.component';
+import { ListDaemonsetComponent } from './list-daemonset/list-daemonset.component';
+
+@NgModule({
+  imports: [
+    SharedModule,
+    ReactiveFormsModule,
+    DeletionDialogModule
+  ],
+  providers: [
+    KubernetesClient
+  ],
+  exports: [
+    KubeDaemonsetComponent,
+    ListDaemonsetComponent
+  ],
+  declarations: [
+    KubeDaemonsetComponent,
+    ListDaemonsetComponent,
+    MigrationComponent
+  ]
+})
+
+export class KubeDaemonsetModule {
+}

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

@@ -0,0 +1,63 @@
+<clr-datagrid (clrDgRefresh)="refresh($event)">
+  <clr-dg-column class="col-app-name" [clrDgField]="'name'">
+    <ng-container *clrDgHideableColumn="showState['name']">
+      {{'ADMIN.KUBERNETES.DAEMONSET.LIST.NAME' | translate}}
+    </ng-container>
+  </clr-dg-column>
+  <clr-dg-column>
+    <ng-container *clrDgHideableColumn="showState['label']">
+      {{'ADMIN.KUBERNETES.DAEMONSET.LIST.LABEL' | translate}}
+    </ng-container>
+  </clr-dg-column>
+  <clr-dg-column class="col-version">
+    <ng-container *clrDgHideableColumn="showState['containers']">
+      {{'ADMIN.KUBERNETES.DAEMONSET.LIST.IMAGES' | translate}}
+    </ng-container>
+  </clr-dg-column>
+  <clr-dg-column>
+    <ng-container *clrDgHideableColumn="showState['status']">
+      {{'ADMIN.KUBERNETES.DAEMONSET.LIST.STATUS' | translate}}
+    </ng-container>
+  </clr-dg-column>
+  <clr-dg-column [clrDgField]="'creationTimestamp'">
+    <ng-container *clrDgHideableColumn="showState['age']">
+      {{'ADMIN.KUBERNETES.DAEMONSET.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>
+      <button class="action-item" (click)="migrationResource(obj)">{{'ADMIN.KUBERNETES.ACTION.MIGRATION' | 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 class="col-version">
+      <div *ngFor="let container of obj.spec.template.spec.containers" class="version-text">
+        <a href="javascript:" (click)="versionDetail(container.image)">{{container.image}}</a>
+      </div>
+    </clr-dg-cell>
+    <clr-dg-cell>
+      {{obj.status.numberReady ? obj.status.numberReady : 0 }}/{{obj.status.desiredNumberScheduled}}
+      <clr-icon style="color: #FF3434" shape="exclamation-triangle" *ngIf="obj.status.numberReady !== obj.status.desiredNumberScheduled"
+                class="is-solid"></clr-icon>
+      <clr-icon style="color: green" shape="success-standard" *ngIf="obj.status.numberReady === obj.status.desiredNumberScheduled"
+                class="is-solid"></clr-icon>
+    </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>

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

@@ -0,0 +1,24 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { KubernetesNamespacedListResource } from '../../../../shared/base/kubernetes-namespaced/kubernetes-namespaced-list-resource';
+import { TplDetailService } from '../../../../shared/tpl-detail/tpl-detail.service';
+
+@Component({
+  selector: 'wayne-list-daemonset',
+  templateUrl: './list-daemonset.component.html'
+})
+
+export class ListDaemonsetComponent extends KubernetesNamespacedListResource {
+  @Input() resources: any[];
+  @Input() showState: object;
+
+  @Output() migration = new EventEmitter<any>();
+
+  constructor(public tplDetailService: TplDetailService) {
+    super(tplDetailService);
+  }
+
+
+  migrationResource(obj: any) {
+    this.migration.emit(obj);
+  }
+}

src/frontend/src/app/admin/kubernetes/daemonset/migration/migration.component.html

@@ -0,0 +1,32 @@
+<clr-modal [(clrModalOpen)]="modalOpened" [clrModalSize]="'xl'" #modal>
+  <h3 class="modal-title">迁移资源
+    <wayne-modal-operate [modal]="modal" *ngIf="modalOpened"></wayne-modal-operate>
+  </h3>
+  <div class="modal-body">
+    <form #ngForm="ngForm">
+      <section class="form-block">
+        <div class="form-group" style="padding-left: 135px;">
+          <label for="app" class="clr-col-md-3 form-group-label-override required">应用</label>
+          <div class="select form-control">
+            <wayne-select name="app" [(ngModel)]="selectedApp"
+                          searchable
+                          [placeholder]="'PLACEHOLDER.CHOOSE' | translate">
+              <wayne-option *ngFor="let app of apps" [value]="app">{{app.name}}</wayne-option>
+            </wayne-select>
+          </div>
+        </div>
+        <div class="form-group" style="padding-left: 135px;">
+          <label class="clr-col-md-3 form-group-label-override">模版</label>
+          <wayne-ace-editor-box></wayne-ace-editor-box>
+
+        </div>
+      </section>
+    </form>
+    <div class="modal-footer">
+
+      <button type="button" class="btn btn-outline" (click)="onCancel()">{{'BUTTON.CANCEL' | translate}}</button>
+      <button type="button" class="btn btn-primary" [disabled]="!isValid"
+              (click)="onSubmit()">{{'BUTTON.SUBMIT' | translate}}</button>
+    </div>
+  </div>
+</clr-modal>

src/frontend/src/app/admin/kubernetes/daemonset/migration/migration.component.ts

@@ -0,0 +1,64 @@
+import { Component, OnInit } from '@angular/core';
+import { AppService } from '../../../../shared/client/v1/app.service';
+import { AceEditorService } from '../../../../shared/ace-editor/ace-editor.service';
+import { MessageHandlerService } from '../../../../shared/message-handler/message-handler.service';
+import { MigrationResource } from '../../../../shared/base/kubernetes-namespaced/migration-resource';
+import { KubernetesClient } from '../../../../shared/client/v1/kubernetes/kubernetes';
+import { KubeResourceDaemonSet } from '../../../../shared/shared.const';
+import { DaemonSetService } from '../../../../shared/client/v1/daemonset.service';
+import { DaemonSetTplService } from '../../../../shared/client/v1/daemonsettpl.service';
+import { DaemonSet } from '../../../../shared/model/v1/daemonset';
+import { DaemonSetTemplate } from '../../../../shared/model/v1/daemonsettpl';
+
+@Component({
+  selector: 'kube-migration',
+  templateUrl: 'migration.component.html'
+})
+export class MigrationComponent extends MigrationResource implements OnInit {
+
+  constructor(private daemonSetService: DaemonSetService,
+              private daemonSetTplService: DaemonSetTplService,
+              public appService: AppService,
+              public kubernetesClient: KubernetesClient,
+              public aceEditorService: AceEditorService,
+              public messageHandlerService: MessageHandlerService) {
+    super(kubernetesClient, appService, aceEditorService, messageHandlerService);
+    super.registKubeResource(KubeResourceDaemonSet);
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+  }
+
+  onSubmit() {
+    if (this.isSubmitOnGoing) {
+      return;
+    }
+    this.isSubmitOnGoing = true;
+    const resource = new DaemonSet();
+    resource.name = this.obj.metadata.name;
+    resource.appId = this.selectedApp.id;
+    this.daemonSetService.create(resource).subscribe(
+      resp => {
+        const data = resp.data;
+        const tpl = new DaemonSetTemplate();
+        tpl.name = this.obj.metadata.name;
+        tpl.daemonSetId = data.id;
+        tpl.template = JSON.stringify(this.obj);
+        tpl.description = 'migration from kubernetes. ';
+        this.daemonSetTplService.create(tpl, this.selectedApp.id).subscribe(
+          () => {
+            this.messageHandlerService.showSuccess('资源创建成功！请前往前台手动发布到相应机房！');
+          },
+          error => {
+            this.messageHandlerService.handleError(error);
+          });
+      },
+      error => {
+        this.messageHandlerService.handleError(error);
+      }
+    );
+    this.modalOpened = false;
+  }
+
+}