mirror of https://github.com/rancher/ui.git
Vincent Fiduccia
GitHub
commit
ac9307e52e
|
|
@ -14,7 +14,7 @@ export default Controller.extend({
|
|||
isGithub : equal('access.provider', 'githubconfig'),
|
||||
isActiveDirectory : equal('access.provider', 'ldapconfig'),
|
||||
isOpenLdap : equal('access.provider', 'openldapconfig'),
|
||||
isLocal : equal('access.provider', 'localauthconfig'),
|
||||
isLocal : true, // @TODO-2.0 equal('access.provider', 'localauthconfig'),
|
||||
isAzureAd : equal('access.provider', 'azureadconfig'),
|
||||
isShibboleth : equal('access.provider', 'shibbolethconfig'),
|
||||
isCaas : computed('app.mode', function() {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{login-user-pass action="authenticate" waiting=waiting}}
|
||||
{{#if (or isLocal isActiveDirectory isOpenLdap isAzureAd)}}
|
||||
{{login-user-pass action="authenticate" waiting=waiting}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export default Service.extend({
|
|||
|
||||
// These are set by authenticated/route
|
||||
// Is access control enabled
|
||||
enabled: false, // @TODO-2.0 have auth again someday... null,
|
||||
enabled: true, // @TODO-2.0 remove this, always enabled
|
||||
|
||||
// What kind of access control
|
||||
provider: null,
|
||||
|
|
@ -102,39 +102,50 @@ export default Service.extend({
|
|||
login(code) {
|
||||
var session = this.get('session');
|
||||
|
||||
return this.get('globalStore').rawRequest({
|
||||
url: 'token',
|
||||
method: 'POST',
|
||||
data: {
|
||||
code: code,
|
||||
authProvider: this.get('provider'),
|
||||
},
|
||||
}).then((xhr) => {
|
||||
var auth = xhr.body;
|
||||
var interesting = {};
|
||||
C.TOKEN_TO_SESSION_KEYS.forEach((key) => {
|
||||
if ( typeof auth[key] !== 'undefined' )
|
||||
{
|
||||
interesting[key] = auth[key];
|
||||
}
|
||||
});
|
||||
|
||||
this.get('cookies').setWithOptions(C.COOKIE.TOKEN, auth['jwt'], {
|
||||
path: '/',
|
||||
secure: window.location.protocol === 'https:'
|
||||
});
|
||||
|
||||
session.setProperties(interesting);
|
||||
return xhr;
|
||||
}).catch((res) => {
|
||||
let err;
|
||||
try {
|
||||
err = res.body;
|
||||
} catch(e) {
|
||||
err = {type: 'error', message: 'Error logging in'};
|
||||
}
|
||||
return reject(err);
|
||||
this.get('cookies').setWithOptions('Authentication', btoa(code), {
|
||||
path: '/',
|
||||
secure: window.location.protocol === 'https:'
|
||||
});
|
||||
|
||||
// @TODO-2.0
|
||||
const FALSE = false;
|
||||
if ( FALSE ) {
|
||||
return this.get('globalStore').rawRequest({
|
||||
url: 'token',
|
||||
method: 'POST',
|
||||
data: {
|
||||
code: code,
|
||||
authProvider: this.get('provider'),
|
||||
},
|
||||
}).then((xhr) => {
|
||||
var auth = xhr.body;
|
||||
var interesting = {};
|
||||
C.TOKEN_TO_SESSION_KEYS.forEach((key) => {
|
||||
if ( typeof auth[key] !== 'undefined' )
|
||||
{
|
||||
interesting[key] = auth[key];
|
||||
}
|
||||
});
|
||||
|
||||
this.get('cookies').setWithOptions(C.COOKIE.TOKEN, auth['jwt'], {
|
||||
path: '/',
|
||||
secure: window.location.protocol === 'https:'
|
||||
});
|
||||
|
||||
session.setProperties(interesting);
|
||||
return xhr;
|
||||
}).catch((res) => {
|
||||
let err;
|
||||
try {
|
||||
err = res.body;
|
||||
} catch(e) {
|
||||
err = {type: 'error', message: 'Error logging in'};
|
||||
}
|
||||
return reject(err);
|
||||
});
|
||||
} else {
|
||||
return resolve(true);
|
||||
}
|
||||
},
|
||||
|
||||
clearToken() {
|
||||
|
|
|
|||
|
|
@ -1,92 +1,57 @@
|
|||
import { next, scheduleOnce } from '@ember/runloop';
|
||||
import { next } from '@ember/runloop';
|
||||
import { inject as service } from '@ember/service';
|
||||
import { get, set, observer } from '@ember/object';
|
||||
import Component from '@ember/component';
|
||||
import { parsePortSpec } from 'ui/utils/parse-port';
|
||||
import layout from './template';
|
||||
|
||||
const protocolOptions = [
|
||||
{label: 'TCP', value: 'tcp'},
|
||||
{label: 'UDP', value: 'udp'}
|
||||
{label: 'TCP', value: 'TCP'},
|
||||
{label: 'UDP', value: 'UDP'}
|
||||
];
|
||||
|
||||
export default Component.extend({
|
||||
layout,
|
||||
intl: service(),
|
||||
|
||||
// The initial ports to show, as an array of objects
|
||||
initialPorts : null,
|
||||
initialPorts: null,
|
||||
showIp: null,
|
||||
editing: false,
|
||||
|
||||
// Ignore the ID and force each initial port to be considered 'new' (for clone)
|
||||
editing : false,
|
||||
portsArray : null,
|
||||
ports: null,
|
||||
protocolOptions : protocolOptions,
|
||||
showIp : null,
|
||||
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
|
||||
var out = [];
|
||||
var ports = this.get('initialPorts');
|
||||
if ( ports )
|
||||
{
|
||||
ports.forEach((value) => {
|
||||
if ( typeof value === 'object' )
|
||||
{
|
||||
var pub = '';
|
||||
var existing = !!value.id;
|
||||
if ( value.publicPort )
|
||||
{
|
||||
pub = value.publicPort+'';
|
||||
}
|
||||
let ports = get(this, 'initialPorts');
|
||||
if ( ports ) {
|
||||
ports = ports.map((obj) => {
|
||||
const out = obj.cloneForNew()
|
||||
set(out, 'existing', true);
|
||||
|
||||
if ( value.bindAddress )
|
||||
{
|
||||
next(() => { this.send('showIp'); });
|
||||
}
|
||||
|
||||
out.push({
|
||||
existing: existing,
|
||||
obj: value,
|
||||
bindAddress: value.bindAddress||null,
|
||||
public: pub,
|
||||
private: value.privatePort,
|
||||
protocol: value.protocol,
|
||||
});
|
||||
if ( get(obj, 'hostIP') ) {
|
||||
set(this, 'showIp', true);
|
||||
}
|
||||
else if ( typeof value === 'string' )
|
||||
{
|
||||
// Strings, from clone/edit
|
||||
var parsed = parsePortSpec(value,'tcp');
|
||||
|
||||
if ( parsed.hostIp )
|
||||
{
|
||||
next(() => { this.send('showIp'); });
|
||||
}
|
||||
|
||||
out.push({
|
||||
existing: false,
|
||||
bindAddress: parsed.hostIp,
|
||||
public: parsed.hostPort,
|
||||
private: parsed.container,
|
||||
protocol: parsed.protocol
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
console.error('Unknown port value', value);
|
||||
}
|
||||
return out;
|
||||
});
|
||||
} else {
|
||||
ports = [];
|
||||
}
|
||||
|
||||
scheduleOnce('afterRender', () => {
|
||||
this.set('portsArray', out);
|
||||
this.portsArrayDidChange();
|
||||
});
|
||||
set(this, 'ports', ports);
|
||||
},
|
||||
|
||||
actions: {
|
||||
addPort() {
|
||||
this.get('portsArray').pushObject({public: '', private: '', protocol: 'tcp'});
|
||||
this.get('ports').pushObject(get(this,'store').createRecord({
|
||||
type: 'containerPort',
|
||||
containerPort: '',
|
||||
hostPort: '',
|
||||
hostIP: '',
|
||||
protocol: 'TCP'
|
||||
}));
|
||||
|
||||
next(() => {
|
||||
if ( this.isDestroyed || this.isDestroying ) {
|
||||
return;
|
||||
|
|
@ -97,7 +62,7 @@ export default Component.extend({
|
|||
},
|
||||
|
||||
removePort(obj) {
|
||||
this.get('portsArray').removeObject(obj);
|
||||
this.get('ports').removeObject(obj);
|
||||
},
|
||||
|
||||
showIp() {
|
||||
|
|
@ -105,70 +70,35 @@ export default Component.extend({
|
|||
},
|
||||
},
|
||||
|
||||
portsArrayDidChange: function() {
|
||||
var out = [];
|
||||
this.get('portsArray').forEach(function(row) {
|
||||
if ( !row.protocol ) {
|
||||
return;
|
||||
portsChanged: observer('ports.@each.{containerPort,hostPort,hostIP,protocol}', function() {
|
||||
const errors = [];
|
||||
const seen = {};
|
||||
const intl = get(this, 'intl');
|
||||
const ports = get(this, 'ports');
|
||||
|
||||
ports.forEach((obj) => {
|
||||
let hostIP = obj.hostIP;
|
||||
let containerPort = obj.containerPort;
|
||||
let hostPort = obj.hostPort;
|
||||
let protocol = obj.protocol;
|
||||
|
||||
errors.pushObjects(obj.validationErrors());
|
||||
|
||||
if ( !containerPort && (hostPort || hostIP) ) {
|
||||
errors.push(intl.t('formPorts.error.privateRequired'));
|
||||
}
|
||||
|
||||
let bindAddress = row.bindAddress;
|
||||
if ( bindAddress && bindAddress.indexOf(':') > 0 && bindAddress.indexOf('[') !== 0 ) {
|
||||
// IPv6
|
||||
bindAddress = '[' + bindAddress + ']';
|
||||
if ( hostIP && !hostPort ) {
|
||||
errors.push(intl.t('formPorts.error.publicRequired'));
|
||||
}
|
||||
|
||||
// If there's a public and no private, the private should be the same as public.
|
||||
if ( row.public && !row.private )
|
||||
{
|
||||
let str = row.public +':'+ row.public +'/'+ row.protocol;
|
||||
if ( bindAddress ) {
|
||||
str = bindAddress +':'+ str;
|
||||
}
|
||||
out.push(str);
|
||||
}
|
||||
else if ( row.private )
|
||||
{
|
||||
let str = '';
|
||||
|
||||
if ( row.public )
|
||||
{
|
||||
if ( bindAddress ) {
|
||||
str += bindAddress +':';
|
||||
}
|
||||
|
||||
str += row.public+':';
|
||||
}
|
||||
|
||||
str += row.private +'/'+ row.protocol;
|
||||
out.push(str);
|
||||
}
|
||||
});
|
||||
|
||||
this.sendAction('changed', this.get('portsArray'));
|
||||
this.sendAction('changedStr', out);
|
||||
}.observes('portsArray.@each.{bindAddress,public,private,protocol}'),
|
||||
|
||||
validate: function() {
|
||||
var errors = [];
|
||||
let seen = {};
|
||||
|
||||
this.get('portsArray').forEach((row) => {
|
||||
if ( !row.private && (row.public || row.bindAddress)) {
|
||||
errors.push(this.get('intl').t('formPorts.error.privateRequired'));
|
||||
}
|
||||
|
||||
if ( row.bindAddress && !row.public ) {
|
||||
errors.push(this.get('intl').t('formPorts.error.publicRequired'));
|
||||
}
|
||||
|
||||
if ( row.public ) {
|
||||
let key = '['+ (row.bindAddress||'0.0.0.0') + ']:' + row.public + '/' + row.protocol;
|
||||
if ( hostPort ) {
|
||||
const key = '['+ (hostIP||'0.0.0.0') + ']:' + hostPort + '/' + protocol;
|
||||
if ( seen[key] ) {
|
||||
errors.push(this.get('intl').t('formPorts.error.'+(row.bindAddress ? 'mixedIpPort' : 'mixedPort'), {
|
||||
ip: row.bindAddress,
|
||||
port: row.public,
|
||||
proto: row.protocol,
|
||||
errors.push(intl.t('formPorts.error.'+(hostIP ? 'mixedIpPort' : 'mixedPort'), {
|
||||
ip: hostIP,
|
||||
port: hostPort,
|
||||
proto: protocol
|
||||
}));
|
||||
} else {
|
||||
seen[key] = true;
|
||||
|
|
@ -177,5 +107,6 @@ export default Component.extend({
|
|||
});
|
||||
|
||||
this.set('errors', errors.uniq());
|
||||
}.observes('portsArray.@each.{bindAddress,public,private,protocol}'),
|
||||
this.sendAction('changed', ports.slice());
|
||||
}),
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="clearfix {{unless editing 'box'}}">
|
||||
<label class="{{if editing 'acc-label'}}">{{t 'formPorts.header'}}</label>
|
||||
{{#if (and portsArray.length (not showIp))}}
|
||||
{{#if (and ports.length (not showIp))}}
|
||||
{{#if editing}}
|
||||
<div class="pull-right text-small">
|
||||
<a role="button" class="btn bg-transparent p-0" {{action "showIp"}}>
|
||||
|
|
@ -10,40 +10,40 @@
|
|||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{#if portsArray.length}}
|
||||
{{#if ports.length}}
|
||||
<table class="table fixed no-lines small mb-10">
|
||||
<thead>
|
||||
<tr class="hidden-sm">
|
||||
{{#if showIp}}
|
||||
<th>{{t 'formPorts.bindAddress.label'}}</th>
|
||||
<th>{{t 'formPorts.hostIp.label'}}</th>
|
||||
<th width="10"></th>
|
||||
{{/if}}
|
||||
|
||||
<th class="{{unless editing 'acc-label'}}">{{t 'formPorts.public.label'}}</th>
|
||||
<th class="{{unless editing 'acc-label'}}">{{t 'formPorts.hostPort.label'}}</th>
|
||||
<th width="10"></th>
|
||||
<th class="{{unless editing 'acc-label'}}">{{t 'formPorts.private.label'}}{{#if editing}}{{field-required}}{{/if}}</th>
|
||||
<th class="{{unless editing 'acc-label'}}">{{t 'formPorts.containerPort.label'}}{{#if editing}}{{field-required}}{{/if}}</th>
|
||||
<th width="10"></th>
|
||||
<th class="{{unless editing 'acc-label'}}" width="80">{{t 'formPorts.protocol.label'}}</th>
|
||||
<th width="40"> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each portsArray as |port|}}
|
||||
{{#each ports as |port|}}
|
||||
<tr>
|
||||
{{#if showIp}}
|
||||
<td data-title="{{t 'formPorts.public.label'}}">
|
||||
<td data-title="{{t 'formPorts.hostPort.label'}}">
|
||||
{{#if port.existing}}
|
||||
{{#if port.bindAddress}}
|
||||
{{port.bindAddress}}
|
||||
{{#if port.hostIP}}
|
||||
{{port.hostIP}}
|
||||
{{else}}
|
||||
<span class="text-muted">{{t 'generic.any'}}</span>
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{#if editing}}
|
||||
{{input class="form-control input-sm" type="text" value=port.bindAddress placeholder=(t 'formPorts.bindAddress.placeholder')}}
|
||||
{{input class="form-control input-sm" type="text" value=port.hostIP placeholder=(t 'formPorts.hostIp.placeholder')}}
|
||||
{{else}}
|
||||
{{#if port.bindAddress}}
|
||||
{{port.bindAddress}}
|
||||
{{#if port.hostIP}}
|
||||
{{port.hostIP}}
|
||||
{{else}}
|
||||
<span class="text-muted">{{t 'generic.na'}}</span>
|
||||
{{/if}}
|
||||
|
|
@ -54,23 +54,23 @@
|
|||
<td> </td>
|
||||
{{/if}}
|
||||
|
||||
<td data-title="{{t 'formPorts.public.label'}}">
|
||||
<td data-title="{{t 'formPorts.hostPort.label'}}">
|
||||
{{#if editing}}
|
||||
{{input-integer class="form-control input-sm public" min="1" max="65535" value=port.public placeholder=(t 'formPorts.public.placeholder')}}
|
||||
{{input-integer class="form-control input-sm public" min="1" max="65535" value=port.hostPort placeholder=(t 'formPorts.hostPort.placeholder')}}
|
||||
{{else}}
|
||||
{{port.public}}
|
||||
{{port.hostPort}}
|
||||
{{/if}}
|
||||
</td>
|
||||
<td> </td>
|
||||
|
||||
<td data-title="{{t 'formPorts.private.label'}}">
|
||||
<td data-title="{{t 'formPorts.containerPort.label'}}">
|
||||
{{#if port.existing}}
|
||||
<div class="text-muted">{{port.private}}</div>
|
||||
<div class="text-muted">{{port.containerPort}}</div>
|
||||
{{else}}
|
||||
{{#if editing}}
|
||||
{{input-integer class="form-control input-sm" min="1" max="65535" value=port.private placeholder=(t 'formPorts.private.placeholder')}}
|
||||
{{input-integer class="form-control input-sm" min="1" max="65535" value=port.containerPort placeholder=(t 'formPorts.containerPort.placeholder')}}
|
||||
{{else}}
|
||||
{{port.private}}
|
||||
{{port.containerPort}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -56,10 +56,10 @@
|
|||
<div class="row">
|
||||
<div class="col span-11-of-23 mt-0 mb-0">
|
||||
{{container/form-ports
|
||||
initialPorts=launchConfig.ports
|
||||
errors=portErrors
|
||||
changedStr=(action (mut launchConfig.ports))
|
||||
editing=true
|
||||
initialPorts=launchConfig.ports
|
||||
changed=(action (mut launchConfig.ports))
|
||||
errors=portErrors
|
||||
editing=true
|
||||
}}
|
||||
</div>
|
||||
<div class="col span-11-of-23 mt-0 mb-0 offset-1-of-23">
|
||||
|
|
|
|||
|
|
@ -6,151 +6,150 @@
|
|||
expandAll=expandAll
|
||||
expand=(action expandFn)
|
||||
}}
|
||||
{{#if scope.current.isWindows}}
|
||||
<div class="text-center p-20">Healthcheck support is not currently available for Windows.</div>
|
||||
{{#if editing}}
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="none"}} {{t 'formHealthCheck.checkType.none'}}</label>
|
||||
</div>
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="tcp"}} {{t 'formHealthCheck.checkType.tcp'}}</label>
|
||||
</div>
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="http"}} {{t 'formHealthCheck.checkType.http'}}</label>
|
||||
</div>
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="command"}} {{t 'formHealthCheck.checkType.http'}}</label>
|
||||
</div>
|
||||
{{else}}
|
||||
{{#if editing}}
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="none"}} {{t 'formHealthCheck.checkType.none'}}</label>
|
||||
</div>
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="tcp"}} {{t 'formHealthCheck.checkType.tcp'}}</label>
|
||||
</div>
|
||||
<div class="radio input">
|
||||
<label>{{radio-button selection=checkType value="http"}} {{t 'formHealthCheck.checkType.http'}}</label>
|
||||
{{#if checkType}}
|
||||
<div>
|
||||
<label class="acc-label">{{t 'generic.type'}}:</label>
|
||||
{{checkType}}
|
||||
</div>
|
||||
{{else}}
|
||||
{{#if checkType}}
|
||||
<div>
|
||||
<label class="acc-label">{{t 'generic.type'}}:</label>
|
||||
{{checkType}}
|
||||
</div>
|
||||
{{else}}
|
||||
<div>{{t 'generic.none'}}</div>
|
||||
{{/if}}
|
||||
<div>{{t 'generic.none'}}</div>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq checkType "http")}}
|
||||
<div class="row">
|
||||
<div class="col {{if showUriHost 'span-6' 'span-12'}}">
|
||||
<label class="acc-label">{{t 'formHealthCheck.request.label'}}{{field-required}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.requestLine}}
|
||||
<div class="input-group">
|
||||
<div class="input-group-btn bg-default ">
|
||||
<button type="button" class="btn bg-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriMethod}} <i class="icon icon-chevron-down"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li role="presentation" class="dropdown-header">
|
||||
{{t 'formHealthCheck.method.prompt'}}
|
||||
{{#if (eq checkType "http")}}
|
||||
<div class="row">
|
||||
<div class="col {{if showUriHost 'span-6' 'span-12'}}">
|
||||
<label class="acc-label">{{t 'formHealthCheck.request.label'}}{{field-required}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.requestLine}}
|
||||
<div class="input-group">
|
||||
<div class="input-group-btn bg-default ">
|
||||
<button type="button" class="btn bg-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriMethod}} <i class="icon icon-chevron-down"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li role="presentation" class="dropdown-header">
|
||||
{{t 'formHealthCheck.method.prompt'}}
|
||||
</li>
|
||||
{{#each uriMethodChoices as |choice|}}
|
||||
<li {{action "chooseUriMethod" choice}}>
|
||||
<a href="#">{{choice}}</a>
|
||||
</li>
|
||||
{{#each uriMethodChoices as |choice|}}
|
||||
<li {{action "chooseUriMethod" choice}}>
|
||||
<a href="#">{{choice}}</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{{input type="text" classNames="form-control" placeholder=(t 'formHealthCheck.path.placeholder') value=uriPath}}
|
||||
|
||||
<div class="input-group-btn bg-default">
|
||||
<button type="button" class="btn bg-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriVersion}} <i class="icon icon-chevron-down"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li role="presentation" class="dropdown-header">
|
||||
{{t 'formHealthCheck.version.prompt'}}
|
||||
</li>
|
||||
{{#each uriVersionChoices as |choice|}}
|
||||
<li {{action "chooseUriVersion" choice}}>
|
||||
<a href="#">{{choice}}</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
{{#if showUriHost}}
|
||||
<div class="col span-6">
|
||||
<label class="acc-label">{{t 'formHealthCheck.host.label'}}</label>
|
||||
{{#input-or-display editable=editing value=uriHost}}
|
||||
{{input type="text" classNames="form-control" placeholder=(t 'formHealthCheck.host.placeholder') value=uriHost}}
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{input type="text" classNames="form-control" placeholder=(t 'formHealthCheck.path.placeholder') value=uriPath}}
|
||||
|
||||
<div class="input-group-btn bg-default">
|
||||
<button type="button" class="btn bg-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">{{uriVersion}} <i class="icon icon-chevron-down"></i></button>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li role="presentation" class="dropdown-header">
|
||||
{{t 'formHealthCheck.version.prompt'}}
|
||||
</li>
|
||||
{{#each uriVersionChoices as |choice|}}
|
||||
<li {{action "chooseUriVersion" choice}}>
|
||||
<a href="#">{{choice}}</a>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if (not-eq checkType "none")}}
|
||||
<div class="row">
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.port.label'}}{{field-required}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.port}}
|
||||
{{input-integer min="1" max="65535" classNames="form-control" placeholder=(t 'formHealthCheck.port.placeholder') value=healthCheck.port}}
|
||||
{{#if showUriHost}}
|
||||
<div class="col span-6">
|
||||
<label class="acc-label">{{t 'formHealthCheck.host.label'}}</label>
|
||||
{{#input-or-display editable=editing value=uriHost}}
|
||||
{{input type="text" classNames="form-control" placeholder=(t 'formHealthCheck.host.placeholder') value=uriHost}}
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.interval.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.interval}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1000 classNames="form-control" value=healthCheck.interval}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.interval.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.timeout.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.responseTimeout}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=100 classNames="form-control" value=healthCheck.responseTimeout}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.timeout.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
{{#if (not-eq checkType "none")}}
|
||||
<div class="row">
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.port.label'}}{{field-required}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.port}}
|
||||
{{input-integer min="1" max="65535" classNames="form-control" placeholder=(t 'formHealthCheck.port.placeholder') value=healthCheck.port}}
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.initializingTimeout.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.initializingTimeout}}
|
||||
<div class="input-group">
|
||||
{{input-integer step=100 classNames="form-control" value=healthCheck.initializingTimeout}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.initializingTimeout.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.healthyThreshold.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.healthyThreshold}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1 classNames="form-control" value=healthCheck.healthyThreshold}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.healthyThreshold.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.unhealthyThreshold.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.unhealthyThreshold}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1 classNames="form-control" value=healthCheck.unhealthyThreshold}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.unhealthyThreshold.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{#if (and isService showStrategy)}}
|
||||
<label class="acc-label mt-20">{{t 'formHealthCheck.strategy.label'}}</label>
|
||||
{{#input-or-display editable=editing value=strategy}}
|
||||
<div class="radio">
|
||||
<label>{{radio-button selection=strategy value="none"}} {{t 'formHealthCheck.strategy.none'}}</label>
|
||||
</div>
|
||||
<div class="radio">
|
||||
<label>{{radio-button selection=strategy value="recreate"}} {{t 'formHealthCheck.strategy.recreate'}}</label>
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.interval.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.interval}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1000 classNames="form-control" value=healthCheck.interval}}
|
||||
<span class="input-group-addon bg-default">{{t 'generic.seconds'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col span-4 box">
|
||||
<label class="acc-label">{{t 'formHealthCheck.timeout.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.responseTimeout}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=100 classNames="form-control" value=healthCheck.responseTimeout}}
|
||||
<span class="input-group-addon bg-default">{{t 'generic.seconds'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.initialDelaySeconds.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.initialDelaySeconds}}
|
||||
<div class="input-group">
|
||||
{{input-integer step=100 classNames="form-control" value=healthCheck.initialDelaySeconds}}
|
||||
<span class="input-group-addon bg-default">{{t 'generic.seconds'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.successThreshold.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.successThreshold}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1 classNames="form-control" value=healthCheck.successThreshold}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.successThreshold.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
<div class="col box span-4">
|
||||
<label class="acc-label">{{t 'formHealthCheck.failureTheshold.label'}}</label>
|
||||
{{#input-or-display editable=editing value=healthCheck.failureTheshold}}
|
||||
<div class="input-group">
|
||||
{{input-integer min=1 step=1 classNames="form-control" value=healthCheck.failureTheshold}}
|
||||
<span class="input-group-addon bg-default">{{t 'formHealthCheck.failureTheshold.unit'}}</span>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{#if (and isService showStrategy)}}
|
||||
<label class="acc-label mt-20">{{t 'formHealthCheck.strategy.label'}}</label>
|
||||
{{#input-or-display editable=editing value=strategy}}
|
||||
<div class="radio">
|
||||
<label>{{radio-button selection=strategy value="none"}} {{t 'formHealthCheck.strategy.none'}}</label>
|
||||
</div>
|
||||
<div class="radio">
|
||||
<label>{{radio-button selection=strategy value="recreate"}} {{t 'formHealthCheck.strategy.recreate'}}</label>
|
||||
</div>
|
||||
{{/input-or-display}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
{{/accordion-list-item}}
|
||||
|
|
|
|||
|
|
@ -87,30 +87,39 @@ export default Mixin.create({
|
|||
return;
|
||||
}
|
||||
|
||||
let store = this.get('store');
|
||||
const projectStore = this.get('store');
|
||||
const clusterStore = this.get('clusterStore');
|
||||
const globalStore = this.get('globalStore');
|
||||
|
||||
let count = 0;
|
||||
let event = queue.dequeue();
|
||||
let projectId, clusterId, type;
|
||||
|
||||
Ember.beginPropertyChanges();
|
||||
while ( event ) {
|
||||
let resource;
|
||||
if ( event.data ) {
|
||||
resource = store._typeify(event.data);
|
||||
if ( !event.data ) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( resource ) {
|
||||
let type = get(resource,'type');
|
||||
let key = type+'Changed';
|
||||
projectId = get(event.data, 'projectId');
|
||||
clusterId = get(event.data, 'clusterId');
|
||||
type = get(event.data, 'type');
|
||||
|
||||
// Fire [thing]Changed() method if present
|
||||
if ( this[key] ) {
|
||||
this[key](event);
|
||||
}
|
||||
// console.log('Change', type +':'+ event.data.id, clusterId, projectId);
|
||||
|
||||
// Remove from store if the resource is removed
|
||||
if ( C.REMOVEDISH_STATES.includes(resource.state) ) {
|
||||
store._remove(type, resource);
|
||||
}
|
||||
if ( projectId && projectStore.hasType(type) ) {
|
||||
// console.log(' Update project store', type, event.data.id, projectId);
|
||||
updateStore(projectStore, event.data);
|
||||
}
|
||||
|
||||
if ( clusterId && clusterStore.hasType(type) ) {
|
||||
// console.log(' Update cluster store', type, event.data.id, clusterId);
|
||||
updateStore(clusterStore, event.data);
|
||||
}
|
||||
|
||||
if ( globalStore.hasType(type) ) {
|
||||
// console.log(' Update global store', type, event.data.id);
|
||||
updateStore(globalStore, event.data);
|
||||
}
|
||||
|
||||
count++;
|
||||
|
|
@ -118,6 +127,26 @@ export default Mixin.create({
|
|||
}
|
||||
Ember.endPropertyChanges();
|
||||
console.log('Processed',count,'change events');
|
||||
|
||||
function updateStore(store, data) {
|
||||
const resource = store._typeify(data);
|
||||
if ( resource ) {
|
||||
// Not used by anything anymore
|
||||
//let type = get(resource,'type');
|
||||
//let key = type+'Changed';
|
||||
//
|
||||
//// Fire [thing]Changed() method if present
|
||||
//if ( this[key] ) {
|
||||
// this[key](event);
|
||||
//}
|
||||
|
||||
// Remove from store if the resource is removed
|
||||
if ( C.REMOVEDISH_STATES.includes(resource.state) ) {
|
||||
const type = get(resource,'type');
|
||||
store._remove(type, resource);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
connectSubscribe() {
|
||||
|
|
|
|||
|
|
@ -151,7 +151,8 @@ export default Service.extend(Evented, {
|
|||
|
||||
if ( this.get('access.enabled') )
|
||||
{
|
||||
str += `|Access|\`${this.get('access.provider').replace(/config/,'')}\` ${this.get('access.admin') ? '\`admin\`' : ''}|\n`;
|
||||
let provider = (this.get('access.provider')||'').replace(/config/,'');
|
||||
str += `|Access|\`${provider}\` ${this.get('access.admin') ? '\`admin\`' : ''}|\n`;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ var C = {
|
|||
COMMUNITY_KEY: 'community',
|
||||
COMMUNITY_VALUE: 'https://git.rancher.io/community-catalog.git',
|
||||
DEFAULT_BRANCH: 'master',
|
||||
LIBRARY_BRANCH: '${RELEASE}',
|
||||
COMMUNITY_BRANCH: '${RELEASE}',
|
||||
LIBRARY_BRANCH: '2.0-development', // @TODO-2.0 '${RELEASE}',
|
||||
COMMUNITY_BRANCH: '2.0-development', // @TODO-2.0 '${RELEASE}',
|
||||
},
|
||||
|
||||
COOKIE: {
|
||||
|
|
|
|||
|
|
@ -2010,42 +2010,37 @@ formHealthCheck:
|
|||
none: None
|
||||
tcp: Check that a TCP connection opens successfully
|
||||
http: Check that a HTTP request responds with a successful status code (2xx or 3xx)
|
||||
request:
|
||||
https: Check that a HTTPS request responds with a successful status code
|
||||
command: Check that a command run inside the container exits successfully (exit code 0)
|
||||
command:
|
||||
label: Command
|
||||
placeholder: e.g. cat /tmp/health
|
||||
http:
|
||||
label: HTTP Request
|
||||
method:
|
||||
prompt: "Select a HTTP Method:"
|
||||
path:
|
||||
placeholder: Request Path e.g. /healthcheck
|
||||
version:
|
||||
prompt: "Select a HTTP Version:"
|
||||
host:
|
||||
label: Host Header
|
||||
placeholder: e.g. www.example.com
|
||||
path:
|
||||
placeholder: Request Path e.g. /healthcheck
|
||||
headers:
|
||||
label: Host Header
|
||||
port:
|
||||
label: Listening Port
|
||||
label: Target Container Port
|
||||
placeholder: e.g. 80
|
||||
initializingTimeout:
|
||||
label: Initializing Timeout
|
||||
initialDelaySeconds:
|
||||
label: Delay before initial check
|
||||
unit: ms
|
||||
reinitializingTimeout:
|
||||
label: Reinitializing Timeout
|
||||
unit: ms
|
||||
interval:
|
||||
periodSeconds:
|
||||
label: Check Interval
|
||||
unit: ms
|
||||
timeout:
|
||||
timeoutSeconds:
|
||||
label: Check Timeout
|
||||
unit: ms
|
||||
healthyThreshold:
|
||||
successThreshold:
|
||||
label: Healthy After
|
||||
unit: successes
|
||||
unhealthyThreshold:
|
||||
failureTheshold:
|
||||
label: Unhealthy After
|
||||
unit: failures
|
||||
strategy:
|
||||
label: When Unhealthy
|
||||
none: Take no action
|
||||
recreate: Delete container and schedule a replacement
|
||||
|
||||
formKeyValue:
|
||||
addAction: Add Pair
|
||||
|
|
@ -2141,13 +2136,13 @@ formNetwork:
|
|||
formPorts:
|
||||
header: Port Mapping
|
||||
addAction: Add Port
|
||||
bindAddress:
|
||||
hostIp:
|
||||
label: Host IP
|
||||
placeholder: "Default: All"
|
||||
public:
|
||||
hostPort:
|
||||
label: Host Port
|
||||
placeholder: "e.g. 80"
|
||||
private:
|
||||
containerPort:
|
||||
label: Container Port
|
||||
placeholder: "e.g. 8080"
|
||||
protocol:
|
||||
|
|
|
|||
Loading…
Reference in New Issue