rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3786 from westlywright/rke.import.changes 

Update k3sConfig shape based on new api design
This commit is contained in:
Westly Wright 2020-03-04 10:25:42 -07:00 committed by GitHub
parent c6260ffd63 1f42be105c
commit 6376b0c671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/global-admin/addon/components/cluster-row/template.hbs
View File

@ -38,9 +38,9 @@
{{cluster-template-revision-upgrade-notification cluster=model}} {{cluster-template-revision-upgrade-notification cluster=model}}
</td> </td>
<td data-title="{{dt.provider}}"> <td data-title="{{dt.provider}}">
{{#if (or model.k3sConfig.kubernetesVersion.gitVersion model.version.gitVersion)}} {{#if (or model.k3sConfig.kubernetesVersion model.version.gitVersion)}}
<small>{{model.displayProvider}}</small> <small>{{model.displayProvider}}</small>
<p class="text-small text-muted m-0">{{or model.k3sConfig.kubernetesVersion.gitVersion model.version.gitVersion}}</p> <p class="text-small text-muted m-0">{{or model.k3sConfig.kubernetesVersion model.version.gitVersion}}</p>
{{else}} {{else}}
<small>{{model.displayProvider}}</small> <small>{{model.displayProvider}}</small>
{{/if}} {{/if}}

2
lib/shared/addon/components/cluster-driver/driver-import/component.js
View File

@ -43,7 +43,7 @@ export default Component.extend(ClusterDriver, {
type: 'k3sConfig', type: 'k3sConfig',
serverConcurrency: 1, serverConcurrency: 1,
workerConcurrency: 1, workerConcurrency: 1,
kubernetesVersion: { gitVersion: this.cluster.version.gitVersion } kubernetesVersion: this.cluster.version.gitVersion
})); }));
} }
} }

2
lib/shared/addon/components/k3s-cluster-info/component.js
View File

@ -13,7 +13,7 @@ export default Component.extend({
editing: false, editing: false,
k3sConfig: alias('cluster.k3sConfig'), k3sConfig: alias('cluster.k3sConfig'),
allVersions: computed('k3s.allVersions.[]', function() { allVersions: computed('k3s.allVersions.[]', function() {
const currentVersion = get(this, 'k3sConfig.kubernetesVersion.gitVersion'); const currentVersion = get(this, 'k3sConfig.kubernetesVersion');
const allVersions = this.k3s.allVersions || []; const allVersions = this.k3s.allVersions || [];
const versionsMapped = []; const versionsMapped = [];

12
lib/shared/addon/components/k3s-cluster-info/template.hbs
View File

@ -5,12 +5,12 @@
<div class="form-control"> <div class="form-control">
{{#input-or-display {{#input-or-display
editable=editing editable=editing
value=k3sConfig.kubernetesVersion.gitVersion value=k3sConfig.kubernetesVersion
}} }}
{{searchable-select {{searchable-select
classNames="form-control" classNames="form-control"
content=allVersions content=allVersions
value=k3sConfig.kubernetesVersion.gitVersion value=k3sConfig.kubernetesVersion
readOnly=(not editing) readOnly=(not editing)
}} }}
{{/input-or-display}} {{/input-or-display}}
@ -25,13 +25,13 @@
<div class="form-control"> <div class="form-control">
{{#input-or-display {{#input-or-display
editable=editing editable=editing
value=k3sConfig.serverConcurrency value=k3sConfig.k3supgradeStrategy.serverConcurrency
}} }}
{{input {{input
id="node-server-concurrency" id="node-server-concurrency"
class="form-control" class="form-control"
type="number" type="number"
value=k3sConfig.serverConcurrency value=k3sConfig.k3supgradeStrategy.serverConcurrency
}} }}
{{/input-or-display}} {{/input-or-display}}
</div> </div>
@ -43,13 +43,13 @@
<div class="form-control"> <div class="form-control">
{{#input-or-display {{#input-or-display
editable=editing editable=editing
value=k3sConfig.workerConcurrency value=k3sConfig.k3supgradeStrategy.workerConcurrency
}} }}
{{input {{input
id="node-worker-concurrency" id="node-worker-concurrency"
class="form-control" class="form-control"
type="number" type="number"
value=k3sConfig.workerConcurrency value=k3sConfig.k3supgradeStrategy.workerConcurrency
}} }}
{{/input-or-display}} {{/input-or-display}}
</div> </div>