Updated Godeps

Author: Marcin Maciaszczyk

src/app/backend/apihandler.go

@@ -86,6 +86,17 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient *unversioned.RES
 			Writes(Protocols{}))
 	wsContainer.Add(deployWs)
 
+	deployFromFileWs := new(restful.WebService)
+	deployFromFileWs.Path("/api/appdeploymentfromfile").
+	Consumes(restful.MIME_JSON).
+	Produces(restful.MIME_JSON)
+	deployFromFileWs.Route(
+		deployFromFileWs.POST("").
+		To(apiHandler.handleDeployFromFile).
+		Reads(AppDeploymentFromFileSpec{}).
+		Writes(AppDeploymentFromFileSpec{}))
+	wsContainer.Add(deployFromFileWs)
+
 	replicaSetWs := new(restful.WebService)
 	replicaSetWs.Filter(wsLogger)
 	replicaSetWs.Path("/api/replicasets").
@@ -188,6 +199,22 @@ func (apiHandler *ApiHandler) handleDeploy(request *restful.Request, response *r
 	response.WriteHeaderAndEntity(http.StatusCreated, appDeploymentSpec)
 }
 
+// Handles deploy from file API call.
+func (apiHandler *ApiHandler) handleDeployFromFile(request *restful.Request, response *restful.Response) {
+	deploymentSpec := new(AppDeploymentFromFileSpec)
+	if err := request.ReadEntity(deploymentSpec); err != nil {
+		handleInternalError(response, err)
+		return
+	}
+	if err := DeployAppFromFile(deploymentSpec, apiHandler.client); err != nil {
+		handleInternalError(response, err)
+		return
+	}
+
+	response.WriteHeaderAndEntity(http.StatusCreated, deploymentSpec)
+
+}
+
 // Handles app name validation API call.
 func (apiHandler *ApiHandler) handleNameValidity(request *restful.Request, response *restful.Response) {
 	spec := new(AppNameValiditySpec)

src/app/backend/deploy.go

@@ -16,11 +16,15 @@ package main
 
 import (
 	"fmt"
+	ioutil "io/ioutil"
 	"log"
+	"os"
 	"strings"
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
+	create "k8s.io/kubernetes/pkg/kubectl/cmd"
+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/intstr"
 )
@@ -76,6 +80,15 @@ type AppDeploymentSpec struct {
 	RunAsPrivileged bool `json:"runAsPrivileged"`
 }
 
+// Specification for deployment from file
+type AppDeploymentFromFileSpec struct {
+	// Name of the file
+	Name string `json:"name"`
+
+	// File content
+	Content string `json:"content"`
+}
+
 // Port mapping for an application deployment.
 type PortMapping struct {
 	// Port that will be exposed on the service.
@@ -231,3 +244,28 @@ func getLabelsMap(labels []Label) map[string]string {
 
 	return result
 }
+
+// Deploys an app based on the given yaml or json file.
+func DeployAppFromFile(spec *AppDeploymentFromFileSpec, client *client.Client) error {
+	// Creates temp file to use it in kubectl command
+	file, err := ioutil.TempFile("", spec.Name)
+	if err != nil {
+		return err
+	}
+	_,err = file.WriteString(spec.Content)
+	if err != nil {
+		return err
+	}
+	// Runs kubectl create command with the temp file
+	options := &create.CreateOptions{
+		Filenames: []string {file.Name()},
+	}
+	cmd := create.NewCmdCreate(cmdutil.NewFactory(nil), os.Stdout)
+	cmd.Flags().Set("filename", file.Name())
+	cmd.Flags().Set("output", "name")
+	err = create.RunCreate(cmdutil.NewFactory(nil), cmd, os.Stdout, options)
+
+	// Removes the created temp file after using it
+	os.Remove(file.Name())
+	return err
+}

src/app/externs/backendapi.js

@@ -60,6 +60,14 @@ backendApi.Label;
  */
 backendApi.AppDeploymentSpec;
 
+/**
+ * @typedef {{
+ *   name: string,
+ *   content: string
+ * }}
+ */
+backendApi.AppDeploymentFromFileSpec;
+
 /**
  * @typedef {{
  *   namespace: string,

src/app/frontend/common/errorhandling/errordialog_service.js

@@ -41,4 +41,19 @@ export default class ErrorDialog {
     alert.ok('Close');
     this.mdDialog_.show(alert);
   }
+
+  /**
+   * Opens a pop-up window that displays the error message with title
+   *
+   * @param {string} title
+   * @param {string} message
+   * @export
+   */
+  openWithDetail(title, message) {
+    let alert = this.mdDialog_.alert();
+    alert.title(title);
+    alert.textContent(message);
+    alert.ok('Close');
+    this.mdDialog_.show(alert);
+  }
 }

src/app/frontend/deploy/deployfromfile_controller.js

@@ -12,14 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import {stateName as replicasetliststate} from 'replicasetlist/replicasetlist_state';
+
 /**
  * Controller for the deploy from file directive.
  *
  * @final
  */
 export default class DeployFromFileController {
-  /** @ngInject */
-  constructor() {
+  /**
+   * @param {!angular.$log} $log
+   * @param {!ui.router.$state} $state
+   * @param {!angular.$resource} $resource
+   * @param {!angular.$q} $q
+   * @ngInject */
+  constructor($log, $state, $resource, $q, errorDialog) {
     /**
      * It initializes the scope output parameter
      *
@@ -33,5 +40,55 @@ export default class DeployFromFileController {
      * @export {{name:string, content:string}}
      */
     this.file = {name: '', content: ''};
+
+    /** @private {!angular.$q} */
+    this.q_ = $q;
+
+    /** @private {!angular.$resource} */
+    this.resource_ = $resource;
+
+    /** @private {!angular.$log} */
+    this.log_ = $log;
+
+    /** @private {!ui.router.$state} */
+    this.state_ = $state;
+
+    /**
+     * TODO (cheld) Set correct type after fixing issue #159
+     * @private {!Object}
+     */
+    this.errorDialog_ = errorDialog;
+  }
+
+  /**
+   * Deploys the application based on the state of the controller.
+   *
+   * @export
+   * @return {angular.$q.Promise}
+   */
+  deploy() {
+    /** @type {!backendApi.AppDeploymentFromFileSpec} */
+    let deploymentSpec = {
+      name: this.file.name,
+      content: this.file.content,
+    };
+
+    let defer = this.q_.defer();
+
+    /** @type {!angular.Resource<!backendApi.AppDeploymentFromFileSpec>} */
+    let resource = this.resource_('/api/appdeploymentfromfile');
+    resource.save(
+      deploymentSpec,
+        (savedConfig) => {
+          defer.resolve(savedConfig);  // Progress ends
+          this.log_.info('Successfully deployed application: ', savedConfig);
+          this.state_.go(replicasetliststate);
+        },
+        (err) => {
+          defer.reject(err);  // Progress ends
+          this.log_.error('Error deploying application:', err);
+          this.errorDialog_.openWithDetail('File upload failed' ,err.data);
+        });
+    return defer.promise;
   }
 }