Merge pull request #772 from maciaszczykm/daemon-sets-frontend

Add frontend for Daemon Set

Author: bryk

build/i18n.js

@@ -36,7 +36,7 @@ function extractForLanguage(langKey) {
   let translationBundle = path.join(conf.paths.base, `i18n/messages-${langKey}.xtb`);
   let codeSource = path.join(conf.paths.serve, '*.js');
   let command = `java -jar ${conf.paths.xtbgenerator} --lang ${langKey}` +
-      ` --xtb_output_file ${translationBundle}` + ` --js ${codeSource}`;
+      ` --xtb_output_file ${translationBundle} --js ${codeSource}`;
   if (fileExists(translationBundle)) {
     command = `${command} --translations_file ${translationBundle}`;
   }

src/app/backend/dashboard.go

@@ -41,7 +41,7 @@ var (
 func main() {
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
-	flag.CommandLine.Parse(make([]string,0))  // Init for glog calls in kubernetes packages
+	flag.CommandLine.Parse(make([]string, 0)) // Init for glog calls in kubernetes packages
 
 	log.Printf("Starting HTTP server on port %d", *argPort)
 

src/app/backend/resource/daemonset/daemonsetcommon.go

@@ -16,7 +16,6 @@ package daemonset
 
 import (
 	"github.com/kubernetes/dashboard/resource/common"
-	//	"github.com/kubernetes/dashboard/resource/event"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"

src/app/backend/resource/pod/poddetail.go

@@ -28,26 +28,26 @@ import (
 // This means it is PodDetail plus additional augumented data we can get
 // from other sources (like services that target it).
 type PodDetail struct {
-	ObjectMeta      common.ObjectMeta `json:"objectMeta"`
-	TypeMeta        common.TypeMeta   `json:"typeMeta"`
+	ObjectMeta common.ObjectMeta `json:"objectMeta"`
+	TypeMeta   common.TypeMeta   `json:"typeMeta"`
 
 	// Container images of the Pod.
 	ContainerImages []string `json:"containerImages"`
 
 	// Status of the Pod. See Kubernetes API for reference.
-	PodPhase        api.PodPhase `json:"podPhase"`
+	PodPhase api.PodPhase `json:"podPhase"`
 
 	// IP address of the Pod.
-	PodIP           string `json:"podIP"`
+	PodIP string `json:"podIP"`
 
 	// Name of the Node this Pod runs on.
-	NodeName        string `json:"nodeName"`
+	NodeName string `json:"nodeName"`
 
 	// Count of containers restarts.
-	RestartCount    int32 `json:"restartCount"`
+	RestartCount int32 `json:"restartCount"`
 
 	// Pod metrics.
-	Metrics         *PodMetrics `json:"metrics"`
+	Metrics *PodMetrics `json:"metrics"`
 }
 
 // GetPodDetail returns the details (PodDetail) of a named Pod from a particular
@@ -70,4 +70,4 @@ func GetPodDetail(client k8sClient.Interface, heapsterClient client.HeapsterClie
 
 	podDetail := ToPodDetail(pod, metrics)
 	return &podDetail, nil
-};
+}

src/app/backend/resource/workload/workloads.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/kubernetes/dashboard/client"
 	"github.com/kubernetes/dashboard/resource/common"
+	"github.com/kubernetes/dashboard/resource/daemonset"
 	"github.com/kubernetes/dashboard/resource/deployment"
 	"github.com/kubernetes/dashboard/resource/pod"
 	"github.com/kubernetes/dashboard/resource/replicaset"
@@ -35,6 +36,8 @@ type Workloads struct {
 	ReplicationControllerList replicationcontroller.ReplicationControllerList `json:"replicationControllerList"`
 
 	PodList pod.PodList `json:"podList"`
+
+	DaemonSetList daemonset.DaemonSetList `json:"daemonSetList"`
 }
 
 // GetWorkloads returns a list of all workloads in the cluster.
@@ -45,11 +48,12 @@ func GetWorkloads(client k8sClient.Interface,
 	channels := &common.ResourceChannels{
 		ReplicationControllerList: common.GetReplicationControllerListChannel(client, nsQuery, 1),
 		ReplicaSetList:            common.GetReplicaSetListChannel(client.Extensions(), nsQuery, 1),
+		DaemonSetList:             common.GetDaemonSetListChannel(client.Extensions(), nsQuery, 1),
 		DeploymentList:            common.GetDeploymentListChannel(client.Extensions(), nsQuery, 1),
-		ServiceList:               common.GetServiceListChannel(client, nsQuery, 3),
-		PodList:                   common.GetPodListChannel(client, nsQuery, 4),
-		EventList:                 common.GetEventListChannel(client, nsQuery, 3),
-		NodeList:                  common.GetNodeListChannel(client, nsQuery, 3),
+		ServiceList:               common.GetServiceListChannel(client, nsQuery, 4),
+		PodList:                   common.GetPodListChannel(client, nsQuery, 5),
+		EventList:                 common.GetEventListChannel(client, nsQuery, 4),
+		NodeList:                  common.GetNodeListChannel(client, nsQuery, 4),
 	}
 
 	return GetWorkloadsFromChannels(channels, heapsterClient)
@@ -64,7 +68,8 @@ func GetWorkloadsFromChannels(channels *common.ResourceChannels,
 	deploymentChan := make(chan *deployment.DeploymentList)
 	rcChan := make(chan *replicationcontroller.ReplicationControllerList)
 	podChan := make(chan *pod.PodList)
-	errChan := make(chan error, 4)
+	dsChan := make(chan *daemonset.DaemonSetList)
+	errChan := make(chan error, 5)
 
 	go func() {
 		rcList, err := replicationcontroller.GetReplicationControllerListFromChannels(channels)
@@ -90,6 +95,12 @@ func GetWorkloadsFromChannels(channels *common.ResourceChannels,
 		podChan <- podList
 	}()
 
+	go func() {
+		dsList, err := daemonset.GetDaemonSetListFromChannels(channels)
+		errChan <- err
+		dsChan <- dsList
+	}()
+
 	rcList := <-rcChan
 	err := <-errChan
 	if err != nil {
@@ -114,11 +125,18 @@ func GetWorkloadsFromChannels(channels *common.ResourceChannels,
 		return nil, err
 	}
 
+	dsList := <-dsChan
+	err = <-errChan
+	if err != nil {
+		return nil, err
+	}
+
 	workloads := &Workloads{
 		ReplicaSetList:            *rsList,
 		ReplicationControllerList: *rcList,
 		DeploymentList:            *deploymentList,
 		PodList:                   *podList,
+		DaemonSetList:             *dsList,
 	}
 
 	return workloads, nil

src/app/externs/backendapi.js

@@ -358,6 +358,27 @@ backendApi.Service;
  */
 backendApi.ServiceList;
 
+/**
+ * @typedef {{
+ *  objectMeta: !backendApi.ObjectMeta,
+ *  typeMeta: !backendApi.TypeMeta,
+ *  labelSelector: !Object<string, string>,
+ *  containerImages: !Array<string>,
+ *  podInfo: !backendApi.PodInfo,
+ *  pods: !backendApi.PodList,
+ *  serviceList: !backendApi.ServiceList,
+ *  hasMetrics: boolean
+ * }}
+ */
+backendApi.DaemonSet;
+
+/**
+ * @typedef {{
+ *  daemonSets: !Array<backendApi.DaemonSet>
+ * }}
+ */
+backendApi.DaemonSetList;
+
 /**
  * @typedef {{
  *  host: string,

src/app/frontend/common/components/actionbar/actionbar_module.js

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {actionbarComponent} from './actionbar_component';
-import {actionbarDeleteItemComponent} from './actionbardeleteitem_component';
 import {breadcrumbsComponent} from './../breadcrumbs/breadcrumbs_component';
 import {BreadcrumbsService} from './../breadcrumbs/breadcrumbs_service';
+import {actionbarComponent} from './actionbar_component';
+import {actionbarDeleteItemComponent} from './actionbardeleteitem_component';
+
 import resourceModule from 'common/resource/resource_module';
 
 /**

src/app/frontend/common/components/endpoint/endpoint_module.js

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {internalEndpointComponent} from './internalendpoint_component';
 import {externalEndpointComponent} from './externalendpoint_component';
+import {internalEndpointComponent} from './internalendpoint_component';
 
 /**
  * Module containing endpoint components.

src/app/frontend/daemonsetdetail/daemonsetdetail.html

@@ -0,0 +1,36 @@
+<!--
+Copyright 2015 Google Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<div layout="column">
+  <md-content>
+    <md-tabs md-border-bottom md-dynamic-height>
+      <md-tab label="Overview">
+        <kd-daemon-set-info daemon-set="::ctrl.daemonSetDetail"></kd-daemon-set-info>
+        <kd-content-card>
+          <kd-title>Pods</kd-title>
+          <kd-content>
+            <kd-pod-card-list pod-list="::ctrl.daemonSetDetail.pods"
+                              logs-href-fn="::ctrl.getPodLogsHref(pod)">
+            </kd-pod-card-list>
+          </kd-content>
+        </kd-content-card>
+      </md-tab>
+      <md-tab label="Events">
+        <kd-event-card-list events="::ctrl.daemonSetDetail.eventList.events"></kd-event-card-list>
+      </md-tab>
+    </md-tabs>
+  </md-content>
+</div>

src/app/frontend/daemonsetdetail/daemonsetdetail_controller.js

@@ -0,0 +1,27 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @final
+ */
+export class DaemonSetDetailController {
+  /**
+   * @param {!backendApi.DaemonSet} daemonSetDetail
+   * @ngInject
+   */
+  constructor(daemonSetDetail) {
+    /** @export {!backendApi.DaemonSet} */
+    this.daemonSetDetail = daemonSetDetail;
+  }
+}