mirror of https://github.com/rancher/ui.git
Update for view
This commit is contained in:
parent
0334d00d0e
commit
f47d7d0bbe
|
|
@ -19,6 +19,7 @@ const AZURE_PATH = 'cluster.rancherKubernetesEngineConfig.cloudProvider.azure
|
||||||
export default Component.extend({
|
export default Component.extend({
|
||||||
globalStore: service(),
|
globalStore: service(),
|
||||||
settings: service(),
|
settings: service(),
|
||||||
|
growl: service(),
|
||||||
layout,
|
layout,
|
||||||
configType: null,
|
configType: null,
|
||||||
cluster: null,
|
cluster: null,
|
||||||
|
|
@ -187,6 +188,10 @@ export default Component.extend({
|
||||||
(selectedCloudProvider === 'external')
|
(selectedCloudProvider === 'external')
|
||||||
}),
|
}),
|
||||||
|
|
||||||
|
harvesterCloudProviderDisabled: computed('model.nodeTemplates.firstObject', function() {
|
||||||
|
return !get(this, 'model.nodeTemplates.firstObject')
|
||||||
|
}),
|
||||||
|
|
||||||
checkDefaults(record) {
|
checkDefaults(record) {
|
||||||
get(this, 'azureDefaults').forEach((def) => {
|
get(this, 'azureDefaults').forEach((def) => {
|
||||||
if (isEmpty(record[def])) {
|
if (isEmpty(record[def])) {
|
||||||
|
|
@ -276,6 +281,7 @@ export default Component.extend({
|
||||||
set(config, 'cloudProvider', get(this, 'globalStore').createRecord({
|
set(config, 'cloudProvider', get(this, 'globalStore').createRecord({
|
||||||
type: 'cloudProvider',
|
type: 'cloudProvider',
|
||||||
name: 'harvester',
|
name: 'harvester',
|
||||||
|
harvesterCloudProvider: nue,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
set(this, 'configAnswers', nue);
|
set(this, 'configAnswers', nue);
|
||||||
|
|
@ -285,7 +291,7 @@ export default Component.extend({
|
||||||
set(config, 'cloudProvider.harvesterCloudProvider.cloudConfig', get(obj, 'config'))
|
set(config, 'cloudProvider.harvesterCloudProvider.cloudConfig', get(obj, 'config'))
|
||||||
})
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
this.get('growl').fromError('Error getting kubeconfig file', err);
|
get(this, 'growl').fromError('Error getting kubeconfig file', err);
|
||||||
})
|
})
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -106,11 +106,28 @@
|
||||||
</div>
|
</div>
|
||||||
{{else if isCreateClusterOrClusterTemplate}}
|
{{else if isCreateClusterOrClusterTemplate}}
|
||||||
<div class="radio">
|
<div class="radio">
|
||||||
<label>
|
<label style={{if harvesterCloudProviderDisabled "color: #adaeb4"}}>
|
||||||
{{radio-button
|
{{radio-button
|
||||||
selection=selectedCloudProvider
|
selection=selectedCloudProvider
|
||||||
value="harvester"
|
value="harvester"
|
||||||
}} {{t "cloudProvider.harvester.label"}}
|
disabled=harvesterCloudProviderDisabled
|
||||||
|
}}
|
||||||
|
{{t "cloudProvider.harvester.label"}}
|
||||||
|
{{#if harvesterCloudProviderDisabled}}
|
||||||
|
<span class="inline-block">
|
||||||
|
{{#tooltip-element
|
||||||
|
type="tooltip-basic"
|
||||||
|
model=(t "cloudProvider.harvester.helpText" htmlSafe=true)
|
||||||
|
tooltipTemplate="tooltip-static"
|
||||||
|
aria-describedby="tooltip-base"
|
||||||
|
tooltipFor="tooltipPoolCreateAfter"
|
||||||
|
placement="top"
|
||||||
|
tagName="div"
|
||||||
|
}}
|
||||||
|
<i class="icon icon-help icon-blue"></i>
|
||||||
|
{{/tooltip-element}}
|
||||||
|
</span>
|
||||||
|
{{/if}}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
||||||
|
|
@ -3175,6 +3175,7 @@ cloudProvider:
|
||||||
helpText: 'Please edit the YAML to add in any other <a href="http://rancher.com/docs/rke/v0.1.x/en/config-options/cloud-providers/" target="_blank" rel="nofollow noopener noreferrer">cloud providers</a>'
|
helpText: 'Please edit the YAML to add in any other <a href="http://rancher.com/docs/rke/v0.1.x/en/config-options/cloud-providers/" target="_blank" rel="nofollow noopener noreferrer">cloud providers</a>'
|
||||||
harvester:
|
harvester:
|
||||||
label: Harvester (Out-of-tree)
|
label: Harvester (Out-of-tree)
|
||||||
|
helpText: Please select a node template first to enable the option
|
||||||
|
|
||||||
helpText: |
|
helpText: |
|
||||||
Read more about the state of the <a href="https://kubernetes.io/blog/2019/04/17/the-future-of-cloud-providers-in-kubernetes/" target="_blank" rel="nofollow noopener noreferrer">Kubernetes in-tree cloud providers</a>
|
Read more about the state of the <a href="https://kubernetes.io/blog/2019/04/17/the-future-of-cloud-providers-in-kubernetes/" target="_blank" rel="nofollow noopener noreferrer">Kubernetes in-tree cloud providers</a>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue