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

Add experimental k8s version to rke cluster options 

rancher/rancher#15919
This commit is contained in:
Westly Wright 2018-10-02 16:07:50 -07:00
parent 2253272229
commit c46b92de6e
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 86 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lib/shared/addon/components/cluster-driver/driver-rke/component.js
View File

@ -69,28 +69,28 @@ const INGRESSCHOICES = [
]; ];
export default InputTextFile.extend(ClusterDriver, { export default InputTextFile.extend(ClusterDriver, {
globalStore: service(), globalStore: service(),
settings: service(), settings: service(),
growl: service(), growl: service(),
intl: service(), intl: service(),
layout, layout,
networkContent: NETWORKCHOICES, networkContent: NETWORKCHOICES,
authChoices: AUTHCHOICES, authChoices: AUTHCHOICES,
ingressChoices: INGRESSCHOICES, ingressChoices: INGRESSCHOICES,
configField: 'rancherKubernetesEngineConfig', configField: 'rancherKubernetesEngineConfig',
registry: 'default', registry: 'default',
accept: '.yml, .yaml', accept: '.yml, .yaml',
loading: false, loading: false,
pasteOrUpload: false, pasteOrUpload: false,
model: null, model: null,
initialVersion: null, initialVersion: null,
registryUrl: null, registryUrl: null,
registryUser: null, registryUser: null,
registryPass: null, registryPass: null,
clusterOptErrors: null, clusterOptErrors: null,
nodeNameErrors: null, nodeNameErrors: null,
existingNodes: null, existingNodes: null,
initialNodeCounts: null, initialNodeCounts: null,
@ -102,15 +102,17 @@ export default InputTextFile.extend(ClusterDriver, {
worker: true, worker: true,
defaultDockerRootDir: null, defaultDockerRootDir: null,
windowsEnable: false, windowsEnable: false,
isLinux: true, isLinux: true,
windowsSupport: false, windowsSupport: false,
isNew: equal('mode', 'new'), isNew: equal('mode', 'new'),
isEdit: equal('mode', 'edit'), isEdit: equal('mode', 'edit'),
notView: or('isNew', 'isEdit'), notView: or('isNew', 'isEdit'),
clusterState: alias('model.originalCluster.state'), clusterState: alias('model.originalCluster.state'),
// Custom stuff // Custom stuff
isCustom: equal('nodeWhich', 'custom'), isCustom: equal('nodeWhich', 'custom'),
init() { init() {
this._super(); this._super();
@ -367,6 +369,7 @@ export default InputTextFile.extend(ClusterDriver, {
versionChoices: computed('initialVersion', `settings.${ C.SETTING.VERSIONS_K8S }`, 'config.kubernetesVersion', function() { versionChoices: computed('initialVersion', `settings.${ C.SETTING.VERSIONS_K8S }`, 'config.kubernetesVersion', function() {
const versions = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}'); const versions = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}');
const { experimentalVersion } = this;
if ( !versions ) { if ( !versions ) {
return []; return [];
@ -393,7 +396,16 @@ export default InputTextFile.extend(ClusterDriver, {
} }
return sortVersions(out).reverse().map((v) => { return sortVersions(out).reverse().map((v) => {
return { value: v } let label = v;
if (v === experimentalVersion) {
label = `${ v } (experimental)`
}
return {
label,
value: v
};
}); });
}), }),
@ -571,6 +583,9 @@ export default InputTextFile.extend(ClusterDriver, {
return value; return value;
} }
}), }),
experimentalVersion: C.EXPERIMENTAL_VERSIONS.RKE_K8S,
willSave() { willSave() {
if ( get(this, 'registry') === 'custom' ) { if ( get(this, 'registry') === 'custom' ) {
const registry = { const registry = {

79
lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
View File

@ -35,31 +35,30 @@
</div> </div>
{{copy-to-clipboard tooltipText="" buttonText="copyToClipboard.tooltip" clipboardText=value class="with-clip"}} {{copy-to-clipboard tooltipText="" buttonText="copyToClipboard.tooltip" clipboardText=value class="with-clip"}}
{{else}} {{else}}
{{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}} {{#if (and (eq nodeWhich 'custom') (eq mode 'new'))}}
<div class="row"> <div class="row">
<div class="col span-4"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.rke.windowsSupport.label'}}</label> <label class="acc-label">{{t 'clusterNew.rke.windowsSupport.label'}}</label>
<div class="radio"> <div class="radio">
<label> <label>
{{radio-button selection=windowsSupport value=true }} {{radio-button selection=windowsSupport value=true }}
{{t 'generic.enabled'}} {{t 'generic.enabled'}}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
{{radio-button selection=windowsSupport value=false }} {{radio-button selection=windowsSupport value=false }}
{{t 'generic.disabled'}} {{t 'generic.disabled'}}
</label> </label>
</div>
</div> </div>
</div> </div>
</div> {{/if}}
{{/if}}
<div class="row"> <div class="row">
<div class="col span-4"> <div class="col span-4">
<label class="acc-label">{{t 'clusterNew.rke.version.label'}}</label> <label class="acc-label">{{t 'clusterNew.rke.version.label'}}</label>
{{new-select {{new-select
content=versionChoices content=versionChoices
optionLabelPath='value'
value=cluster.rancherKubernetesEngineConfig.kubernetesVersion value=cluster.rancherKubernetesEngineConfig.kubernetesVersion
}} }}
</div> </div>
@ -95,8 +94,8 @@
<div class="radio"> <div class="radio">
<label> <label>
{{!-- {{!--
{{radio-button selection=nginxIngressProvider value="nginx"}} {{radio-button selection=nginxIngressProvider value="nginx"}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="nginx"}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="nginx"}}
{{t 'generic.enabled'}} {{t 'generic.enabled'}}
</label> </label>
@ -104,8 +103,8 @@
<div class="radio"> <div class="radio">
<label> <label>
{{!-- {{!--
{{radio-button selection=nginxIngressProvider value=null}} {{radio-button selection=nginxIngressProvider value=null}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="none"}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.ingress.provider value="none"}}
{{t 'generic.disabled'}} {{t 'generic.disabled'}}
</label> </label>
@ -116,8 +115,8 @@
<div class="radio"> <div class="radio">
<label> <label>
{{!-- {{!--
{{radio-button selection=monitoringProvider value="metrics-server"}} {{radio-button selection=monitoringProvider value="metrics-server"}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="metrics-server"}}
{{t 'generic.enabled'}} {{t 'generic.enabled'}}
</label> </label>
@ -125,8 +124,8 @@
<div class="radio"> <div class="radio">
<label> <label>
{{!-- {{!--
{{radio-button selection=monitoringProvider value=null}} {{radio-button selection=monitoringProvider value=null}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.monitoring.provider value="none"}}
{{t 'generic.disabled'}} {{t 'generic.disabled'}}
</label> </label>
@ -137,8 +136,8 @@
<div class="radio"> <div class="radio">
<label class={{unless model.psps.length 'text-muted'}}> <label class={{unless model.psps.length 'text-muted'}}>
{{!-- {{!--
{{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}} {{radio-button selection=kubeApiPodSecurityPolicy value=true disabled=(not model.psps.length)}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=true disabled=(not model.psps.length)}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=true disabled=(not model.psps.length)}}
{{t 'generic.enabled'}} {{t 'generic.enabled'}}
{{#unless model.psps.length}} {{#unless model.psps.length}}
@ -149,8 +148,8 @@
<div class="radio"> <div class="radio">
<label> <label>
{{!-- {{!--
{{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}} {{radio-button selection=kubeApiPodSecurityPolicy value=false disabled=(not model.psps.length)}}
--}} --}}
{{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=false disabled=(not model.psps.length)}} {{radio-button selection=cluster.rancherKubernetesEngineConfig.services.kubeApi.podSecurityPolicy value=false disabled=(not model.psps.length)}}
{{t 'generic.disabled'}} {{t 'generic.disabled'}}
</label> </label>
@ -241,11 +240,11 @@
{{#accordion-list showExpandAll=false as |al expandFn|}} {{#accordion-list showExpandAll=false as |al expandFn|}}
{{#if windowsSupport}} {{#if windowsSupport}}
{{#accordion-list-item {{#accordion-list-item
title=(t 'clusterNew.rke.system.title') title=(t 'clusterNew.rke.system.title')
detail=(t 'clusterNew.rke.system.detail') detail=(t 'clusterNew.rke.system.detail')
expandOnInit=true expandOnInit=true
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
}} }}
<div class="row"> <div class="row">
<div class="col span-6 text-center mt-0 mb-0"> <div class="col span-6 text-center mt-0 mb-0">
@ -356,11 +355,11 @@
<ul class="list-unstyled"> <ul class="list-unstyled">
<li> <li>
{{#form-user-labels {{#form-user-labels
setLabels=(action 'setLabels') setLabels=(action 'setLabels')
expandAll=al.expandAll expandAll=al.expandAll
expand=(action expandFn) expand=(action expandFn)
detailKey="formUserLabels.nodeDetail" detailKey="formUserLabels.nodeDetail"
as | userLabelArray removeLabel addUserLabel | as | userLabelArray removeLabel addUserLabel |
}} }}
{{#if userLabelArray.length}} {{#if userLabelArray.length}}
<table class="table fixed no-lines mt-20"> <table class="table fixed no-lines mt-20">

4
lib/shared/addon/utils/constants.js
View File

@ -693,4 +693,8 @@ C.NOTIFIER_TABLE_LABEL = {
DEFAULT: 'Notifier', DEFAULT: 'Notifier',
} }
C.EXPERIMENTAL_VERSIONS = {
RKE_K8S: 'v1.12.0-rancher1-1'
}
export default C; export default C;