- |
-
- {{input class="input-sm" value=node.hostnamePrefix}}
-
- |
-
-
- {{input class="input-sm" type="number" min="1" value=node.quantity}}
- x
-
- |
-
- {{#if filteredNodeTemplates.length}}
-
- {{else}}
-
- {{/if}}
- |
-
- {{input type="checkbox" checked=node.etcd}}
- |
-
- {{input type="checkbox" checked=node.controlPlane}}
- |
-
- {{input type="checkbox" checked=node.worker}}
- |
-
-
- |
-
- {{else if (eq kind "norows")}}
-
diff --git a/lib/global-admin/addon/components/cru-cluster/component.js b/lib/global-admin/addon/components/cru-cluster/component.js
new file mode 100644
index 000000000..e232ac9bf
--- /dev/null
+++ b/lib/global-admin/addon/components/cru-cluster/component.js
@@ -0,0 +1,124 @@
+import Component from '@ember/component';
+import { get, set, computed } from '@ember/object';
+import { inject as service } from '@ember/service';
+import ViewNewEdit from 'shared/mixins/view-new-edit';
+import ChildHook from 'shared/mixins/child-hook';
+import { alias } from '@ember/object/computed';
+
+const MEMBER_CONFIG = {
+ type: 'clusterRoleTemplateBinding',
+};
+
+export default Component.extend(ViewNewEdit, ChildHook, {
+ globalStore: service(),
+ intl: service(),
+ access: service(),
+
+ cluster: alias('model.cluster'),
+ primaryResource: alias('model.cluster'),
+
+ step: 1,
+ initialProvider: null,
+ memberConfig: MEMBER_CONFIG,
+
+ init() {
+ this._super(...arguments);
+
+ // On edit pass in initialProvider, for create just set provider directly
+ const initialProvider = get(this, 'initialProvider');
+ if ( initialProvider ) {
+ set(this, 'provider', initialProvider);
+ }
+
+ if ( get(this, 'cluster.id') && initialProvider ){
+ set(this,'step', 2);
+ }
+ },
+
+ actions: {
+ clickNext() {
+ this.$('BUTTON[type="submit"]').click();
+ },
+
+ close() {
+ this.send('goToPrevious', 'global-admin.clusters.index');
+ },
+
+ maybeSave(cb) {
+ const info = get(this, 'driverInfo');
+ if ( info.preSave ) {
+ this.send('save',cb);
+ } else {
+ this.doneSaving();
+ }
+ },
+ },
+
+ providerChoices: computed('nodeDrivers.[]','intl.locale', function() {
+ const intl = get(this, 'intl');
+
+ const out = [
+ {name: 'googlegke', driver: 'googlegke'},
+// {name: 'amazoneks', driver: 'amazoneks'},
+ {name: 'azureaks', driver: 'azureaks'},
+ ];
+
+ get(this, 'model.nodeDrivers').filterBy('active',true).sortBy('name').forEach((driver) => {
+ const name = get(driver, 'name');
+ const hasUi = get(driver, 'hasUi');
+
+ out.push({
+ name: name,
+ driver: 'rke',
+ nodeComponent: hasUi ? name : 'generic',
+ nodeWhich: name,
+ });
+ }),
+
+ out.push({name: 'custom', driver: 'rke', nodeWhich: 'custom', preSave: true});
+ out.push({name: 'import', driver: 'import', preSave: true});
+
+ out.forEach((driver) => {
+ const key = `clusterNew.${driver.name}.label`;
+ if ( !get(driver,'displayName') && intl.exists(key) ) {
+ set(driver, 'displayName', intl.t(key));
+ }
+ });
+
+ return out;
+ }),
+
+ driverInfo: computed('provider', function() {
+ const name = get(this, 'provider');
+ const choices = get(this, 'providerChoices');
+ const entry = choices.findBy('name', name);
+ if ( entry ) {
+ return {
+ name: entry.name,
+ driverComponent: `cluster-driver/driver-${entry.driver}`,
+ nodeComponent: `node-driver/driver-${entry.nodeComponent}`,
+ nodeWhich: entry.nodeWhich,
+ preSave: !!entry.preSave,
+ };
+ }
+ }),
+
+ didSave() {
+ const originalCluster = get(this, 'cluster');
+ return originalCluster.waitForCondition('BackingNamespaceCreated').then(() => {
+ return this.applyHooks().then(() => {
+ const clone = originalCluster.clone();
+ set(this, 'cluster', clone);
+ return clone;
+ });
+ });
+ },
+
+ doneSaving() {
+ if ( get(this, 'driverInfo.preSave') ) {
+ set(this, 'step', 2);
+ } else {
+ this.sendAction('close');
+ }
+ },
+});
diff --git a/lib/global-admin/addon/components/cru-cluster/template.hbs b/lib/global-admin/addon/components/cru-cluster/template.hbs
new file mode 100644
index 000000000..5c84ea8d9
--- /dev/null
+++ b/lib/global-admin/addon/components/cru-cluster/template.hbs
@@ -0,0 +1,71 @@
+
+
+
+ {{#each providerChoices as |choice|}}
+ {{#link-to (query-params provider=choice.name) class=(concat "col span-2 nav-box-item driver machine-driver " choice.name)}}
+
{{choice.displayName}}
+ {{/link-to}}
+ {{/each}}
+
+
+{{#if (or isEdit (eq step 1))}}
+
+{{/if}}
+
+{{#unless (and isNew driverInfo.preSave)}}
+ {{component driverInfo.driverComponent
+ mode=mode
+ nodeComponent=driverInfo.nodeComponent
+ nodeWhich=driverInfo.nodeWhich
+ model=model
+ save=(action 'save')
+ close=(action 'close')
+ registerHook=(action "registerHook")
+ }}
+{{/unless}}
diff --git a/lib/global-admin/addon/components/cru-node-pools/component.js b/lib/global-admin/addon/components/cru-node-pools/component.js
new file mode 100644
index 000000000..af3dc07ee
--- /dev/null
+++ b/lib/global-admin/addon/components/cru-node-pools/component.js
@@ -0,0 +1,117 @@
+import Component from '@ember/component';
+import layout from './template';
+import { computed, get, set } from '@ember/object';
+import { inject as service } from '@ember/service';
+import { all as PromiseAll } from 'rsvp';
+
+export default Component.extend({
+ layout,
+ globalStore: service(),
+
+ cluster: null,
+ nodeTemplates: null,
+ driver: null, // docker-machine driver
+
+ originalPools: null,
+ nodePools: null,
+
+ init() {
+ this._super(...arguments);
+ const originalPools = (get(this,'cluster.nodePools')||[]).slice();
+ set(this, 'originalPools', originalPools);
+ set(this, 'nodePools', originalPools.slice());
+ this.sendAction('registerHook', this.savePools.bind(this), 'savePools');
+ },
+
+ actions: {
+ addPool() {
+ let nodePools = get(this, 'nodePools');
+
+ let templateId = null;
+ const lastNode = nodePools[nodePools.length-1];
+ if ( lastNode ) {
+ templateId = get(lastNode, 'nodeTemplateId');
+ }
+
+ nodePools.pushObject(get(this, 'globalStore').createRecord({
+ type: 'nodePool',
+ nodeTemplateId: templateId
+ }));
+ },
+
+ removePool(pool) {
+ get(this, 'nodePools').removeObject(pool);
+ },
+
+ addNodeTemplate(node) {
+ get(this,'modalService').toggleModal('modal-edit-node-template', {
+ nodeTemplate: null,
+ driver: get(this, 'driver'),
+ onAdd: function(nodeTemplate) {
+ set(node, 'nodeTemplateId', get(nodeTemplate, 'id'));
+ },
+ });
+ },
+ },
+
+ savePools: function() {
+ const nodePools = get(this, 'nodePools');
+ const original = get(this, 'originalPools');
+
+ const remove = [];
+ original.forEach((pool) => {
+ if ( !nodePools.includes(pool) ) {
+ // Remove
+ remove.push(pool);
+ }
+ });
+
+ const clusterId = get(this, 'cluster.id');
+ nodePools.forEach((pool) => {
+ set(pool, 'clusterId', clusterId);
+ });
+
+
+ return PromiseAll(nodePools.map(x => x.save())).then(() => {
+ return PromiseAll(remove.map(x => x.delete())).then(() => {
+ return get(this, 'cluster');
+ });
+ });
+ },
+
+ filteredNodeTemplates: computed('driver','nodeTemplates.@each.{state,driver}', function() {
+ const driver = get(this, 'driver');
+ let templates = get(this, 'nodeTemplates').filterBy('state','active').filterBy('driver', driver);
+ return templates;
+ }),
+
+ _nodeCountFor(role) {
+ let count = 0;
+ (get(this, 'cluster.nodePools')||[]).filterBy(role,true).forEach((pool) => {
+ let more = get(pool, 'quantity');
+ if ( more ) {
+ more = parseInt(more, 10);
+ }
+
+ count += more;
+ });
+
+ return count;
+ },
+
+ etcdOk: computed('cluster.nodePools.@each.{quantity,etcd}', function() {
+ let count = this._nodeCountFor('etcd');
+ return count === 1 || count === 3 || count === 5
+ }),
+
+ controlPlaneOk: computed('cluster.nodePools.@each.{quantity,controlPlane}', function() {
+ let count = this._nodeCountFor('controlPlane');
+ return count >= 1;
+ }),
+
+ workerOk: computed('cluster.nodePools.@each.{quantity,worker}', function() {
+ let count = this._nodeCountFor('worker');
+ return count >= 1;
+ }),
+
+});
diff --git a/lib/global-admin/addon/components/cru-node-pools/template.hbs b/lib/global-admin/addon/components/cru-node-pools/template.hbs
new file mode 100644
index 000000000..cdabd90f2
--- /dev/null
+++ b/lib/global-admin/addon/components/cru-node-pools/template.hbs
@@ -0,0 +1,94 @@
+{{#accordion-list-item
+ title=(t 'clusterNew.rke.nodes.title')
+ detail=(t 'clusterNew.rke.nodes.detail')
+ showExpand=false
+ expandOnInit=true
+ expandAll=al.expandAll
+ expand=(action expandFn)
+}}
+ {{#sortable-table
+ classNames="grid sortable-table"
+ body=model
+ suffix=true
+ search=false
+ bulkActions=false
+ rowActions=false
+ pagingLabel="pagination.nodePool"
+ headers=headers
+ as |sortable kind pool dt|
+ }}
+ {{#if (eq kind "row")}}
+
+ |
+
+ {{input class="input-sm" value=pool.hostnamePrefix}}
+
+ |
+
+
+ {{input class="input-sm" type="number" min="1" value=pool.quantity}}
+ x
+
+ |
+
+ {{#if filteredNodeTemplates.length}}
+
+ {{else}}
+
+ {{/if}}
+ |
+
+ {{input type="checkbox" checked=pool.etcd}}
+ |
+
+ {{input type="checkbox" checked=pool.controlPlane}}
+ |
+
+ {{input type="checkbox" checked=pool.worker}}
+ |
+
+
+ |
+
+ {{else if (eq kind "norows")}}
+
| {{t 'nodesPage.table.noData'}} |
+ {{else if (eq kind "suffix")}}
+
+ | {{t 'clusterNew.rke.role.requirements.label'}} |
+
+
+ {{t 'clusterNew.rke.role.requirements.etcd'}}
+ |
+
+
+ {{t 'clusterNew.rke.role.requirements.controlplane'}}
+ |
+
+
+ {{t 'clusterNew.rke.role.requirements.worker'}}
+ |
+ |
+
+ {{/if}}
+ {{/sortable-table}}
+
+
+
+
+{{/accordion-list-item}}
diff --git a/lib/global-admin/addon/mixins/cluster-driver.js b/lib/global-admin/addon/mixins/cluster-driver.js
index e77a72571..5fe93a348 100644
--- a/lib/global-admin/addon/mixins/cluster-driver.js
+++ b/lib/global-admin/addon/mixins/cluster-driver.js
@@ -1,37 +1,62 @@
import Mixin from '@ember/object/mixin';
-import ViewNewEdit from 'shared/mixins/view-new-edit';
-import { get, computed } from '@ember/object';
+import { get, set, computed } from '@ember/object';
import { alias } from '@ember/object/computed';
+import { resolve } from 'rsvp';
import { inject as service } from '@ember/service';
-export default Mixin.create(ViewNewEdit, {
+export default Mixin.create({
configField: '
',
- close: null, // action to finish adding
+ mode: null,
+ save: null, // Action to save
+ close: null, // Action on complete
+ registerHook: null,
globalStore: service(),
- router: service(),
cluster: alias('model.cluster'),
primaryResource: alias('model.cluster'),
errors: null,
- init() {
- this._super(...arguments);
- },
-
- actions: {
- close() {
- this.sendAction('close');
- }
- },
-
config: computed('configField', function() {
const field = 'cluster.' + get(this, 'configField');
return get(this, field);
}),
- doneSaving() {
- this.get('router').transitionTo('global-admin.clusters.index');
+ actions: {
+ driverSave(cb) {
+ resolve(this.willSave()).then((ok) => {
+ if ( !ok ) {
+ // Validation or something else said not to save
+ cb(false);
+ return;
+ }
+
+ this.sendAction('save', cb);
+ });
+ },
+
+ registerHook() {
+ const args = [].slice.call(arguments);
+ args.unshift('registerHook');
+ this.sendAction.apply(this, args);
+ }
+ },
+
+ willSave() {
+ const cluster = get(this, 'cluster');
+ const field = get(this, 'configField');
+ cluster.clearProvidersExcept(field);
+
+ set(this, 'errors',null);
+ const ok = this.validate();
+ return ok;
+ },
+
+ validate() {
+ const model = get(this,'cluster');
+ const errors = model.validationErrors();
+ set(this, 'errors', errors);
+ return errors.length === 0;
},
});
diff --git a/lib/shared/addon/components/form-members/component.js b/lib/shared/addon/components/form-members/component.js
index ed4948f1c..5b5207b8e 100644
--- a/lib/shared/addon/components/form-members/component.js
+++ b/lib/shared/addon/components/form-members/component.js
@@ -140,6 +140,10 @@ export default Component.extend({
return PromiseAll(add.map(x => x.save())).then(() => {
return PromiseAll(update.map(x => x.save())).then(() => {
return PromiseAll(remove.map(x => x.delete())).then(() => {
+ if ( this.isDestroyed || this.isDestroying ) {
+ return;
+ }
+
set(this, 'memberArray', []);
return get(this, 'primaryResource');
});
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index c9b71a72c..b8f7d1c32 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -645,6 +645,7 @@ clustersPage:
header: Clusters
newCluster: Add Cluster
newClusterName: "Add Cluster: {name}"
+ editClusterName: "Edit Cluster: {name}"
cluster:
label: Cluster Name
provider:
@@ -3141,7 +3142,7 @@ clusterNew:
placeholder: e.g. Cluster for dev and test workloads
members:
label: Member Roles
- detail: Control who as access to the cluster and what permission they have to change it
+ detail: Control who has access to the cluster and what permission they have to change it.
config:
label: Provider
detail: Choose where the nodes for the cluster will come from
@@ -4165,6 +4166,11 @@ pagination:
=0 {No Nodes}
=1 {{count} {count, plural, =1 {Node} other {Nodes}}}
other {{from} - {to} of {count} Nodes}}
+ nodePool: |
+ {pages, plural,
+ =0 {No Node Pools}
+ =1 {{count} {count, plural, =1 {Node Pool} other {Node Pools}}}
+ other {{from} - {to} of {count} Node Pools}}
nodeTemplate: |
{pages, plural,
=0 {No Node Templates}