new modules and imports

app/admin-tab/accounts/controller.js

@@ -1,3 +1,3 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend();
+export default Controller.extend();

app/admin-tab/accounts/route.js

@@ -1,3 +1,3 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend();
+export default Route.extend();

app/admin-tab/audit-logs/controller.js

@@ -1,11 +1,12 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  application       : Ember.inject.controller(),
+export default Controller.extend({
+  application       : controller(),
   queryParams       : ['sortBy', 'descending', 'eventType', 'resourceType', 'resourceId', 'clientIp', 'authType'],
   resourceTypeAndId : null,
-  modalService:       Ember.inject.service('modal'),
+  modalService:       service('modal'),
 
   headers: [
     {

app/admin-tab/audit-logs/route.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import Route from '@ember/routing/route';
 import PolledModel from 'ui/mixins/polled-model';
 import { urlOptions } from 'ember-api-store/utils/url-options';
 
-export default Ember.Route.extend(PolledModel, {
+export default Route.extend(PolledModel, {
   pollInterval: 10000,
 
   queryParams: {
@@ -50,7 +51,7 @@ export default Ember.Route.extend(PolledModel, {
     return us.rawRequest({url}).then((res) => {
       let records = us._typeify(res.body, {updateStore: false});
 
-      return Ember.Object.create({
+      return EmberObject.create({
         auditLog: records,
         resourceTypes: resourceTypes
       });

app/admin-tab/catalog/route.js

@@ -1,8 +1,10 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   beforeModel() {
     return this.get('settings').load([
@@ -14,7 +16,7 @@ export default Ember.Route.extend({
     let settings = this.get('settings');
 
     return this.get('userStore').find('setting').then(() => {
-      return Ember.Object.create({
+      return EmberObject.create({
         catalog:   settings.get(C.SETTING.CATALOG_URL),
       });
     });

app/admin-tab/controller.js

@@ -1,3 +1,3 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend();
+export default Controller.extend();

app/admin-tab/ha/controller.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  settings: Ember.inject.service(),
+export default Controller.extend({
+  settings: service(),
   sortBy:   'address',
 
   headers: [

app/admin-tab/ha/route.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { cancel, later } from '@ember/runloop';
+import Route from '@ember/routing/route';
 
 const INTERVAL = 2000;
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     return this.get('userStore').find('hamembership');
   },
@@ -12,14 +13,14 @@ export default Ember.Route.extend({
   },
 
   deactivate() {
-    Ember.run.cancel(this.get('timer'));
+    cancel(this.get('timer'));
     this.set('timer', null); // This prevents scheduleTimer from rescheduling if deactivate happened at just the wrong time.
   },
 
   timer: null,
   scheduleTimer: function() {
-    Ember.run.cancel(this.get('timer'));
-    this.set('timer', Ember.run.later(() => {
+    cancel(this.get('timer'));
+    this.set('timer', later(() => {
       this.get('userStore').find('hamembership', null, {forceReload: true}).then((response) => {
         this.controller.set('model', response);
         if ( this.get('timer') ) {

app/admin-tab/index/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   redirect: function() {
     this.transitionTo('admin-tab.accounts');
   }

app/admin-tab/process/controller.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/admin-tab/process/route.js

@@ -1,6 +1,7 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   params: null,
   model: function(params /*, transition*/ ) {
     this.set('params', params);
@@ -8,7 +9,7 @@ export default Ember.Route.extend({
       return processInstance.followLink('processExecutions').then((processExecutions) => {
         var sorted = processExecutions.get('content').reverse();
         processExecutions.set('content', sorted);
-        return Ember.Object.create({
+        return EmberObject.create({
           processInstance: processInstance,
           processExecutions: processExecutions
         });

app/admin-tab/processes/index/controller.js

@@ -1,6 +1,7 @@
-import Ember from 'ember';
+import EmberObject, { computed } from '@ember/object';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   sortBy: 'name',
   headers: [
     {
@@ -26,7 +27,7 @@ export default Ember.Controller.extend({
     },
   ],
 
-  total: Ember.computed('model.summary.[]', function() {
+  total: computed('model.summary.[]', function() {
     let running = 0;
     let ready = 0;
     let delay = 0;
@@ -37,7 +38,7 @@ export default Ember.Controller.extend({
       delay += summary.get('delay')||0;
     });
 
-    return Ember.Object.create({
+    return EmberObject.create({
       processName: 'Total',
       running: running,
       ready: ready,

app/admin-tab/processes/index/route.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 import PolledModel from 'ui/mixins/polled-model';
 
-export default Ember.Route.extend(PolledModel,{
+export default Route.extend(PolledModel,{
   model() {
     let us = this.get('userStore');
-    return Ember.RSVP.hash({
+    return hash({
       summary: us.find('processsummary', null, {forceReload: true}),
     });
   },

app/admin-tab/processes/list/controller.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  prefs: Ember.inject.service(),
+export default Controller.extend({
+  prefs: service(),
 
   queryParams: ['which','sortBy','descending'],
   which: 'running',

app/admin-tab/processes/list/route.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import Route from '@ember/routing/route';
 import PolledModel from 'ui/mixins/polled-model';
 
-export default Ember.Route.extend(PolledModel, {
+export default Route.extend(PolledModel, {
   queryParams: {
     which: {
       refreshModel: true
@@ -35,7 +36,7 @@ export default Ember.Route.extend(PolledModel, {
       filter: filters,
       forceReload: true
     }).then((response) => {
-      return Ember.Object.create({
+      return EmberObject.create({
         processInstances: response,
       });
     });

app/admin-tab/processes/pools/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   sortBy: 'name',
   headers: [
     {

app/admin-tab/processes/pools/route.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 import PolledModel from 'ui/mixins/polled-model';
 
-export default Ember.Route.extend(PolledModel, {
+export default Route.extend(PolledModel, {
   model() {
     let us = this.get('userStore');
-    return Ember.RSVP.hash({
+    return hash({
       pools: us.find('processpool', null, {forceReload: true}),
     });
   },

app/admin-tab/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   activate() {
     this._super();
     this.controllerFor('authenticated').setPageScope('admin');

app/admin-tab/settings/advanced/controller.js

@@ -1,5 +1,6 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  settings: Ember.inject.service(),
+export default Controller.extend({
+  settings: service(),
 });

app/admin-tab/settings/advanced/route.js

@@ -1,9 +1,11 @@
 
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   beforeModel() {
     return this.get('settings').load([
@@ -15,7 +17,7 @@ export default Ember.Route.extend({
     let settings = this.get('settings');
 
     return this.get('userStore').find('setting').then(() => {
-      return Ember.Object.create({
+      return EmberObject.create({
         telemetry: settings.get(C.SETTING.TELEMETRY),
       });
     });

app/admin-tab/settings/auth/activedirectory/controller.js

@@ -1,13 +1,15 @@
-import Ember from 'ember';
+import { later } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import Errors from 'ui/utils/errors';
 import C from 'ui/utils/constants';
 
 var PLAIN_PORT = 389;
 var TLS_PORT = 636;
 
-export default Ember.Controller.extend({
-  access: Ember.inject.service(),
-  settings: Ember.inject.service(),
+export default Controller.extend({
+  access: service(),
+  settings: service(),
 
   confirmDisable: false,
   errors: null,
@@ -116,7 +118,7 @@ export default Ember.Controller.extend({
 
     promptDisable: function() {
       this.set('confirmDisable', true);
-      Ember.run.later(this, function() {
+      later(this, function() {
         this.set('confirmDisable', false);
       }, 10000);
     },

app/admin-tab/settings/auth/activedirectory/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   resourceType: 'ldapconfig',
 
   model: function() {

app/admin-tab/settings/auth/azuread/controller.js

@@ -1,9 +1,11 @@
-import Ember from 'ember';
+import { later } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  access            : Ember.inject.service(),
-  settings          : Ember.inject.service(),
-  intl              : Ember.inject.service(),
+export default Controller.extend({
+  access            : service(),
+  settings          : service(),
+  intl              : service(),
 
   confirmDisable    : false,
   errors            : null,
@@ -76,7 +78,7 @@ export default Ember.Controller.extend({
 
     promptDisable: function() {
       this.set('confirmDisable', true);
-      Ember.run.later(this, function() {
+      later(this, function() {
         this.set('confirmDisable', false);
       }, 10000);
     },

app/admin-tab/settings/auth/azuread/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     return this.get('userStore').find('azureadconfig', null, {forceReload: true}).then((collection) => {
       let obj = collection.get('firstObject');

app/admin-tab/settings/auth/controller.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  access: Ember.inject.service(),
+export default Controller.extend({
+  access: service(),
 
   lastRoute: 'global-admin.settings.auth.github',
   drivers: function() {

app/admin-tab/settings/auth/github/controller.js

@@ -1,13 +1,17 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { once, later } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 import { denormalizeName } from 'ui/services/settings';
 
-export default Ember.Controller.extend({
-  github                  : Ember.inject.service(),
-  endpoint                : Ember.inject.service(),
-  access                  : Ember.inject.service(),
-  settings                : Ember.inject.service(),
-  githubConfig            : Ember.computed.alias('model.githubConfig'),
+export default Controller.extend({
+  github                  : service(),
+  endpoint                : service(),
+  access                  : service(),
+  settings                : service(),
+  githubConfig            : alias('model.githubConfig'),
 
   confirmDisable          : false,
   errors                  : null,
@@ -18,7 +22,7 @@ export default Ember.Controller.extend({
   haveToken               : false,
 
   organizations           : null,
-  scheme                  : Ember.computed.alias('githubConfig.scheme'),
+  scheme                  : alias('githubConfig.scheme'),
   isEnterprise: false,
   secure : true,
 
@@ -80,7 +84,7 @@ export default Ember.Controller.extend({
   },
 
   enterpriseDidChange: function() {
-    Ember.run.once(this,'updateEnterprise');
+    once(this,'updateEnterprise');
   }.observes('isEnterprise','githubConfig.hostname','secure'),
 
   protocolChoices: [
@@ -93,7 +97,7 @@ export default Ember.Controller.extend({
       this.send('clearError');
       this.set('saving', true);
 
-      let githubConfig = Ember.Object.create(this.get('githubConfig'));
+      let githubConfig = EmberObject.create(this.get('githubConfig'));
       githubConfig.setProperties({
         'clientId'          : (githubConfig.get('clientId')||'').trim(),
         'clientSecret'      : (githubConfig.get('clientSecret')||'').trim(),
@@ -219,7 +223,7 @@ export default Ember.Controller.extend({
 
     promptDisable: function() {
       this.set('confirmDisable', true);
-      Ember.run.later(this, function() {
+      later(this, function() {
         this.set('confirmDisable', false);
       }, 10000);
     },

app/admin-tab/settings/auth/github/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     return this.get('authStore').find('config', null, {forceReload: true}).then(function(collection) {
       return collection;

app/admin-tab/settings/auth/index/route.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  access: Ember.inject.service(),
+export default Route.extend({
+  access: service(),
 
   model: function() {
     var route = (this.get('access.provider')||'').toLowerCase().replace(/config$/i,'');

app/admin-tab/settings/auth/localauth/controller.js

@@ -1,10 +1,13 @@
-import Ember from 'ember';
+import { later } from '@ember/runloop';
+import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  access            : Ember.inject.service(),
-  settings          : Ember.inject.service(),
-  intl              : Ember.inject.service(),
+export default Controller.extend({
+  access            : service(),
+  settings          : service(),
+  intl              : service(),
 
   confirmDisable    : false,
   errors            : null,
@@ -21,7 +24,7 @@ export default Ember.Controller.extend({
     return !ok;
   }.property('adminPublicValue','adminSecretValue','adminSecretValue2'),
 
-  validateDescription: Ember.computed(function() {
+  validateDescription: computed(function() {
     return this.get('settings').get(C.SETTING.AUTH_LOCAL_VALIDATE_DESC) || null;
   }),
 
@@ -102,7 +105,7 @@ export default Ember.Controller.extend({
 
     promptDisable: function() {
       this.set('confirmDisable', true);
-      Ember.run.later(this, function() {
+      later(this, function() {
         this.set('confirmDisable', false);
       }, 10000);
     },

app/admin-tab/settings/auth/localauth/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     return this.get('userStore').find('localauthconfig', null, {forceReload: true}).then((collection) => {
       return collection.get('firstObject');

app/admin-tab/settings/auth/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   beforeModel: function() {
     return this.get('authStore').rawRequest({url: '/v1-auth/schemas', dataType: 'json'}).then((resp) => {
       return this.get('authStore')._bulkAdd('schema', resp.body.data);

app/admin-tab/settings/auth/shibboleth/controller.js

@@ -1,14 +1,18 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { later } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import Util from 'ui/utils/util';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  access         : Ember.inject.service(),
-  settings       : Ember.inject.service(),
-  session        : Ember.inject.service(),
-  shibbolethAuth : Ember.inject.service(),
+export default Controller.extend({
+  access         : service(),
+  settings       : service(),
+  session        : service(),
+  shibbolethAuth : service(),
   providerName   : 'authPage.shibboleth.providerName.shibboleth',
-  config         : Ember.computed.alias('model.shibbolethConfig'),
+  config         : alias('model.shibbolethConfig'),
   errors         : null,
   confirmDisable : false,
   redirectUrl    : null,
@@ -45,7 +49,7 @@ export default Ember.Controller.extend({
     },
     promptDisable: function() {
       this.set('confirmDisable', true);
-      Ember.run.later(this, function() {
+      later(this, function() {
         this.set('confirmDisable', false);
       }, 10000);
     },
@@ -104,7 +108,7 @@ export default Ember.Controller.extend({
 
   },
   validate: function() {
-    let model = Ember.Object.create(this.get('config'));
+    let model = EmberObject.create(this.get('config'));
     let errors = [];
 
     if ((model.get('displayNameField')||'').trim().length === 0 ) {

app/admin-tab/settings/auth/shibboleth/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     return this.get('authStore').find('config', null, {forceReload: true}).then(function(collection) {
       return collection;

app/admin-tab/settings/controller.js

@@ -1,7 +1,9 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  settings    : Ember.inject.service(),
-  projectId   : Ember.computed.alias(`tab-session.${C.TABSESSION.PROJECT}`),
+export default Controller.extend({
+  settings    : service(),
+  projectId   : alias(`tab-session.${C.TABSESSION.PROJECT}`),
 });

app/admin-tab/settings/index/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   redirect() {
     this.transitionTo('global-admin.settings.auth');
   },

app/admin-tab/settings/machine/controller.js

@@ -1,12 +1,14 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import C from 'ui/utils/constants';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 
-export default Ember.Controller.extend({
-  application : Ember.inject.controller(),
-  growl       : Ember.inject.service(),
-  settings    : Ember.inject.service(),
-  modalService: Ember.inject.service('modal'),
+export default Controller.extend({
+  application : controller(),
+  growl       : service(),
+  settings    : service(),
+  modalService: service('modal'),
 
   actions: {
     activate(driver) {
@@ -70,7 +72,7 @@ export default Ember.Controller.extend({
     };
   },
 
-  arranged: Ember.computed('model.drivers.@each.{state,id,version,externalId}', 'model.catalogDrivers.@each.{id,catalogId,name}', function() {
+  arranged: computed('model.drivers.@each.{state,id,version,externalId}', 'model.catalogDrivers.@each.{id,catalogId,name}', function() {
     // possibly add some search here
     let cDrivers   = this.get('model.catalogDrivers.catalog');
     let drivers    = this.get('model.drivers.content');

app/admin-tab/settings/machine/route.js

@@ -1,10 +1,12 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  catalog: Ember.inject.service(),
+export default Route.extend({
+  catalog: service(),
 
   model() {
-    return Ember.RSVP.hash({
+    return hash({
       drivers: this.get('userStore').findAll('machinedriver', null, {forceReload: true}),
       catalogDrivers: this.get('catalog').fetchTemplates({templateBase: 'machine', category: 'all', allowFailure: true}),
     }).then((hash) => {

app/admin-tab/settings/registration/route.js

@@ -1,8 +1,10 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   beforeModel() {
     return this.get('settings').load([
@@ -14,7 +16,7 @@ export default Ember.Route.extend({
     let settings = this.get('settings');
 
     return this.get('userStore').find('setting').then(() => {
-      return Ember.Object.create({
+      return EmberObject.create({
         host:      settings.get(C.SETTING.API_HOST),
       });
     });

app/admin-tab/settings/route.js

@@ -1,8 +1,10 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   beforeModel() {
     return this.get('settings').load([
@@ -16,7 +18,7 @@ export default Ember.Route.extend({
     let settings = this.get('settings');
 
     return this.get('userStore').find('setting').then(() => {
-      return Ember.Object.create({
+      return EmberObject.create({
         host:      settings.get(C.SETTING.API_HOST),
         catalog:   settings.get(C.SETTING.CATALOG_URL),
         telemetry: settings.get(C.SETTING.TELEMETRY),

app/application/controller.js

@@ -1,16 +1,18 @@
-import Ember from "ember";
+import { oneWay } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  settings: Ember.inject.service(),
+export default Controller.extend({
+  settings: service(),
 
   // GitHub auth params
   queryParams     : ['error_description','state','code','isTest', 'isPopup','redirectTo'],
 
-  resourceActions : Ember.inject.service('resource-actions'),
-  tooltipService  : Ember.inject.service('tooltip'),
+  resourceActions : service('resource-actions'),
+  tooltipService  : service('tooltip'),
 
-  tooltip         : Ember.computed.oneWay('tooltipService.tooltipOpts.type'),
-  tooltipTemplate : Ember.computed.oneWay('tooltipService.tooltipOpts.template'),
+  tooltip         : oneWay('tooltipService.tooltipOpts.type'),
+  tooltipTemplate : oneWay('tooltipService.tooltipOpts.template'),
 
   error             : null,
   error_description : null,

app/application/route.js

@@ -1,14 +1,17 @@
-import Ember from 'ember';
+import RSVP, { reject } from 'rsvp';
+import { cancel, next, scheduleOnce } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  access         : Ember.inject.service(),
-  cookies        : Ember.inject.service(),
-  github         : Ember.inject.service(),
-  language       : Ember.inject.service('user-language'),
-  modal          : Ember.inject.service(),
-  prefs          : Ember.inject.service(),
-  settings       : Ember.inject.service(),
+export default Route.extend({
+  access         : service(),
+  cookies        : service(),
+  github         : service(),
+  language       : service('user-language'),
+  modal          : service(),
+  prefs          : service(),
+  settings       : service(),
 
   previousParams : null,
   previousRoute  : null,
@@ -21,7 +24,7 @@ export default Ember.Route.extend({
     loading(transition) {
       this.incrementProperty('loadingId');
       let id = this.get('loadingId');
-      Ember.run.cancel(this.get('hideTimer'));
+      cancel(this.get('hideTimer'));
 
       //console.log('Loading', id);
       if ( !this.get('loadingShown') ) {
@@ -46,11 +49,11 @@ export default Ember.Route.extend({
         if ( this.get('loadingId') === id ) {
           if ( transition.isAborted ) {
             //console.log('Loading aborted', id, this.get('loadingId'));
-            this.set('hideTimer', Ember.run.next(hide));
+            this.set('hideTimer', next(hide));
           } else {
             //console.log('Loading finished', id, this.get('loadingId'));
             //needed to set this to run after render as there was wierdness wiht new register page
-            Ember.run.scheduleOnce('afterRender', () => {
+            scheduleOnce('afterRender', () => {
               hide();
             });
           }
@@ -188,7 +191,7 @@ export default Ember.Route.extend({
 
       transition.abort();
 
-      return Ember.RSVP.reject('isTest');
+      return reject('isTest');
 
     } else if ( params.code ) {
 
@@ -216,7 +219,7 @@ export default Ember.Route.extend({
 
         this.controllerFor('application').set('error', obj);
 
-        return Ember.RSVP.reject(obj);
+        return reject(obj);
       }
     }
 
@@ -226,7 +229,7 @@ export default Ember.Route.extend({
         setTimeout(function() {
           window.close();
         },250);
-        return new Ember.RSVP.promise();
+        return new RSVP.promise();
       } catch(e) {
         window.close();
       }

app/apps-tab/index/controller.js

@@ -1,14 +1,16 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import C from 'ui/utils/constants';
 import { tagsToArray } from 'ui/models/stack';
 
-export default Ember.Controller.extend({
-  projectController: Ember.inject.controller('authenticated.project'),
-  projects: Ember.inject.service(),
-  prefs: Ember.inject.service(),
-  intl: Ember.inject.service(),
+export default Controller.extend({
+  projectController: controller('authenticated.project'),
+  projects: service(),
+  prefs: service(),
+  intl: service(),
 
-  tags: Ember.computed.alias('projectController.tags'),
+  tags: alias('projectController.tags'),
   sortBy: 'name',
 
   expandedStacks: null,

app/apps-tab/index/route.js

@@ -1,9 +1,13 @@
-import Ember from 'ember';
+import { on } from '@ember/object/evented';
+import EmberObject from '@ember/object';
+import { allSettled } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 
-export default Ember.Route.extend({
-  catalog: Ember.inject.service(),
+export default Route.extend({
+  catalog: service(),
 
   model() {
     return this.get('store').findAll('stack').then((stacks) => {
@@ -16,15 +20,15 @@ export default Ember.Route.extend({
         deps.push(catalog.fetchTemplate(extInfo.templateId, false));
       });
 
-      return Ember.RSVP.allSettled(deps).then(() => {
-        return Ember.Object.create({
+      return allSettled(deps).then(() => {
+        return EmberObject.create({
           stacks: stacks,
         });
       });
     });
   },
 
-  setDefaultRoute: Ember.on('activate', function() {
+  setDefaultRoute: on('activate', function() {
     this.set(`session.${C.SESSION.CONTAINER_ROUTE}`,'containers');
   }),
 });

app/authenticated/clusters/cluster/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   // might be an ember bug but if we dont have an empty controller here the transtion from the cluster managemnt page
   // via launchOnCluster and useKubernetes fails because of a missing lookup.
 });

app/authenticated/clusters/cluster/edit/controller.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Controller, { inject as controller } from '@ember/controller';
 
-export default Ember.Controller.extend({
-  application:         Ember.inject.controller(),
+export default Controller.extend({
+  application:         controller(),
   actions: {
     cancel(prev) {
       this.send('goToPrevious',prev);

app/authenticated/clusters/cluster/edit/route.js

@@ -1,10 +1,12 @@
-import Ember from 'ember';
+import { allSettled } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 import { parseExternalId } from 'ui/utils/parse-externalid';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
-  catalog: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
+  catalog: service(),
 
   model() {
     let store = this.get('store');
@@ -22,7 +24,7 @@ export default Ember.Route.extend({
       }));
     }
 
-    return Ember.RSVP.allSettled(deps).then(() => {
+    return allSettled(deps).then(() => {
       return this.get('catalog').fetchTemplates({plusInfra: true}).then((resp) => {
         resp.cluster = cluster;
         return resp;

app/authenticated/clusters/cluster/host-new/controller.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 
-export default Ember.Controller.extend({
-  clusterController: Ember.inject.controller('authenticated.clusters.cluster'),
-  cluster: Ember.computed.alias('clusterController.model'),
+export default Controller.extend({
+  clusterController: controller('authenticated.clusters.cluster'),
+  cluster: alias('clusterController.model'),
 
   queryParams : ['backTo', 'driver', 'hostId'],
   backTo      : null,

app/authenticated/clusters/cluster/host-new/route.js

@@ -1,11 +1,12 @@
-import Ember from 'ember';
-const { getOwner } = Ember;
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
+import { getOwner } from '@ember/application';
 
-export default Ember.Route.extend({
-  access         : Ember.inject.service(),
-  projects       : Ember.inject.service(),
-  settings       : Ember.inject.service(),
-  host           : Ember.inject.service(),
+export default Route.extend({
+  access         : service(),
+  projects       : service(),
+  settings       : service(),
+  host           : service(),
   backTo         : null,
 
   defaultDriver: '',

app/authenticated/clusters/cluster/host-templates/index/controller.js

@@ -1,7 +1,9 @@
-import Ember from 'ember';
+import { sort } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  projects: Ember.inject.service(),
+export default Controller.extend({
+  projects: service(),
 
   queryParams: ['backTo'],
   backTo: 'hosts',
@@ -14,5 +16,5 @@ export default Ember.Controller.extend({
   },
 
   sorting: ['driver','name'],
-  arranged: Ember.computed.sort('model','sorting'),
+  arranged: sort('model','sorting'),
 });

app/authenticated/clusters/cluster/host-templates/index/route.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  projects: Ember.inject.service(),
+export default Route.extend({
+  projects: service(),
   backTo: null,
 
   model(params/*,transition*/) {

app/authenticated/clusters/cluster/host-templates/launch/controller.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/authenticated/clusters/cluster/host-templates/launch/route.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
-const { get } = Ember;
+import Route from '@ember/routing/route';
+import { get } from '@ember/object';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model(params, transistion) {
     return this.get('store').find('hosttemplate', params.template_id).then((template) => {
       return this.get('userStore').find('machinedriver', null, {forceReload: true}).then((drivers) => {

app/authenticated/clusters/cluster/hosts/controller.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
-import { headersCluster as hostHeaders } from 'ui/components/host-row/component';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
+import { headersCluster as hostHeaders } from 'shared/components/host-row/component';
 
-export default Ember.Controller.extend({
-  prefs: Ember.inject.service(),
-  projects: Ember.inject.service(),
-  projectController: Ember.inject.controller('authenticated.project'),
+export default Controller.extend({
+  prefs: service(),
+  projects: service(),
+  projectController: controller('authenticated.project'),
 
   sortBy: 'name',
   queryParams: ['sortBy'],

app/authenticated/clusters/cluster/hosts/route.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  projects: Ember.inject.service(),
+export default Route.extend({
+  projects: service(),
 
   model: function() {
     return this.get('userStore').find('host', null, {filter: {clusterId: this.get('projects.currentCluster.id')}}).then((hosts) => {

app/authenticated/clusters/cluster/import/controller.js

@@ -1,13 +1,16 @@
-import Ember from 'ember';
+import { cancel, later } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 
-export default Ember.Controller.extend({
-  projects: Ember.inject.service(),
-  settings: Ember.inject.service(),
-  clusterController: Ember.inject.controller('authenticated.clusters.cluster'),
-  cluster: Ember.computed.alias('clusterController.model'),
+export default Controller.extend({
+  projects: service(),
+  settings: service(),
+  clusterController: controller('authenticated.clusters.cluster'),
+  cluster: alias('clusterController.model'),
 
-  loading: Ember.computed.alias('cluster.isTransitioning'),
-  registrationCommand: Ember.computed.alias('cluster.registrationToken.clusterCommand'),
+  loading: alias('cluster.isTransitioning'),
+  registrationCommand: alias('cluster.registrationToken.clusterCommand'),
 
   refreshTimer: null,
   init() {
@@ -20,12 +23,12 @@ export default Ember.Controller.extend({
   },
 
   cancelRefresh() {
-    Ember.run.cancel(this.get('refreshTimer'));
+    cancel(this.get('refreshTimer'));
   },
 
   scheduleRefresh() {
     this.cancelRefresh();
-    this.set('refreshTimer', Ember.run.later(this, 'refreshCluster', 5000));
+    this.set('refreshTimer', later(this, 'refreshCluster', 5000));
   },
 
   refreshCluster() {

app/authenticated/clusters/cluster/import/route.js

@@ -1,15 +1,18 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { next } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   actions: {
     toggleGrouping() {
       let choices = ['list','grouped'];
       let cur = this.get('controller.mode');
       let neu = choices[((choices.indexOf(cur)+1) % choices.length)];
-      Ember.run.next(() => {
+      next(() => {
         this.set('controller.mode', neu);
       });
     },
@@ -18,7 +21,7 @@ export default Ember.Route.extend({
   model() {
     let settings = this.get('settings');
     return settings.load(C.SETTING.API_HOST).then(() => {
-      return Ember.Object.create({
+      return EmberObject.create({
         apiHostSet: !!settings.get(C.SETTING.API_HOST),
       });
     });

app/authenticated/clusters/cluster/index/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   redirect() {
     this.transitionTo('authenticated.clusters.cluster.hosts');
   },

app/authenticated/clusters/cluster/k8s/controller.js

@@ -1,12 +1,15 @@
-import Ember from 'ember';
+import { later } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 
-export default Ember.Controller.extend({
-  modalService: Ember.inject.service('modal'),
-  projects: Ember.inject.service(),
-  k8s: Ember.inject.service(),
+export default Controller.extend({
+  modalService: service('modal'),
+  projects: service(),
+  k8s: service(),
 
-  projectController: Ember.inject.controller('authenticated.project'),
-  tags: Ember.computed.alias('projectController.tags'),
+  projectController: controller('authenticated.project'),
+  tags: alias('projectController.tags'),
 
   actions: {
     dashboard() {
@@ -16,7 +19,7 @@ export default Ember.Controller.extend({
     kubectl(e) {
       if (e.metaKey) {
         let proj = this.get('projects.current.id');
-        Ember.run.later(() => {
+        later(() => {
           window.open(`//${window.location.host}/env/${proj}/infra/console?kubernetes=true&isPopup=true`, '_blank', "toolbars=0,width=900,height=700,left=200,top=200");
         });
       } else {

app/authenticated/clusters/cluster/k8s/route.js

@@ -1,14 +1,17 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  projects: Ember.inject.service(),
-  k8s: Ember.inject.service(),
+export default Route.extend({
+  projects: service(),
+  k8s: service(),
 
   model() {
-    return Ember.RSVP.hash({
+    return hash({
       stacks: this.get('store').find('stack'),
     }).then((hash) => {
-      return Ember.Object.create(hash);
+      return EmberObject.create(hash);
     });
   },
 });

app/authenticated/clusters/cluster/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   activate() {
     this._super();
     this.controllerFor('authenticated').setPageScope('cluster');

app/authenticated/clusters/index/controller.js

@@ -1,5 +1,6 @@
-import Ember from 'ember';
-const { getOwner } = Ember;
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
+import { getOwner } from '@ember/application';
 
 const headers = [
   {
@@ -49,15 +50,15 @@ const headers = [
   },
 ];
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['mode'],
   mode: 'grouped',
 
-  modalService: Ember.inject.service('modal'),
-  access: Ember.inject.service(),
-  projects: Ember.inject.service(),
-  settings: Ember.inject.service(),
-  application: Ember.inject.controller(),
+  modalService: service('modal'),
+  access: service(),
+  projects: service(),
+  settings: service(),
+  application: controller(),
 
   headers: headers,
   sortBy: 'name',

app/authenticated/clusters/index/route.js

@@ -1,12 +1,13 @@
-import Ember from 'ember';
+import { next } from '@ember/runloop';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   actions: {
     toggleGrouping() {
       let choices = ['list','grouped'];
       let cur = this.get('controller.mode');
       let neu = choices[((choices.indexOf(cur)+1) % choices.length)];
-      Ember.run.next(() => {
+      next(() => {
         this.set('controller.mode', neu);
       });
     },

app/authenticated/clusters/new-project/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['clusterId'],
 
   actions: {

app/authenticated/clusters/new-project/route.js

@@ -1,13 +1,16 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  access: Ember.inject.service(),
-  catalog: Ember.inject.service(),
+export default Route.extend({
+  access: service(),
+  catalog: service(),
 
   model: function() {
     var userStore = this.get('userStore');
-    return Ember.RSVP.hash({
+    return hash({
       all: userStore.findAll('project'),
       catalogTemplates: this.get('catalog').fetchTemplates({templateBase: C.EXTERNAL_ID.KIND_INFRA, category: C.EXTERNAL_ID.KIND_ALL}),
     }).then((hash) => {
@@ -30,7 +33,7 @@ export default Ember.Route.extend({
         project.set('projectMembers',[]);
       }
 
-      return Ember.Object.create({
+      return EmberObject.create({
         originalProject: null,
         project: project,
         all: hash.all,

app/authenticated/clusters/new/controller.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Controller, { inject as controller } from '@ember/controller';
 
-export default Ember.Controller.extend({
-  application:         Ember.inject.controller(),
+export default Controller.extend({
+  application:         controller(),
   actions: {
     cancel(prev) {
       this.send('goToPrevious',prev);

app/authenticated/clusters/new/route.js

@@ -1,9 +1,12 @@
-import Ember from 'ember';
+import { on } from '@ember/object/evented';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  catalog: Ember.inject.service(),
-  settings: Ember.inject.service(),
+export default Route.extend({
+  catalog: service(),
+  settings: service(),
 
   model() {
     let store = this.get('userStore');
@@ -18,13 +21,13 @@ export default Ember.Route.extend({
     let cluster = store.createRecord(def);
 
     return this.get('catalog').fetchTemplates({plusInfra: true}).then((templates) => {
-      return Ember.Object.create({
+      return EmberObject.create({
         cluster: cluster,
         allTemplates: templates
       });
     });
   },
-  teardownForComponentState: Ember.on('deactivate', function(){
+  teardownForComponentState: on('deactivate', function(){
     this.controller.setProperties({
       catalogItem:         null,
       editCatalog:         false,

app/authenticated/clusters/project/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   model: null,
 
   actions: {

app/authenticated/clusters/project/route.js

@@ -1,10 +1,13 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { Promise as EmberPromise } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 import { xhrConcur } from 'ui/utils/platform';
 import PromiseToCb from 'ui/mixins/promise-to-cb';
 
-export default Ember.Route.extend(PromiseToCb, {
-  catalog: Ember.inject.service(),
+export default Route.extend(PromiseToCb, {
+  catalog: service(),
 
   model: function(params /* , transition*/) {
     var userStore = this.get('userStore');
@@ -18,7 +21,7 @@ export default Ember.Route.extend(PromiseToCb, {
       },
     };
 
-    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+    let promise = new EmberPromise((resolve, reject) => {
       let tasks = {
         allProjects:                        this.toCb(() => { return userStore.findAll('project'); }),
         project:            ['allProjects', this.toCb(() => { return userStore.find('project', params.project_id); })],
@@ -66,7 +69,7 @@ export default Ember.Route.extend(PromiseToCb, {
         });
       }
 
-      let out = Ember.Object.create({
+      let out = EmberObject.create({
         all: hash.allProjects,
         network: network,
         policyManager: hash.policyManagers.objectAt(0),

app/authenticated/clusters/route.js

@@ -1,6 +1,7 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   activate() {
     this._super();
     this.controllerFor('authenticated').setPageScope('clusters');
@@ -8,7 +9,7 @@ export default Ember.Route.extend({
 
   model() {
     var userStore = this.get('userStore');
-    return Ember.RSVP.hash({
+    return hash({
       projects: userStore.find('project', null, {url: 'projects', filter: {all: 'true'}, forceReload: true, removeMissing: true}),
       clusters: userStore.find('cluster', null, {url: 'clusters',                        forceReload: true, removeMissing: true}),
     }).then(() => {

app/authenticated/controller.js

@@ -1,17 +1,20 @@
-import Ember from 'ember';
+import { schedule } from '@ember/runloop';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  application : Ember.inject.controller(),
-  settings    : Ember.inject.service(),
-  prefs       : Ember.inject.service(),
-  projects    : Ember.inject.service(),
+export default Controller.extend({
+  application : controller(),
+  settings    : service(),
+  prefs       : service(),
+  projects    : service(),
   error       : null,
 
-  isPopup: Ember.computed.alias('application.isPopup'),
+  isPopup: alias('application.isPopup'),
 
   bootstrap: function() {
-    Ember.run.schedule('afterRender', this, () => {
+    schedule('afterRender', this, () => {
       this.get('application').setProperties({
         error: null,
         error_description: null,

app/authenticated/dummy-dev/controller.js

@@ -1,4 +1,4 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

app/authenticated/dummy-dev/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     return [ ];
   },

app/authenticated/index/route.js

@@ -1,7 +1,8 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  projects: Ember.inject.service(),
+export default Route.extend({
+  projects: service(),
 
   redirect() {
     var project = this.get('projects.current');

app/authenticated/prefs/controller.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { equal } from '@ember/object/computed';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  isCaas               : Ember.computed.equal('app.mode',C.MODE.CAAS),
+export default Controller.extend({
+  isCaas               : equal('app.mode',C.MODE.CAAS),
   newPassword: null,
 
   actions: {

app/authenticated/prefs/route.js

@@ -1,22 +1,26 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { resolve } from 'rsvp';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import { loadScript } from 'ui/utils/load-script';
 import C from 'ui/utils/constants';
 import fetch from 'ember-api-store/utils/fetch';
 
-export default Ember.Route.extend({
-  session: Ember.inject.service(),
-  accountId: Ember.computed.alias(`session.${C.SESSION.ACCOUNT_ID}`),
+export default Route.extend({
+  session: service(),
+  accountId: alias(`session.${C.SESSION.ACCOUNT_ID}`),
 
   beforeModel() {
     return loadScript('https://js.stripe.com/v2/').then(() => {
       Stripe.setPublishableKey(this.get('app.stripe.publishableKey'));
-      return Ember.RSVP.resolve();
+      return resolve();
     });
   },
 
   model(/*params, transition*/) {
 
-    var modelOut = Ember.Object.create({
+    var modelOut = EmberObject.create({
       account: null,
       stripeCards: null,
     });

app/authenticated/project/apikeys/account/controller.js

@@ -1,18 +1,20 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  access:        Ember.inject.service(),
-  'tab-session': Ember.inject.service(),
+export default Controller.extend({
+  access:        service(),
+  'tab-session': service(),
 
-  application:        Ember.inject.controller(),
-  cookies:            Ember.inject.service(),
-  projects:           Ember.inject.service(),
-  growl:              Ember.inject.service(),
-  project:            Ember.computed.alias('projects.current'),
-  endpointService:    Ember.inject.service('endpoint'),
-  modalService:       Ember.inject.service('modal'),
-  bulkActionHandler: Ember.inject.service(),
+  application:        controller(),
+  cookies:            service(),
+  projects:           service(),
+  growl:              service(),
+  project:            alias('projects.current'),
+  endpointService:    service('endpoint'),
+  modalService:       service('modal'),
+  bulkActionHandler: service(),
 
   sortBy: 'name',
   headers: [

app/authenticated/project/apikeys/account/route.js

@@ -1,10 +1,11 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
     var me = this.get(`session.${C.SESSION.ACCOUNT_ID}`);
-    return Ember.RSVP.hash({
+    return hash({
       account: this.get('userStore').findAll('apikey', null, {filter: {accountId: me}, url: 'apikeys', forceReload: true}),
     });
   },

app/authenticated/project/apikeys/environment/controller.js

@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import { computed, get } from '@ember/object';
 import AccountController from '../account/controller';
 
 export default AccountController.extend({
-  arranged: Ember.computed('model.environment.@each.{accountId,name,createdTs}','sortBy','descending', function() {
+  arranged: computed('model.environment.@each.{accountId,name,createdTs}','sortBy','descending', function() {
     var project = this.get('project.id');
-    let sort    = (Ember.get(this.get('headers').findBy('name', this.get('sortBy')), 'sort')||[]);
+    let sort    = (get(this.get('headers').findBy('name', this.get('sortBy')), 'sort')||[]);
 
     let out = this.get('model.environment').filter((row) => {
       return row.get('accountId') === project;

app/authenticated/project/apikeys/environment/route.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model: function() {
-    return Ember.RSVP.hash({
+    return hash({
       environment: this.get('store').findAll('apikey', null, {forceReload: true}),
     });
   },

app/authenticated/project/apikeys/index/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   redirect: function() {
     this.transitionTo('authenticated.project.apikeys.account');
   }

app/authenticated/project/controller.js

@@ -1,4 +1,6 @@
-import Ember from 'ember';
+import { scheduleOnce } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 import { tagsToArray } from 'ui/models/stack';
 
@@ -6,9 +8,9 @@ import { tagsToArray } from 'ui/models/stack';
 //const SERVICE = 'service';
 const STACK = 'stack';
 
-export default Ember.Controller.extend({
-  prefs: Ember.inject.service(),
-  projects: Ember.inject.service(),
+export default Controller.extend({
+  prefs: service(),
+  projects: service(),
 
   tags: '',
   group: STACK,
@@ -24,7 +26,7 @@ export default Ember.Controller.extend({
     this.set('hosts', this.get('store').all('host'));
     this.set('expandedInstances',[]);
 
-    Ember.run.scheduleOnce('afterRender', () => {
+    scheduleOnce('afterRender', () => {
       let key = `prefs.${C.PREFS.CONTAINER_VIEW}`;
       const group = this.get(key) || this.get('group');
       this.transitionToRoute({queryParams: {group}});

app/authenticated/project/help/controller.js

@@ -1,9 +1,12 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import C from 'ui/utils/constants';
 
-export default Ember.Controller.extend({
-  settings: Ember.inject.service(),
-  projects: Ember.inject.service(),
+export default Controller.extend({
+  settings: service(),
+  projects: service(),
 
   modelError: false,
   modelResolved: false,
@@ -11,9 +14,9 @@ export default Ember.Controller.extend({
   forumsLink: C.EXT_REFERENCES.FORUM,
   companyLink: C.EXT_REFERENCES.COMPANY,
   githubLink: C.EXT_REFERENCES.GITHUB,
-  docsLink: Ember.computed.alias('settings.docsBase'),
+  docsLink: alias('settings.docsBase'),
 
-  latestAnnouncement: Ember.computed('model.announcements', function() {
+  latestAnnouncement: computed('model.announcements', function() {
     if (this.get('model.announcements.topics')) {
       let sorted = this.get('model.announcements.topics').sortBy('id');
       var announcement = sorted[sorted.length-1];

app/authenticated/project/help/route.js

@@ -1,10 +1,12 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import $ from 'jquery';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
+export default Route.extend({
   actions: {
     didTransition: function() {
-      Ember.$.getJSON(`${C.EXT_REFERENCES.FORUM}/categories.json`).then((response) => {
+      $.getJSON(`${C.EXT_REFERENCES.FORUM}/categories.json`).then((response) => {
         let modelOut = {
           resolved: true,
         };
@@ -15,26 +17,26 @@ export default Ember.Route.extend({
           switch (item.name) {
             case 'Announcements':
               modelOut.announcements = item;
-              promises['announcements'] = Ember.$.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
+              promises['announcements'] = $.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
               break;
             case 'General':
               modelOut.general = item;
-              promises['general'] = Ember.$.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
+              promises['general'] = $.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
               break;
             case 'Rancher':
               modelOut.rancher = item;
-              promises['rancher'] = Ember.$.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
+              promises['rancher'] = $.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
               break;
             case 'RancherOS':
               modelOut.rancherOS = item;
-              promises['rancherOS'] = Ember.$.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
+              promises['rancherOS'] = $.getJSON(`${C.EXT_REFERENCES.FORUM}/c/${item.id}/l/latest.json`);
               break;
             default:
               break;
           }
         });
 
-        Ember.RSVP.hash(promises).then((hash) => {
+        hash(promises).then((hash) => {
           Object.keys(hash).forEach((key) => {
             let topics = hash[key].topic_list.topics.filterBy('pinned',false);
             topics.length = 5;

app/authenticated/project/hooks/edit-receiver/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     cancel() {
       this.send('goToPrevious');

app/authenticated/project/hooks/edit-receiver/route.js

@@ -1,11 +1,13 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  webhookStore: Ember.inject.service(),
+export default Route.extend({
+  webhookStore: service(),
 
   model(params) {
     return this.get('webhookStore').find('receiver', params.receiver_id).then((receiver) => {
-      return Ember.Object.create({
+      return EmberObject.create({
         receiver: receiver,
       });
     });

app/authenticated/project/hooks/index/controller.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
-  settings: Ember.inject.service(),
-  projects: Ember.inject.service(),
+export default Controller.extend({
+  settings: service(),
+  projects: service(),
 
   sortBy:'name',
 

app/authenticated/project/hooks/new-receiver/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['receiverId'],
   receiverId: null,
 

app/authenticated/project/hooks/new-receiver/route.js

@@ -1,8 +1,11 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
+import { resolve } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  webhookStore: Ember.inject.service(),
-  store: Ember.inject.service(),
+export default Route.extend({
+  webhookStore: service(),
+  store: service(),
 
   beforeModel() {
     return this.get('store').findAll('hostTemplate').then((templates) => {
@@ -16,14 +19,14 @@ export default Ember.Route.extend({
     if ( params.receiverId ) {
       promise = store.find('receiver', params.receiverId);
     } else {
-      promise = Ember.RSVP.resolve(store.createRecord({
+      promise = resolve(store.createRecord({
         type: 'receiver',
         driver: 'scaleService',
       }));
     }
 
     return promise.then((receiver) => {
-      return Ember.Object.create({
+      return EmberObject.create({
         receiver: receiver.cloneForNew(),
       });
     });

app/authenticated/project/hooks/route.js

@@ -1,7 +1,9 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  webhookStore: Ember.inject.service(),
+export default Route.extend({
+  webhookStore: service(),
 
   model: function() {
     return this.get('webhookStore').findAll('schema', {url: 'schemas'}).then((schemas) => {
@@ -11,7 +13,7 @@ export default Ember.Route.extend({
       schemas.findBy('id','scalehost').resourceFields.hostSelector.required = true;
       schemas.findBy('id','serviceupgrade').resourceFields.serviceSelector.required = true;
 
-      return Ember.RSVP.hash({
+      return hash({
         receivers: this.get('webhookStore').findAll('receiver', {forceReload: true}),
       });
     });

app/authenticated/project/index/route.js

@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
 const DEFAULT_ROUTE = 'containers';
 const VALID_ROUTES = [DEFAULT_ROUTE,'scaling-groups','balancers', 'dns','volumes'];
 
-export default Ember.Route.extend({
+export default Route.extend({
   redirect() {
     let route = this.get(`session.${C.SESSION.CONTAINER_ROUTE}`);
     if ( !VALID_ROUTES.includes(route) ) {

app/authenticated/project/route.js

@@ -1,8 +1,11 @@
-import Ember from 'ember';
+import { next } from '@ember/runloop';
+import EmberObject from '@ember/object';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
-  access    : Ember.inject.service(),
-  projects  : Ember.inject.service(),
+export default Route.extend({
+  access    : service(),
+  projects  : service(),
 
   activate() {
     this._super();
@@ -25,7 +28,7 @@ export default Ember.Route.extend({
       return;
     }
 
-    return Ember.Object.create({
+    return EmberObject.create({
       project: project,
       hosts: this.get('store').all('host'),
     });
@@ -47,7 +50,7 @@ export default Ember.Route.extend({
       let choices = ['none','service','stack'];
       let cur = this.get('controller.group');
       let neu = choices[((choices.indexOf(cur)+1) % choices.length)];
-      Ember.run.next(() => {
+      next(() => {
         this.set('controller.group', neu);
       });
     },

app/authenticated/route.js

@@ -1,4 +1,13 @@
-import Ember from 'ember';
+import $ from 'jquery';
+import EmberObject from '@ember/object';
+import { later, scheduleOnce, cancel } from '@ember/runloop';
+import {
+  reject,
+  Promise as EmberPromise,
+  resolve
+} from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 import Subscribe from 'ui/mixins/subscribe';
 import { xhrConcur } from 'ui/utils/platform';
@@ -7,15 +16,15 @@ import Errors from 'ui/utils/errors';
 
 const CHECK_AUTH_TIMER = 60*10*1000;
 
-export default Ember.Route.extend(Subscribe, PromiseToCb, {
-  prefs     : Ember.inject.service(),
-  projects  : Ember.inject.service(),
-  settings  : Ember.inject.service(),
-  access    : Ember.inject.service(),
-  userTheme : Ember.inject.service('user-theme'),
-  language  : Ember.inject.service('user-language'),
-  storeReset: Ember.inject.service(),
-  modalService: Ember.inject.service('modal'),
+export default Route.extend(Subscribe, PromiseToCb, {
+  prefs     : service(),
+  projects  : service(),
+  settings  : service(),
+  access    : service(),
+  userTheme : service('user-theme'),
+  language  : service('user-language'),
+  storeReset: service(),
+  modalService: service('modal'),
 
   testTimer: null,
 
@@ -27,13 +36,13 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
         this.testAuthToken();
       } else {
         transition.send('logout', transition, false);
-        return Ember.RSVP.reject('Not logged in');
+        return reject('Not logged in');
       }
     }
   },
 
   testAuthToken: function() {
-    let timer = Ember.run.later(() => {
+    let timer = later(() => {
       this.get('access').testAuth().then((/* res */) => {
         this.testAuthToken();
       }, (/* err */) => {
@@ -52,7 +61,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
 
     this.get('session').set(C.SESSION.BACK_TO, undefined);
 
-    let promise = new Ember.RSVP.Promise((resolve, reject) => {
+    let promise = new EmberPromise((resolve, reject) => {
       let tasks = {
         userSchemas:                                    this.toCb('loadUserSchemas'),
         clusters:                                       this.toCb('loadClusters'),
@@ -85,9 +94,9 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
     }, 'Load all the things');
 
     return promise.then((hash) => {
-      return Ember.Object.create(hash);
+      return EmberObject.create(hash);
     }).catch((err) => {
-      return this.loadingError(err, transition, Ember.Object.create({
+      return this.loadingError(err, transition, EmberObject.create({
         projects: [],
         project: null,
       }));
@@ -111,13 +120,13 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
       let opt = this.get(`settings.${C.SETTING.TELEMETRY}`);
       if ( this.get('access.admin') && (!opt || opt === 'prompt') )
       {
-        Ember.run.scheduleOnce('afterRender', this, function() {
+        scheduleOnce('afterRender', this, function() {
           this.get('modalService').toggleModal('modal-telemetry');
         });
       }
       else if ( form && !this.get(`prefs.${C.PREFS.FEEDBACK}`) )
       {
-        Ember.run.scheduleOnce('afterRender', this, function() {
+        scheduleOnce('afterRender', this, function() {
           this.get('modalService').toggleModal('modal-feedback');
         });
       }
@@ -127,7 +136,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
   deactivate() {
     this._super();
     this.disconnectSubscribe();
-    Ember.run.cancel(this.get('testTimer'));
+    cancel(this.get('testTimer'));
 
     // Forget all the things
     this.get('storeReset').reset();
@@ -176,7 +185,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
       this.get('userTheme').setupTheme();
 
       if (this.get(`prefs.${C.PREFS.I_HATE_SPINNERS}`)) {
-        Ember.$('BODY').addClass('i-hate-spinners');
+        $('BODY').addClass('i-hate-spinners');
       }
 
       return res;
@@ -219,7 +228,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, {
     if ( this.get('store').getById('schema','secret') ) {
       return this.get('store').find('secret');
     } else {
-      return Ember.RSVP.resolve();
+      return resolve();
     }
   },
 

app/balancers/index/controller.js

@@ -1,18 +1,22 @@
-import Ember from 'ember';
-import { searchFields as containerSearchFields } from 'ui/components/container-dots/component';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import Controller, { inject as controller } from '@ember/controller';
+import {
+  searchFields as containerSearchFields
+} from 'shared/components/container-dots/component';
 import { headers } from 'ui/containers/index/controller';
 
-export default Ember.Controller.extend({
-  projectController: Ember.inject.controller('authenticated.project'),
-  projects: Ember.inject.service(),
+export default Controller.extend({
+  projectController: controller('authenticated.project'),
+  projects: service(),
 
-  tags: Ember.computed.alias('projectController.tags'),
-  simpleMode: Ember.computed.alias('projectController.simpleMode'),
-  group: Ember.computed.alias('projectController.group'),
-  groupTableBy: Ember.computed.alias('projectController.groupTableBy'),
-  showStack: Ember.computed.alias('projectController.showStack'),
-  expandedInstances: Ember.computed.alias('projectController.expandedInstances'),
-  preSorts: Ember.computed.alias('projectController.preSorts'),
+  tags: alias('projectController.tags'),
+  simpleMode: alias('projectController.simpleMode'),
+  group: alias('projectController.group'),
+  groupTableBy: alias('projectController.groupTableBy'),
+  showStack: alias('projectController.showStack'),
+  expandedInstances: alias('projectController.expandedInstances'),
+  preSorts: alias('projectController.preSorts'),
 
   queryParams: ['sortBy'],
   sortBy: 'name',

app/balancers/index/route.js

@@ -1,15 +1,17 @@
-import Ember from 'ember';
+import { on } from '@ember/object/evented';
+import { hash } from 'rsvp';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
     var store = this.get('store');
-    return Ember.RSVP.hash({
+    return hash({
       services: store.findAll('service'),
     });
   },
 
-  setDefaultRoute: Ember.on('activate', function() {
+  setDefaultRoute: on('activate', function() {
     this.set(`session.${C.SESSION.CONTAINER_ROUTE}`,'balancers');
   }),
 });

app/balancers/run/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['stackId','serviceId','tab','upgrade','upgradeImage'],
   stackId: null,
   serviceId: null,

app/balancers/run/route.js

@@ -1,8 +1,10 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
-export default Ember.Route.extend({
-  settings: Ember.inject.service(),
+export default Route.extend({
+  settings: service(),
 
   model: function(params/*, transition*/) {
     var store = this.get('store');
@@ -17,7 +19,7 @@ export default Ember.Route.extend({
       dependencies['existingService'] = store.find('service', params.serviceId);
     }
 
-    return Ember.RSVP.hash(dependencies).then((hash) => {
+    return hash(dependencies).then((hash) => {
       let service;
 
       hash.mode = 'service';

app/catalog-tab/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['category', 'catalogId','templateBase', 'launchCluster'],
   category: 'all',
   templateBase: '',

app/catalog-tab/index/controller.js

@@ -1,11 +1,12 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
+import Controller, { inject as controller } from '@ember/controller';
 import { isAlternate } from 'ui/utils/platform';
 
-export default Ember.Controller.extend({
-  application:       Ember.inject.controller(),
-  catalogController: Ember.inject.controller('catalog-tab'),
-  category:          Ember.computed.alias('catalogController.category'),
-  catalogId:         Ember.computed.alias('catalogController.catalogId'),
+export default Controller.extend({
+  application:       controller(),
+  catalogController: controller('catalog-tab'),
+  category:          alias('catalogController.category'),
+  catalogId:         alias('catalogController.catalogId'),
   parentRoute:       'catalog-tab',
   launchRoute:       'catalog-tab.launch',
   actions: {

app/catalog-tab/index/route.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   resetController: function (controller, isExiting/*, transition*/) {
     if (isExiting)
     {

app/catalog-tab/launch/controller.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   queryParams: ['stackId','upgrade'],
   stackId: null,
   upgrade: null,