Merge branch 'master' into architecture-design-doc

Author: bryk

.travis.yml

@@ -19,6 +19,10 @@
 
 # Explicitly set the environment to be container-based. This makes the builds faster.
 sudo: false
+# Cache downloaded Node.JS modules in the node_modules directory for faster builds.
+cache:
+  directories:
+    - node_modules
 # Use Node.js as primary language because Gulp is the build system used in the project.
 language: node_js
 before_script:

README.md

@@ -1,14 +1,17 @@
-# Kubernetes Console
-Kubernetes Console is a general purpose, web-based UI for Kubernetes clusters. It allows to manage applications running in the cluster, troubleshoot them, as well as, manage the cluster itself.
+# Kubernetes Dashboard
+Kubernetes Dashboard is a general purpose, web-based UI for Kubernetes clusters. It allows to
+manage applications running in the cluster, troubleshoot them, as well as, manage the cluster
+itself.
 
-The console is currently under active development and is not ready for production use (yet!).
+The dashboard is currently under active development and is not ready for production use (yet!).
 
-# Contribute:
+# Contribute
 
-Wish to contribute !! Great start [here](https://github.com/kubernetes/console/blob/master/CONTRIBUTING.md).
+Wish to contribute !! Great start [here](CONTRIBUTING.md).
 
-# License:
+# License
 
-The work done has been licensed under Apache License 2.0.The license file can be found [here](https://github.com/kubernetes/console/blob/master/LICENSE). You can find out more about license,at
+The work done has been licensed under Apache License 2.0. The license file can be found
+[here](LICENSE). You can find out more about the license at:
 
 http://www.apache.org/licenses/LICENSE-2.0

bower.json

@@ -2,7 +2,7 @@
   "//": "Specification of this file can be found at:",
   "//": "https://github.com/bower/spec/blob/master/json.md",
 
-  "name": "kubernetes-console",
+  "name": "kubernetes-dashboard",
   "version": "0.0.1",
   "dependencies": {
     "angular": "~1.4.2",

build/backend.js

@@ -69,27 +69,27 @@ function spawnGoProcess(args, doneFn, opt_env) {
 
 
 /**
- * Compiles backend application in development mode and places 'console' binary in the serve
+ * Compiles backend application in development mode and places the binary in the serve
  * directory.
  */
 gulp.task('backend', ['backend-dependencies'], function(doneFn) {
   spawnGoProcess([
     'build',
-    '-o', path.join(conf.paths.serve, 'console'),
-    path.join(conf.paths.backendSrc, 'console.go'),
+    '-o', path.join(conf.paths.serve, 'dashboard'),
+    path.join(conf.paths.backendSrc, 'dashboard.go'),
   ], doneFn);
 });
 
 
 /**
- * Compiles backend application in production mode and places 'console' binary in the dist
+ * Compiles backend application in production mode and places the binary in the dist
  * directory.
  *
  * The production binary difference from development binary is only that it contains all
  * dependencies inside it and is targeted for Linux.
  */
 gulp.task('backend:prod', ['backend-dependencies'], function(doneFn) {
-  let outputBinaryPath = path.join(conf.paths.dist, 'console');
+  let outputBinaryPath = path.join(conf.paths.dist, 'dashboard');
   // Delete output binary first. This is required because prod build does not override it.
   del(outputBinaryPath)
       .then(function() {
@@ -98,7 +98,7 @@ gulp.task('backend:prod', ['backend-dependencies'], function(doneFn) {
           '-a',
           '-installsuffix', 'cgo',
           '-o', outputBinaryPath,
-          path.join(conf.paths.backendSrc, 'console.go'),
+          path.join(conf.paths.backendSrc, 'dashboard.go'),
         ], doneFn, {
           // Disable cgo package. Required to run on scratch docker image.
           CGO_ENABLED: '0',

build/conf.js

@@ -35,7 +35,7 @@ export default {
     /**
      * The name of the Docker image with the application.
      */ 
-    imageName: 'kubernetes/console',
+    imageName: 'kubernetes/dashboard',
   },
 
   /**
@@ -45,7 +45,7 @@ export default {
     /**
      * The name of the root Angular module, i.e., the module that bootstraps the application.
      */
-    rootModuleName: 'kubernetesConsole',
+    rootModuleName: 'kubernetesDashboard',
   },
 
   /**

build/script.js

@@ -20,59 +20,32 @@ import gulpAngularTemplatecache from 'gulp-angular-templatecache';
 import gulpClosureCompiler from 'gulp-closure-compiler';
 import gulpEslint from 'gulp-eslint';
 import gulpMinifyHtml from 'gulp-minify-html';
-import lodash from 'lodash';
 import path from 'path';
+import webpackStream from 'webpack-stream';
 
 import conf from './conf';
 
 
-/**
- * Base Closure Compiler config to be extended in, e.g., prod or dev config.
- */
-const closureCompilerBaseConfig = {
-  // "foo_flag: null" means that a flag is enabled.
-  compilerFlags: {
-    angular_pass: null,
-    closure_entry_point: 'module$src$app$frontend$index_module',
-    export_local_property_definitions: null,
-    generate_exports: null,
-    js_module_root: conf.paths.frontendSrc,
-    language_in: 'ECMASCRIPT6_STRICT',
-    language_out: 'ECMASCRIPT3',
-    manage_closure_dependencies: true,
-  },
-  compilerPath: path.join(conf.paths.nodeModules, 'google-closure-compiler/compiler.jar'),
-  // This makes the compiler faster. Requires Java 7+.
-  tieredCompilation: true,
-};
-
-
 /**
  * Compiles frontend JavaScript files into development bundle located in {conf.paths.serve}
  * directory. This has to be done because currently browsers do not handle ES6 syntax and
  * modules correctly.
  *
- * Note that 'create-serve-folders' task is required because closure compiler source maps function
- * requires the folders to exist upfront.
+ * Only dependencies of root application module are included in the bundle.
  */
 gulp.task('scripts', ['create-serve-folders'], function() {
-  let bundleBaseName = 'app-dev';
-  let closureCompilerConfig = lodash.merge({
-      fileName: `${bundleBaseName}.js`,
-      compilerFlags: {
-        // WHITESPACE_ONLY is not an option because it leaves ES6 modules unmodified. ES6 modules
-        // arent handled by browsers correctly (yet).
-        compilation_level: 'SIMPLE_OPTIMIZATIONS',
-        create_source_map: path.join(conf.paths.serve, `${bundleBaseName}.js.map`),
-        // Make source map URLs relative to frontend source directory.
-        source_map_location_mapping: path.relative(conf.paths.base, conf.paths.frontendSrc) + '|',
-        // Include source map in the output bundle.
-        output_wrapper: '%output%\n//# sourceMappingURL=' + `${bundleBaseName}.js.map`,
-      },
-    }, closureCompilerBaseConfig);
-
-  return gulp.src(path.join(conf.paths.frontendSrc, '**/*.js'))
-    .pipe(gulpClosureCompiler(closureCompilerConfig))
+  let webpackOptions = {
+    devtool: 'inline-source-map',
+    module: {
+      // ES6 modules have to be preprocessed with Babel loader to work in browsers.
+      loaders: [{test: /\.js$/, exclude: /node_modules/, loaders: ['babel-loader']}],
+    },
+    output: {filename: 'app-dev.js'},
+    quiet: true,
+  };
+
+  return gulp.src(path.join(conf.paths.frontendSrc, 'index.module.js'))
+    .pipe(webpackStream(webpackOptions))
     .pipe(gulp.dest(conf.paths.serve))
 });
 
@@ -82,33 +55,47 @@ gulp.task('scripts', ['create-serve-folders'], function() {
  * directory.
  */
  gulp.task('scripts:prod', ['angular-templates'], function() {
-  let closureCompilerConfig = lodash.merge({
-      fileName: 'app.js',
-      compilerFlags: {
-        compilation_level: 'ADVANCED_OPTIMIZATIONS',
-        externs: [
-          path.join(conf.paths.nodeModules,
-              'google-closure-compiler/contrib/externs/angular-1.4.js'),
-          path.join(conf.paths.nodeModules,
-              'google-closure-compiler/contrib/externs/angular-1.4-http-promise_templated.js'),
-          path.join(conf.paths.nodeModules,
-              'google-closure-compiler/contrib/externs/angular-1.4-q_templated.js'),
-          path.join(conf.paths.nodeModules,
-              'google-closure-compiler/contrib/externs/angular_ui_router.js'),
-          path.join(conf.paths.externs, '**/*.js'),
-        ],
-        // Enable all compiler checks by default and make them errors.
-        jscomp_error: '*',
-        // Disable checks that are not applicable to the project.
-        jscomp_off: [
-          // This check does not work correctly with ES6.
-          'inferredConstCheck',
-          // Let ESLint handle all lint checks.
-          'lintChecks',
-        ],
-        use_types_for_optimization: null,
-      },
-    }, closureCompilerBaseConfig);
+  let closureCompilerConfig = {
+    fileName: 'app.js',
+    // "foo_flag: null" means that a flag is enabled.
+    compilerFlags: {
+      angular_pass: null,
+      closure_entry_point: 'module$src$app$frontend$index_module',
+      compilation_level: 'ADVANCED_OPTIMIZATIONS',
+      export_local_property_definitions: null,
+      externs: [
+        path.join(conf.paths.nodeModules,
+            'google-closure-compiler/contrib/externs/angular-1.4.js'),
+        path.join(conf.paths.nodeModules,
+            'google-closure-compiler/contrib/externs/angular-1.4-http-promise_templated.js'),
+        path.join(conf.paths.nodeModules,
+            'google-closure-compiler/contrib/externs/angular-1.4-q_templated.js'),
+        path.join(conf.paths.nodeModules,
+            'google-closure-compiler/contrib/externs/angular-material.js'),
+        path.join(conf.paths.nodeModules,
+            'google-closure-compiler/contrib/externs/angular_ui_router.js'),
+        path.join(conf.paths.externs, '**/*.js'),
+      ],
+      generate_exports: null,
+      js_module_root: conf.paths.frontendSrc,
+      // Enable all compiler checks by default and make them errors.
+      jscomp_error: '*',
+      // Disable checks that are not applicable to the project.
+      jscomp_off: [
+        // This check does not work correctly with ES6.
+        'inferredConstCheck',
+        // Let ESLint handle all lint checks.
+        'lintChecks',
+      ],
+      language_in: 'ECMASCRIPT6_STRICT',
+      language_out: 'ECMASCRIPT3',
+      manage_closure_dependencies: true,
+      use_types_for_optimization: null,
+    },
+    compilerPath: path.join(conf.paths.nodeModules, 'google-closure-compiler/compiler.jar'),
+    // This makes the compiler faster. Requires Java 7+.
+    tieredCompilation: true,
+  };
 
   return gulp.src([
       // Application source files.

package.json

@@ -1,12 +1,12 @@
 {
   "//": "Specification of this file can be found at: https://docs.npmjs.com/files/package.json",
   "//": "When a dependency is not needed it should be removed from the list.",
-
-  "name": "kubernetes-console",
+  "name": "kubernetes-dashboard",
   "version": "0.0.1",
   "devDependencies": {
     "babel": "~5.8.23",
     "babel-core": "~5.8.25",
+    "babel-loader": "~5.3.2",
     "babelify": "~6.3.0",
     "browserify": "~11.2.0",
     "browser-sync": "~2.9.2",
@@ -49,6 +49,7 @@
     "karma-sourcemap-loader": "~0.3.6",
     "lodash": "~3.10.1",
     "uglify-save-license": "~0.4.1",
+    "webpack-stream": "~2.1.1",
     "wiredep": "~2.2.2",
     "wrench": "~1.5.8"
   },