From 7cff76fa4b28a628de47185ef586c6642be4b130 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 20 Feb 2019 11:13:47 -0700 Subject: [PATCH 1/3] Revert "Don't show empty row when no cluster driver." This reverts commit 8c6ef4f250b3cfcfb6d7fffd82abc1c0c05c731a. --- .../addon/components/cru-cluster/template.hbs | 204 +++++++++--------- 1 file changed, 100 insertions(+), 104 deletions(-) diff --git a/lib/shared/addon/components/cru-cluster/template.hbs b/lib/shared/addon/components/cru-cluster/template.hbs index 8db4590e2..4bff6c798 100644 --- a/lib/shared/addon/components/cru-cluster/template.hbs +++ b/lib/shared/addon/components/cru-cluster/template.hbs @@ -13,115 +13,111 @@ {{#unless initialProvider}}
-
- {{#if (gte providerGroups.cloudGroup.length 1)}} -
-
- +
+
+ +
+ {{#each (get providerGroups "cloudGroup") as |choice|}} + {{#unless choice.scriptError}} + {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}} + {{/link-to}} + {{else}} +
+ {{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}} + + {{/tooltip-element}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}}
- {{#each (get providerGroups "cloudGroup") as |choice|}} - {{#unless choice.scriptError}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} - {{/link-to}} - {{else}} -
- {{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}} - - {{/tooltip-element}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} -
- {{/unless}} - {{/each}} -
- {{/if}} - - {{#if (gte providerGroups.rkeGroup.length 1)}} -
-
- -
- {{#each (get providerGroups "rkeGroup") as |choice|}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{/link-to}} - {{/each}} -
- {{/if}} - - {{#if (gte providerGroups.externalGroup.length 1)}} -
-
- -
- {{#each (get providerGroups "externalGroup") as |choice|}} - {{#unless choice.scriptError}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} - {{/link-to}} - {{else}} -
- {{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}} - - {{/tooltip-element}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} -
- {{/unless}} - {{/each}} -
- {{/if}} + {{/unless}} + {{/each}}
-
-
-
- -
- {{#each (get providerGroups "importGroup") as |choice|}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-12 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} - {{/link-to}} - {{/each}} -
-
-
- -
- {{#each (get providerGroups "customGroup") as |choice|}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-12 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} - {{/link-to}} - {{/each}} +
+
+
+ {{#each (get providerGroups "importGroup") as |choice|}} + {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-12 col-inline nav-box-item driver " choice.name)}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}} + {{/link-to}} + {{/each}} +
+ +
+ +
+
+
+ +
+ {{#each (get providerGroups "rkeGroup") as |choice|}} + {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} +
+

{{driver-name choice.name}}

+ {{/link-to}} + {{/each}} +
+ +
+
+ +
+ {{#each (get providerGroups "customGroup") as |choice|}} + {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-12 col-inline nav-box-item driver " choice.name)}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}} + {{/link-to}} + {{/each}}
+ + {{#if (gte providerGroups.externalGroup.length 1)}} +
+
+
+ +
+ {{#each (get providerGroups "externalGroup") as |choice|}} + {{#unless choice.scriptError}} + {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}} + {{/link-to}} + {{else}} +
+ {{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}} + + {{/tooltip-element}} +
+

{{driver-name choice.name}}

+ {{#if choice.genericIcon}} +

{{driver-name choice.name}}

+ {{/if}} +
+ {{/unless}} + {{/each}} +
+
+ {{/if}} {{/unless}} @@ -197,4 +193,4 @@ {{#if (and isEdit (not provider))}} {{top-errors errors=errors}} {{save-cancel editing=true save="save" cancel="close"}} -{{/if}} +{{/if}} \ No newline at end of file From 5344db870736cb980fbc96f2176f0edfa68bf82d Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 20 Feb 2019 12:57:04 -0700 Subject: [PATCH 2/3] Fix websocket forwarded headers --- server/proxies/api.js | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/server/proxies/api.js b/server/proxies/api.js index e1073cb26..21139dd40 100644 --- a/server/proxies/api.js +++ b/server/proxies/api.js @@ -23,21 +23,39 @@ module.exports = function(app, options) { return; } - proxyLog('WS', req); - if ( socket.ssl ) { req.headers['x-forwarded-proto'] = 'https'; } - let targetHost = config.apiServer.replace(/^https?:\/\//, ''); + let host = req.headers['host']; + let port; - req.headers['x-forwarded-host'] = req.headers['host']; + if ( socket.ssl ) { + req.headers['x-forwarded-proto'] = 'https'; + port = 443; + } else { + req.headers['x-forwarded-proto'] = 'http'; + port = 80; + } + + if ( host ) { + idx = host.lastIndexOf(':'); + if ( ( host.startsWith('[') && host.includes(']:') || !host.startsWith('[') ) && idx > 0 ){ + port = host.substr(idx+1); + host = host.substr(0, host.lastIndexOf(':')); + } + } + + req.headers['x-forwarded-host'] = host; + req.headers['x-forwarded-port'] = port; req.headers['host'] = targetHost; req.headers['origin'] = config.apiServer; req.socket.servername = targetHost; + proxyLog('WS', req); + try { proxy.ws(req, socket, head); } catch (err) { @@ -113,5 +131,5 @@ function onProxyError(err, req, res) { } function proxyLog(label, req) { - console.log(`[${ label }][${ req._source }]`, req.method, req.url); + console.log(`[${ label }]`, req.method, req.url); } From 8139fd4788a9c957211f1b59eb0062a67d33d545 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 20 Feb 2019 13:14:35 -0700 Subject: [PATCH 3/3] Cleanup cluster drivers --- app/instance-initializers/nav.js | 4 +- app/styles/components/_button.scss | 2 +- app/styles/pages/_host.scss | 7 +++ .../cluster-drivers/template.hbs | 17 ++++--- lib/nodes/addon/custom-drivers/index/route.js | 2 +- .../custom-drivers/node-drivers/template.hbs | 12 +++-- lib/nodes/addon/custom-drivers/template.hbs | 13 +----- lib/nodes/addon/routes.js | 6 +-- .../addon/components/cru-cluster/component.js | 8 ++-- .../addon/components/cru-cluster/template.hbs | 46 +++---------------- translations/en-us.yaml | 6 +-- 11 files changed, 47 insertions(+), 76 deletions(-) diff --git a/app/instance-initializers/nav.js b/app/instance-initializers/nav.js index efef5d25a..e505aef5d 100644 --- a/app/instance-initializers/nav.js +++ b/app/instance-initializers/nav.js @@ -281,9 +281,9 @@ const rootNav = [ { scope: 'global', id: 'nodes-node-drivers', - localizedLabel: 'nav.admin.nodeDrivers', + localizedLabel: 'nav.admin.drivers', route: 'nodes.custom-drivers', - resource: ['nodedriver', 'kontainerDriver'], + resource: ['nodedriver', 'kontainerdriver'], resourceScope: 'global', }, { diff --git a/app/styles/components/_button.scss b/app/styles/components/_button.scss index 268ce7386..a20ff3b48 100755 --- a/app/styles/components/_button.scss +++ b/app/styles/components/_button.scss @@ -1,6 +1,6 @@ $btn-padding: 8px 15px; $xs-padding: 2px 3px; -$sm-padding: 6px 10px 4px 10px; +$sm-padding: 5px 10px 3px 10px; $lg-padding: 18px 30px; // ----------------------------------------------------------------------------- diff --git a/app/styles/pages/_host.scss b/app/styles/pages/_host.scss index 6dba134d8..951c0097b 100644 --- a/app/styles/pages/_host.scss +++ b/app/styles/pages/_host.scss @@ -73,6 +73,13 @@ &.alidns { @include alidns; } } +.machine-driver-empty { + height: 100px; + margin-top: 10px; + padding-top: 50px; + color: $text-muted; +} + .error-loading-driver { border: 2px solid red !important; } diff --git a/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs b/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs index a163e5f74..34314258a 100644 --- a/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs +++ b/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs @@ -1,10 +1,15 @@ -
+
+
    +
  • + {{#link-to "custom-drivers.cluster-drivers"}}{{t 'customDrivers.clusters'}}{{/link-to}} +
    • +
  • + {{#link-to "custom-drivers.node-drivers"}}{{t 'customDrivers.nodes'}}{{/link-to}} +
    • +
- {{!-- --}} - +
- -

{{t 'clusterDrivers.title'}}

{{#sortable-table @@ -50,4 +55,4 @@ {{else if (eq kind "norows")}} {{t 'clusterDrivers.table.noData'}} {{/if}} -{{/sortable-table}} \ No newline at end of file +{{/sortable-table}} diff --git a/lib/nodes/addon/custom-drivers/index/route.js b/lib/nodes/addon/custom-drivers/index/route.js index f13f2b00c..0839e7eb2 100644 --- a/lib/nodes/addon/custom-drivers/index/route.js +++ b/lib/nodes/addon/custom-drivers/index/route.js @@ -3,7 +3,7 @@ import Route from '@ember/routing/route'; export default Route.extend({ redirect(model, transition) { if (transition.targetName === 'nodes.custom-drivers.index') { - this.replaceWith('custom-drivers.node-drivers'); + this.replaceWith('custom-drivers.cluster-drivers'); } } }); diff --git a/lib/nodes/addon/custom-drivers/node-drivers/template.hbs b/lib/nodes/addon/custom-drivers/node-drivers/template.hbs index 2b5dfd07e..f1a0a698b 100644 --- a/lib/nodes/addon/custom-drivers/node-drivers/template.hbs +++ b/lib/nodes/addon/custom-drivers/node-drivers/template.hbs @@ -1,9 +1,15 @@ -
+
+
    +
  • + {{#link-to "custom-drivers.cluster-drivers"}}{{t 'customDrivers.clusters'}}{{/link-to}} +
    • +
  • + {{#link-to "custom-drivers.node-drivers"}}{{t 'customDrivers.nodes'}}{{/link-to}} +
    • +
- -

{{t 'machinePage.header'}}

{{#sortable-table diff --git a/lib/nodes/addon/custom-drivers/template.hbs b/lib/nodes/addon/custom-drivers/template.hbs index dbc247b5b..c24cd6895 100644 --- a/lib/nodes/addon/custom-drivers/template.hbs +++ b/lib/nodes/addon/custom-drivers/template.hbs @@ -1,12 +1 @@ -
-
    -
  • - {{#link-to "custom-drivers.cluster-drivers"}}{{t 'customDrivers.clusters'}}{{/link-to}} -
    • -
  • - {{#link-to "custom-drivers.node-drivers"}}{{t 'customDrivers.nodes'}}{{/link-to}} -
    • -
-
- -{{outlet}} \ No newline at end of file +{{outlet}} diff --git a/lib/nodes/addon/routes.js b/lib/nodes/addon/routes.js index 21c78f25c..7a639cddd 100644 --- a/lib/nodes/addon/routes.js +++ b/lib/nodes/addon/routes.js @@ -2,9 +2,9 @@ import buildRoutes from 'ember-engines/routes'; export default buildRoutes(function() { // Define your engine's route map here - this.route('custom-drivers', { path: '/custom-drivers' }, function() { - this.route('node-drivers', { path: '/node-drivers' }); - this.route('cluster-drivers', { path: '/cluster-drivers' }); + this.route('custom-drivers', { path: '/drivers' }, function() { + this.route('node-drivers', { path: '/node' }); + this.route('cluster-drivers', { path: '/cluster' }); }); this.route('node-templates'); }); diff --git a/lib/shared/addon/components/cru-cluster/component.js b/lib/shared/addon/components/cru-cluster/component.js index f52c5d5e0..01321d570 100644 --- a/lib/shared/addon/components/cru-cluster/component.js +++ b/lib/shared/addon/components/cru-cluster/component.js @@ -142,7 +142,7 @@ export default Component.extend(ViewNewEdit, ChildHook, { driver: get(c, 'name'), kontainerId: get(c, 'id'), name: get(c, 'name'), - nodeWhich: 'external', + genericIcon: true, // @TODO should have a way for drivers to provide an icon }); } else { set(this, 'needReloadSchema', true); @@ -203,6 +203,8 @@ export default Component.extend(ViewNewEdit, ChildHook, { out = out.filterBy('driver', 'rke'); } + out.sortBy('name'); + return out; }), @@ -212,7 +214,6 @@ export default Component.extend(ViewNewEdit, ChildHook, { const cloudGroup = []; const customGroup = []; const importGroup = []; - const externalGroup = []; choices.forEach((item) => { if (get(item, 'driver') === 'rke' && get(item, 'name') !== 'custom') { @@ -221,8 +222,6 @@ export default Component.extend(ViewNewEdit, ChildHook, { importGroup.pushObject(item); } else if (get(item, 'name') === 'custom') { customGroup.pushObject(item); - } else if (get(item, 'nodeWhich') === 'external') { - externalGroup.pushObject(item) } else { cloudGroup.pushObject(item); } @@ -231,7 +230,6 @@ export default Component.extend(ViewNewEdit, ChildHook, { return { cloudGroup, customGroup, - externalGroup, importGroup, rkeGroup, }; diff --git a/lib/shared/addon/components/cru-cluster/template.hbs b/lib/shared/addon/components/cru-cluster/template.hbs index 4bff6c798..cbe703ff6 100644 --- a/lib/shared/addon/components/cru-cluster/template.hbs +++ b/lib/shared/addon/components/cru-cluster/template.hbs @@ -20,11 +20,8 @@ {{#each (get providerGroups "cloudGroup") as |choice|}} {{#unless choice.scriptError}} {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} -
+

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} {{/link-to}} {{else}}
@@ -33,11 +30,10 @@ {{/tooltip-element}}

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}}
{{/unless}} + {{else}} +
{{t 'clusterNew.driverLabels.noCloud'}}
{{/each}}
@@ -68,6 +64,8 @@

{{driver-name choice.name}}

{{/link-to}} + {{else}} +
{{t 'clusterNew.driverLabels.noInfra'}}
{{/each}}
@@ -86,38 +84,6 @@ {{/each}}
- - {{#if (gte providerGroups.externalGroup.length 1)}} -
-
-
- -
- {{#each (get providerGroups "externalGroup") as |choice|}} - {{#unless choice.scriptError}} - {{#link-to (query-params provider=choice.name) class=(concat "mb-20 mt-10 col span-3 col-inline nav-box-item driver " choice.name)}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} - {{/link-to}} - {{else}} -
- {{#tooltip-element type="tooltip-basic" model=choice.scriptError tooltipTemplate='tooltip-static' aria-describedby="tooltip-base" tooltipFor="tooltipDriverError"}} - - {{/tooltip-element}} -
-

{{driver-name choice.name}}

- {{#if choice.genericIcon}} -

{{driver-name choice.name}}

- {{/if}} -
- {{/unless}} - {{/each}} -
-
- {{/if}} {{/unless}} @@ -193,4 +159,4 @@ {{#if (and isEdit (not provider))}} {{top-errors errors=errors}} {{save-cancel editing=true save="save" cancel="close"}} -{{/if}} \ No newline at end of file +{{/if}} diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 5b4c13429..25ae9194f 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -2118,9 +2118,10 @@ clusterNew: driverLabels: cloud: In a hosted Kubernetes provider custom: From my own existing nodes - external: User Provided import: Import existing cluster infra: From nodes in an infrastructure provider + noCloud: There are no cluster drivers enabled. + noInfra: There are no node drivers enabled. externalError: 'Component could not be loaded. Check URL.' members: label: Member Roles @@ -5866,7 +5867,6 @@ customDrivers: clusters: Cluster Drivers clusterDrivers: - title: Cluster Drivers add: Add Cluster Driver builtIn: Built-In table: @@ -6983,7 +6983,7 @@ nav: accounts: Users clusters: Clusters machines: Nodes - nodeDrivers: Custom Drivers + drivers: Drivers catalogs: Catalogs globalDns: Global DNS globalDnsEntries: Entries