diff --git a/.drone.yml b/.drone.yml index 3eb2094386..79cf173991 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,31 +1,19 @@ --- -pipeline: - build: - privileged: true - image: rancher/dind:v0.3.0 - commands: - - ENABLE_DOCKER=true UPLOAD_LATEST=true ./scripts/ci - when: - branch: "master" - event: - exclude: [pull_request] +kind: pipeline +name: default - build: - privileged: true - image: rancher/dind:v0.3.0 - commands: - - ENABLE_DOCKER=true ./scripts/ci - when: - branch: - exclude: ["master"] +platform: + os: linux + arch: amd64 - # Needs envvar SLACK_TOKEN - # slack_blame: - # image: plugins/slack-blame - # channel: ui - # success_template: | - # {{repo.owner}}/{{repo.name}} branch: {{build.branch}} commit: {{build.commit}} by {{build.author}} <{{build.email}}> - {{commit.message}} - {{build.link}} - # failure_template: | - # {{repo.owner}}/{{repo.name}} branch: {{build.branch}} commit: {{build.commit}} by {{build.author}} <{{build.email}}> - {{commit.message}} - {{build.link}} - # when: - # status: [ success, failure ] +steps: +- name: build + pull: default + image: rancher/dind:v0.3.0 + commands: + - ENABLE_DOCKER=true ./scripts/ci + privileged: true + when: + branch: + exclude: + - master diff --git a/.drone.yml.sig b/.drone.yml.sig deleted file mode 100644 index f9337b094b..0000000000 --- a/.drone.yml.sig +++ /dev/null @@ -1 +0,0 @@ -eyJhbGciOiJIUzI1NiJ9.LS0tCnBpcGVsaW5lOgogIGJ1aWxkOgogICAgcHJpdmlsZWdlZDogdHJ1ZQogICAgaW1hZ2U6IHJhbmNoZXIvZGluZDp2MC4zLjAKICAgIGNvbW1hbmRzOgogICAgICAtIEVOQUJMRV9ET0NLRVI9dHJ1ZSBVUExPQURfTEFURVNUPXRydWUgLi9zY3JpcHRzL2NpCiAgICB3aGVuOgogICAgICBicmFuY2g6ICJtYXN0ZXIiCgogIGJ1aWxkOgogICAgcHJpdmlsZWdlZDogdHJ1ZQogICAgaW1hZ2U6IHJhbmNoZXIvZGluZDp2MC4zLjAKICAgIGNvbW1hbmRzOgogICAgICAtIEVOQUJMRV9ET0NLRVI9dHJ1ZSAuL3NjcmlwdHMvY2kKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgIGV4Y2x1ZGU6IFsibWFzdGVyIl0KCiAgIyBOZWVkcyBlbnZ2YXIgU0xBQ0tfVE9LRU4KICBzbGFja19ibGFtZToKICAgIGltYWdlOiBwbHVnaW5zL3NsYWNrLWJsYW1lCiAgICBjaGFubmVsOiB1aQogICAgc3VjY2Vzc190ZW1wbGF0ZTogfAogICAgICB7e3JlcG8ub3duZXJ9fS97e3JlcG8ubmFtZX19IGJyYW5jaDoge3tidWlsZC5icmFuY2h9fSBjb21taXQ6IHt7YnVpbGQuY29tbWl0fX0gYnkge3tidWlsZC5hdXRob3J9fSA8e3tidWlsZC5lbWFpbH19PiAtIHt7Y29tbWl0Lm1lc3NhZ2V9fSAtIHt7YnVpbGQubGlua319CiAgICBmYWlsdXJlX3RlbXBsYXRlOiB8CiAgICAgIHt7cmVwby5vd25lcn19L3t7cmVwby5uYW1lfX0gYnJhbmNoOiB7e2J1aWxkLmJyYW5jaH19IGNvbW1pdDoge3tidWlsZC5jb21taXR9fSBieSB7e2J1aWxkLmF1dGhvcn19IDx7e2J1aWxkLmVtYWlsfX0-IC0ge3tjb21taXQubWVzc2FnZX19IC0ge3tidWlsZC5saW5rfX0KICAgIHdoZW46CiAgICAgIHN0YXR1czogWyBzdWNjZXNzLCBmYWlsdXJlIF0K.i-6uAYLW2NP_4WsLX9Go-FjNIFpJFB9UPAuKI9_APwk \ No newline at end of file diff --git a/.gitignore b/.gitignore index 67d8248d10..e978ca01fc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /coverage/* /libpeerconnection.log npm-debug.log +package-lock.json testem.log .DS_Store .tern-port diff --git a/app/admin-tab/auth/activedirectory/controller.js b/app/admin-tab/auth/activedirectory/controller.js index d1a818f978..0868693f18 100644 --- a/app/admin-tab/auth/activedirectory/controller.js +++ b/app/admin-tab/auth/activedirectory/controller.js @@ -3,81 +3,154 @@ import Errors from 'ui/utils/errors'; import C from 'ui/utils/constants'; var PLAIN_PORT = 389; -var TLS_PORT = 636; +var TLS_PORT = 636; export default Ember.Controller.extend({ - access: Ember.inject.service(), - settings: Ember.inject.service(), + access: Ember.inject.service(), + settings: Ember.inject.service(), confirmDisable: false, - errors: null, - testing: false, + errors: null, + testing: false, - providerName: 'ldap.providerName.ad', - userType: C.PROJECT.TYPE_LDAP_USER, - groupType: C.PROJECT.TYPE_LDAP_GROUP, + providerName: 'ldap.providerName.ad', + userType: C.PROJECT.TYPE_LDAP_USER, + groupType: C.PROJECT.TYPE_LDAP_GROUP, + ldapConfig: Ember.computed.alias('model.ldapConfig'), - addUserInput: '', - addOrgInput: '', + addUserInput: '', + addOrgInput: '', - username: '', - password: '', + username: '', + password: '', + editing: false, + advancedOpen: false, - createDisabled: function() { + createDisabled: Ember.computed('username.length','password.length', function() { return !this.get('username.length') || !this.get('password.length'); - }.property('username.length','password.length'), + }), - numUsers: function() { + numUsers: Ember.computed('model.allowedIdentities.@each.externalIdType','userType','groupType', function() { return (this.get('model.allowedIdentities')||[]).filterBy('externalIdType', this.get('userType')).get('length'); - }.property('model.allowedIdentities.@each.externalIdType','userType','groupType'), + }), - numGroups: function() { + numGroups: Ember.computed('model.allowedIdentities.@each.externalIdType','userType','groupType', function() { return (this.get('model.allowedIdentities')||[]).filterBy('externalIdType', this.get('groupType')).get('length'); - }.property('model.allowedIdentities.@each.externalIdType','userType','groupType'), + }), - tlsChanged: function() { - var on = this.get('model.tls'); - var port = parseInt(this.get('model.port'),10); + canEdit: Ember.computed('access.enabled', 'editing', function() { + var isEnabled = this.get('access.enabled'); + var editing = this.get('editing'); + + if (( isEnabled && editing ) || !isEnabled) { + return true; + } else if (isEnabled && !editing) { + return false; + } + + }), + + tlsChanged: Ember.observer('ldapConfig.tls', function() { + var on = this.get('ldapConfig.tls'); + var port = parseInt(this.get('ldapConfig.port'),10); if ( on && port === PLAIN_PORT ) { - this.set('model.port', TLS_PORT); + this.set('ldapConfig.port', TLS_PORT); } else if ( !on && port === TLS_PORT ) { - this.set('model.port', PLAIN_PORT); + this.set('ldapConfig.port', PLAIN_PORT); } - }.observes('model.tls'), + }), + + testConfig: function(data) { + return this.get('authStore').request({ + url: 'testlogin', + method: 'POST', + data: data, + }); + }, + actions: { + showAdvanced: function() { + let open = this.get('advancedOpen'); + + if (open) { + Ember.$('.custom-schema').hide(); + this.set('advancedOpen', false); + } else { + Ember.$('.custom-schema').show(); + this.set('advancedOpen', true); + } + + }, + edit: function() { + this.toggleProperty('editing'); + this.set('originalModel', this.get('model').clone()); + this.set('username', this.get('model.identity.login')); + }, + cancel: function() { + this.send('clearError'); + this.set('editing', false); + this.set('model', this.get('originalModel')); + }, test: function() { this.send('clearError'); - var model = this.get('model'); - model.setProperties({ - enabled: false, - 'accessMode': 'unrestricted', - }); + let model = this.get('model'); + let editing = this.get('editing'); + + if (!editing) { + model.setProperties({ + 'provider' : 'ldapconfig', + 'enabled' : false, // It should already be, but just in case.. + 'accessMode' : 'unrestricted', + 'allowedIdentities' : [], + }); + } var errors = model.validationErrors(); - if ( errors.get('length') ) - { + + + let data = { + type: 'testAuthConfig', + authConfig: model, + code: `:${this.get('password')}`, + }; + + if ( errors.get('length') ) { this.set('errors', errors); - } - else - { + } else { this.set('testing', true); - model.save().then(() => { - this.send('authenticate'); - }).catch(err => { - this.send('gotError', err); - }); + + if (editing) { + this.testConfig(data).then(() => { + model.save().then(() => { + this.send('waitAndRefresh'); + }).catch((err) => { + this.send('gotError', err); + }); + }).catch((err) => { + this.send('gotError', err); + }); + } else { + this.set('testing', true); + model.save().then(() => { + this.send('authenticate'); + }).catch(err => { + this.send('gotError', err); + }); + } } }, authenticate: function() { this.send('clearError'); - var code = this.get('username')+':'+this.get('password'); + + var code = `${this.get('username')}:${this.get('password')}`; + this.get('access').login(code).then(res => { this.send('authenticationSucceeded', res.body); }).catch(err => { @@ -93,9 +166,10 @@ export default Ember.Controller.extend({ this.set('access.enabled', true); var model = this.get('model'); + model.setProperties({ - 'enabled': true, - 'accessMode': 'unrestricted', + 'enabled': true, + 'accessMode': 'unrestricted', 'allowedIdentities': [auth.userIdentity], }); @@ -109,6 +183,7 @@ export default Ember.Controller.extend({ waitAndRefresh: function(url) { $('#loading-underlay, #loading-overlay').removeClass('hide').show(); + setTimeout(function() { window.location.href = url || window.location.href; }, 1000); diff --git a/app/admin-tab/auth/activedirectory/route.js b/app/admin-tab/auth/activedirectory/route.js index 93ef885058..dd53f91960 100644 --- a/app/admin-tab/auth/activedirectory/route.js +++ b/app/admin-tab/auth/activedirectory/route.js @@ -2,33 +2,39 @@ import Ember from 'ember'; export default Ember.Route.extend({ resourceType: 'ldapconfig', + access: Ember.inject.service(), - model: function() { + model: function () { + return this.get('authStore').find('config', null, { + forceReload: true + }).then((collection) => { - return this.get('userStore').find(this.get('resourceType'), null, {forceReload: true}).then((collection) => { - var existing = collection.get('firstObject'); + if (!collection.enabled) { + let existing = this.get('authStore').createRecord(collection.ldapConfig, {type: 'ldapconfig'}); + let defaults = this.get('authStore').getById('schema', this.get('resourceType')).get('resourceFields'); - // On install the initial ldapconfig is empty. For any fields that are empty, fill in the default from the schema. - var defaults = this.get('userStore').getById('schema',this.get('resourceType')).get('resourceFields'); - Object.keys(defaults).forEach((key) => { - var field = defaults[key]; - if ( field && field.default && !existing.get(key) ) - { - existing.set(key, field.default); - } - }); + Object.keys(defaults).forEach((key) => { + var field = defaults[key]; + if (field && field.default && !existing.get(key)) { + existing.set(key, field.default); + } + }); - return existing; + collection.ldapConfig = existing; + } else { + collection.identity = this.get('access.identity'); + } + return collection; }); }, - setupController: function(controller, model) { + setupController: function (controller, model) { controller.setProperties({ - model: model, + model: model, confirmDisable: false, - testing: false, - organizations: this.get('session.orgs')||[], - errors: null, + testing: false, + organizations: this.get('session.orgs') || [], + errors: null, }); } }); diff --git a/app/admin-tab/auth/azuread/template.hbs b/app/admin-tab/auth/azuread/template.hbs index d46529aad4..3c80988340 100644 --- a/app/admin-tab/auth/azuread/template.hbs +++ b/app/admin-tab/auth/azuread/template.hbs @@ -57,22 +57,6 @@ - -
-
-
- - {{input type="text" value=model.adminAccountUsername placeholder=(t 'authPage.azuread.configure.adminAccountUsername.placeholder') classNames="form-control"}} -

{{t 'authPage.azuread.configure.adminAccountUsername.help'}}

-
-
-
-
- - {{input type="password" value=model.adminAccountPassword classNames="form-control"}} -
-
-
diff --git a/app/admin-tab/auth/github/route.js b/app/admin-tab/auth/github/route.js index b0ddbe40c7..1098457585 100644 --- a/app/admin-tab/auth/github/route.js +++ b/app/admin-tab/auth/github/route.js @@ -14,7 +14,8 @@ export default Ember.Route.extend({ testing: false, organizations: this.get('session.orgs')||[], errors: null, - isEnterprise: (model.get('hostname') ? true : false), + isEnterprise: (model.get('githubConfig.hostname') ? true : false), + secure: model.get('githubConfig.scheme') === 'https://' }); controller.set('saved',true); diff --git a/app/admin-tab/auth/openldap/controller.js b/app/admin-tab/auth/openldap/controller.js index 4fbefdf93e..e115849673 100644 --- a/app/admin-tab/auth/openldap/controller.js +++ b/app/admin-tab/auth/openldap/controller.js @@ -1,9 +1,71 @@ +import Ember from 'ember'; import ActiveDirectory from 'ui/admin-tab/auth/activedirectory/controller'; + import C from 'ui/utils/constants'; export default ActiveDirectory.extend({ providerName: 'ldap.providerName.openldap', - isOpenLdap: true, - userType: C.PROJECT.TYPE_OPENLDAP_USER, - groupType: C.PROJECT.TYPE_OPENLDAP_GROUP, + isOpenLdap: true, + userType: C.PROJECT.TYPE_OPENLDAP_USER, + groupType: C.PROJECT.TYPE_OPENLDAP_GROUP, + ldapConfig: Ember.computed.alias('model'), + actions: { + test: function() { + this.send('clearError'); + + var model = this.get('model'); + model.setProperties({ + enabled: false, + 'accessMode': 'unrestricted', + }); + + var errors = model.validationErrors(); + if ( errors.get('length') ) + { + this.set('errors', errors); + } + else + { + this.set('testing', true); + model.save().then(() => { + this.send('authenticate'); + }).catch(err => { + this.send('gotError', err); + }); + } + }, + + authenticate: function() { + this.send('clearError'); + var code = this.get('username')+':'+this.get('password'); + + this.get('access').login(code).then(res => { + this.send('authenticationSucceeded', res.body); + }).catch(err => { + this.send('gotError', err); + }); + }, + + authenticationSucceeded: function(auth) { + this.send('clearError'); + this.set('organizations', auth.orgs); + + // Set this to true so the token will be sent with the request + this.set('access.enabled', true); + + var model = this.get('model'); + model.setProperties({ + 'enabled': true, + 'accessMode': 'unrestricted', + 'allowedIdentities': [auth.userIdentity], + }); + + model.save().then(() => { + this.send('waitAndRefresh'); + }).catch((err) => { + this.set('access.enabled', false); + this.send('gotError', err); + }); + }, + }, }); diff --git a/app/admin-tab/auth/openldap/route.js b/app/admin-tab/auth/openldap/route.js index d863881b0d..7ff7bb1608 100644 --- a/app/admin-tab/auth/openldap/route.js +++ b/app/admin-tab/auth/openldap/route.js @@ -1,5 +1,34 @@ -import ActiveDirectory from 'ui/admin-tab/auth/activedirectory/route'; +import Ember from 'ember'; -export default ActiveDirectory.extend({ +export default Ember.Route.extend({ resourceType: 'openldapconfig', + + model: function() { + + return this.get('userStore').find(this.get('resourceType'), null, {forceReload: true}).then((collection) => { + var existing = collection.get('firstObject'); + + // On install the initial ldapconfig is empty. For any fields that are empty, fill in the default from the schema. + var defaults = this.get('userStore').getById('schema',this.get('resourceType')).get('resourceFields'); + Object.keys(defaults).forEach((key) => { + var field = defaults[key]; + if ( field && field.default && !existing.get(key) ) + { + existing.set(key, field.default); + } + }); + + return existing; + }); + }, + + setupController: function(controller, model) { + controller.setProperties({ + model: model, + confirmDisable: false, + testing: false, + organizations: this.get('session.orgs')||[], + errors: null, + }); + } }); diff --git a/app/authenticated/project/api/hooks/index/controller.js b/app/authenticated/project/api/hooks/index/controller.js index 207ca2d638..97a0d058e7 100644 --- a/app/authenticated/project/api/hooks/index/controller.js +++ b/app/authenticated/project/api/hooks/index/controller.js @@ -4,7 +4,10 @@ import Sortable from 'ui/mixins/sortable'; export default Ember.Controller.extend(Sortable, { settings: Ember.inject.service(), - sortableContent: Ember.computed.alias('model.receivers'), + sortableContent: function() { + let receivers = this.get('model.receivers'); + return receivers.filter(ele => ele.driver !== 'forwardPost'); + }.property('model.receivers.@each.driver'), sortBy: 'name', sorts: { state: ['stateSort','name','id'], diff --git a/app/authenticated/route.js b/app/authenticated/route.js index 94190434d1..7320f0d5cb 100644 --- a/app/authenticated/route.js +++ b/app/authenticated/route.js @@ -58,6 +58,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, { projects: this.toCb('loadProjects'), preferences: this.toCb('loadPreferences'), settings: this.toCb('loadPublicSettings'), + regions: ['userSchemas', this.toCb('loadRegions')], project: ['projects', 'preferences', this.toCb('selectProject',transition)], projectSchemas: ['project', this.toCb('loadProjectSchemas')], catalogs: ['project', this.toCb('loadCatalogs')], @@ -69,11 +70,9 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, { mounts: ['projectSchemas', this.cbFind('mount', 'store', {filter: {state_ne: 'inactive'}})], storagePools: ['projectSchemas', this.cbFind('storagepool')], volumes: ['projectSchemas', this.cbFind('volume')], - snapshots: ['projectSchemas', this.cbFind('snapshot')], - backups: ['projectSchemas', this.cbFind('backup')], certificate: ['projectSchemas', this.cbFind('certificate')], secret: ['projectSchemas', this.toCb('loadSecrets')], - identities: ['userSchemas', this.cbFind('identity', 'userStore')], + identities: ['userSchemas', this.cbFind('identity', 'userStore')], }; async.auto(tasks, xhrConcur, function(err, res) { @@ -139,6 +138,7 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, { console.log('Loading Error:', err); if ( err && (isAuthEnabled || [401,403].indexOf(err.status) >= 0) ) { + this.set('access.enabled', true); this.send('logout',transition, (transition.targetName !== 'authenticated.index')); return; } @@ -209,6 +209,14 @@ export default Ember.Route.extend(Subscribe, PromiseToCb, { return this.get('catalog').fetchCatalogs(); }, + loadRegions() { + if (this.get('userStore').getById('schema', 'region')) { + return this.get('userStore').find('region'); + } else { + return Ember.RSVP.resolve(); + } + }, + updateOrchestration() { return this.get('projects').updateOrchestrationState(); }, diff --git a/app/components/consumed-service-link/template.hbs b/app/components/consumed-service-link/template.hbs index a9eef1ba83..ce05bfd640 100644 --- a/app/components/consumed-service-link/template.hbs +++ b/app/components/consumed-service-link/template.hbs @@ -1,22 +1,26 @@ -{{~#link-to 'service' link.service.stackId link.service.id~}} - {{~#if (eq link.service.name link.name)~}} - {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack') - stack=link.service.displayStack - service=link.service.displayName - alias=link.name - }} - {{~else~}} - {{~#if link.name~}} - {{t (if (eq link.service.stackId stackId) 'serviceLink.withAlias.sameStack' 'serviceLink.withAlias.differentStack') +{{~#if link.service.arbitraryString~}} +
{{link.service.name}} {{link.name}}
+{{~else~}} + {{~#link-to 'service' link.service.stackId link.service.id~}} + {{~#if (eq link.service.name link.name)~}} + {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack') stack=link.service.displayStack service=link.service.displayName alias=link.name }} {{~else~}} - {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack') - stack=link.service.displayStack - service=link.service.displayName - }} + {{~#if link.name~}} + {{t (if (eq link.service.stackId stackId) 'serviceLink.withAlias.sameStack' 'serviceLink.withAlias.differentStack') + stack=link.service.displayStack + service=link.service.displayName + alias=link.name + }} + {{~else~}} + {{t (if (eq link.service.stackId stackId) 'serviceLink.noAlias.sameStack' 'serviceLink.noAlias.differentStack') + stack=link.service.displayStack + service=link.service.displayName + }} + {{~/if~}} {{~/if~}} - {{~/if~}} -{{/link-to}} + {{/link-to}} +{{~/if~}} diff --git a/app/components/container-row/template.hbs b/app/components/container-row/template.hbs index b0cfe79009..97d95cf2d0 100644 --- a/app/components/container-row/template.hbs +++ b/app/components/container-row/template.hbs @@ -17,10 +17,12 @@ {{/if}} - {{model.displayImage}} - {{#if (and (eq showCommand "inline") model.command)~}} - ({{model.command}}) - {{/if}} + {{#tooltip-element inlineBlock=true type="tooltip-basic" tooltipTemplate="tooltip-static" model=model.displayImage tagName="span"}} + {{model.displayImage}} + {{#if (and (eq showCommand "inline") model.command)~}} + ({{model.command}}) + {{/if}} + {{/tooltip-element~}} {{#if showStats}} diff --git a/app/components/container-shell/component.js b/app/components/container-shell/component.js index bc09f2e502..2a99e4ed8c 100644 --- a/app/components/container-shell/component.js +++ b/app/components/container-shell/component.js @@ -1,22 +1,50 @@ import Ember from 'ember'; import { alternateLabel } from 'ui/utils/platform'; +import ThrottledResize from 'ui/mixins/throttled-resize'; import Terminal from 'npm:xterm'; +import { proposeGeometry } from 'ui/utils/xterm-fit-addon'; const DEFAULT_COMMAND = ["/bin/sh","-c",'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh']; -export default Ember.Component.extend({ +export default Ember.Component.extend(ThrottledResize, { instance: null, command: null, cols: 80, rows: 24, alternateLabel: alternateLabel, showProtip: true, + contenteditable: false, status: 'connecting', error: null, socket: null, term: null, + actions: { + contextMenuHandler() { + // fix for no paste button in firefox context menu on Windows + this.set('contenteditable', true); + setTimeout(()=> { + this.set('contenteditable', false); + }, 20); + } + }, + + fit() { + var term = this.get('term'); + var socket = this.get('socket'); + if (term && socket) + { + var geometry = proposeGeometry(term); + socket.send(`:resizeTTY:${geometry.cols},${geometry.rows}`); + term.resize(geometry.cols, geometry.rows); + } + }, + + onResize: function () { + this.fit(); + }, + didInsertElement: function() { this._super(); Ember.run.next(this, 'exec'); @@ -53,8 +81,6 @@ export default Ember.Component.extend({ this.set('status','initializing'); var term = new Terminal({ - cols: this.get('cols'), - rows: this.get('rows'), useStyle: true, screenKeys: true, cursorBlink: false @@ -66,8 +92,8 @@ export default Ember.Component.extend({ socket.send(btoa(unescape(encodeURIComponent(data))));// jshint ignore:line }); - term.open(this.$('.shell-body')[0]); - + term.open(this.$('.shell-body')[0], true); + this.fit(); socket.onmessage = (message) => { this.set('status','connected'); this.sendAction('connected'); diff --git a/app/components/container-shell/template.hbs b/app/components/container-shell/template.hbs index 5296f1d29d..94cd69b867 100644 --- a/app/components/container-shell/template.hbs +++ b/app/components/container-shell/template.hbs @@ -5,7 +5,9 @@
{{/if}}

{{t 'modalShell.title' instanceName=instance.displayName}}

-
+
+
+
{{t (concat-str 'containerShell.status' status character='.') error=error}}
diff --git a/app/components/edit-host/component.js b/app/components/edit-host/component.js index cf46dbe002..3797995ff2 100644 --- a/app/components/edit-host/component.js +++ b/app/components/edit-host/component.js @@ -15,6 +15,7 @@ export default ModalBase.extend(NewOrEdit, ManageLabels, { ips: null, requireAny: null, requiredIfAny: {[C.LABEL.SYSTEM_TYPE]: ''}, + readonlyLabels: [C.LABEL.PER_HOST_SUBNET,C.LABEL.PER_HOST_SUBNET_ROUTING_IP], systemLabels: null, userLabels: null, diff --git a/app/components/edit-host/template.hbs b/app/components/edit-host/template.hbs index e63e0af4c3..492651210d 100644 --- a/app/components/edit-host/template.hbs +++ b/app/components/edit-host/template.hbs @@ -40,6 +40,7 @@
{{form-user-labels initialLabels=originalModel.labels + readonlyLabels=readonlyLabels setLabels=(action 'setUserLabels') }}
diff --git a/app/components/edit-projecttemplate/component.js b/app/components/edit-projecttemplate/component.js index 43b9be809f..6b4b97c3e8 100644 --- a/app/components/edit-projecttemplate/component.js +++ b/app/components/edit-projecttemplate/component.js @@ -2,11 +2,13 @@ import Ember from 'ember'; import NewOrEdit from 'ui/mixins/new-or-edit'; import { uniqKeys, ucFirst } from 'ui/utils/util'; import { isAlternate } from 'ui/utils/platform'; +import C from 'ui/utils/constants'; export default Ember.Component.extend(NewOrEdit, { access: Ember.inject.service(), growl: Ember.inject.service(), intl: Ember.inject.service(), + userStore: Ember.inject.service(), modalService: Ember.inject.service('modal'), projectTemplate: null, @@ -29,11 +31,28 @@ export default Ember.Component.extend(NewOrEdit, { let intl = this.get('intl'); let map = this.get('stacksMap'); let keys = Object.keys(map); + const projectTemplates = this.get('userStore').all('projecttemplate'); + const toEnable = []; + const toDisable = []; for ( let i = 0 ; i < keys.length ; i++ ) { let obj = map[keys[i]]; let tpl = obj.get('tpl'); - if ( obj.get('enabled') && tpl && !tpl.supportsOrchestration(id) ) { + if (this.isReqiredForOrchestration(id, tpl, projectTemplates)) { + toEnable.push(obj); + } else if (obj.required) { + toDisable.push(obj); + } + + if (id === 'library:infra*windows' && tpl.get('categories').contains('Networking') && obj.get('enabled')) { + obj.set('enabled', false); + } + + if ( tpl.get('id') === 'library:infra*ipsec' && this.get('activeOrchestration') === 'library:infra*windows') { + obj.set('enabled', true); + } + + if ( obj.get('enabled') && tpl && !tpl.supportsOrchestration(id) && !obj.required && !tpl.get('categories').contains('Orchestration')) { let orch = map[id].get('tpl.name'); this.get('growl').error( intl.t('editProjectTemplate.error.conflict'), @@ -47,6 +66,12 @@ export default Ember.Component.extend(NewOrEdit, { } } + toEnable.forEach(o => { + o.set('enabled', true); + o.set('required', true); + }); + toDisable.forEach(o => o.set('enabled', false)); + this.get('orchestrationIds').forEach((cur) => { if ( map[cur] ) { map[cur].set('enabled', id === cur); @@ -89,6 +114,23 @@ export default Ember.Component.extend(NewOrEdit, { }, }, + isReqiredForOrchestration(orchId, tpl, projectTemplates) { + const projectTemplate = projectTemplates.find(pt => pt.stacks.findBy('templateId', orchId)); + let stacks = []; + if (projectTemplate) { + stacks = projectTemplate.stacks; + } else if (C.PROJECT_TEMPLATE.DEFAULT === orchId) { + let def = projectTemplates.find((pt) => (pt.get('name') || '').toLowerCase() === C.PROJECT_TEMPLATE.DEFAULT); + if (def) { + stacks = def.stacks; + } + } + let cur = stacks.findBy('externalIdInfo.templateId', tpl.get('id')); + let categories = tpl.get('categoryLowerArray'); + let required = categories.includes('framework'); + return required && cur; + }, + initMap() { let map = {}; let orch = []; @@ -116,7 +158,7 @@ export default Ember.Component.extend(NewOrEdit, { }); } else { map[tplId] = Ember.Object.create({ - required: required, + required: false, enabled: false, tpl: tpl, compatible: null, @@ -224,7 +266,8 @@ export default Ember.Component.extend(NewOrEdit, { Object.keys(map).forEach((key) => { let obj = map[key]; let tpl = obj.get('tpl'); - if ( obj.enabled && !tpl.supportsOrchestration(orch) ) { + + if ( obj.enabled && !tpl.supportsOrchestration(orch) && !tpl.get('categories').contains('Orchestration') ) { this.get('growl').error( intl.t('editProjectTemplate.error.conflict'), intl.t('editProjectTemplate.error.enabling', { diff --git a/app/components/edit-service/component.js b/app/components/edit-service/component.js index 799f5eaf73..915946c38d 100644 --- a/app/components/edit-service/component.js +++ b/app/components/edit-service/component.js @@ -34,9 +34,10 @@ export default ModalBase.extend(NewOrEdit, { var service = this.get('service'); var ary = []; this.get('serviceLinksArray').forEach((row) => { - if ( row.serviceId ) - { + if ( row.serviceId ) { ary.push({name: row.name, serviceId: row.serviceId}); + } else if ( row.service ) { + ary.push({name: row.name, service: row.service}); } }); diff --git a/app/components/env-catalog/component.js b/app/components/env-catalog/component.js index c754df6c69..7cfb4fb925 100644 --- a/app/components/env-catalog/component.js +++ b/app/components/env-catalog/component.js @@ -41,6 +41,7 @@ export default Ember.Component.extend({ branch: C.CATALOG.DEFAULT_BRANCH, url: '', kind: 'native', + isNew: true, }); this.get('ary').pushObject(obj); @@ -56,7 +57,9 @@ export default Ember.Component.extend({ remove(obj) { this.get('ary').removeObject(obj); - this.get('toRemove').addObject(obj); + if ( !obj.get('isNew') ) { + this.get('toRemove').addObject(obj); + } }, save(cb) { @@ -120,7 +123,7 @@ export default Ember.Component.extend({ validate() { var errors = []; - var globals = ['all', 'community', 'library']; // these should be removed when these terms are removed from the envid field + var global = this.get('global'); var ary = this.get('ary'); ary.forEach((cat) => { @@ -132,7 +135,8 @@ export default Ember.Component.extend({ errors.push('URL is required on each catalog'); } - if (globals.indexOf(cat.name.toLowerCase()) >= 0 || ary.filter((x) => (x.name||'').trim().toLowerCase() === cat.name.toLowerCase()).length > 1) { + if ( global.filter((x) => (x.name||'').trim().toLowerCase() === cat.name.toLowerCase()).length > 1 || + ary.filter((x) => (x.name||'').trim().toLowerCase() === cat.name.toLowerCase()).length > 1) { errors.push('Each catalog must have a unique name'); } }); diff --git a/app/components/form-balancer-rules/component.js b/app/components/form-balancer-rules/component.js index f6f70dab83..083c73bd44 100644 --- a/app/components/form-balancer-rules/component.js +++ b/app/components/form-balancer-rules/component.js @@ -12,6 +12,8 @@ export default Ember.Component.extend({ protocolChoices: null, showBackend: null, showIp: null, + showRegion: null, + hasRegion: null, onInit: function() { let rules = this.get('service.lbConfig.portRules'); @@ -34,6 +36,9 @@ export default Ember.Component.extend({ protos.sort(); this.set('protocolChoices', protos); + const regions = this.get('userStore').all('region'); + this.set('hasRegion', regions.get('length') > 0); + if ( this.get('showBackend') === null ) { let hasName = !!rules.findBy('backendName'); this.set('showBackend', hasName); @@ -47,6 +52,14 @@ export default Ember.Component.extend({ } }); } + + if ( this.get('showRegion') === null ) { + rules.forEach((rule) => { + if ( rule.environment ) { + this.set('showRegion', true); + } + }); + } }.on('init'), actions: { @@ -101,6 +114,10 @@ export default Ember.Component.extend({ showIp() { this.set('showIp', true); }, + + showRegion() { + this.set('showRegion', true); + }, }, updatePriorities() { diff --git a/app/components/form-balancer-rules/template.hbs b/app/components/form-balancer-rules/template.hbs index 6c9794b38c..07eeea23ef 100644 --- a/app/components/form-balancer-rules/template.hbs +++ b/app/components/form-balancer-rules/template.hbs @@ -33,6 +33,11 @@ {{t 'formBalancerRules.path.label'}} {{t 'formBalancerRules.targetPort.label'}}* {{/if}} + {{#if showRegion}} + {{t 'formBalancerRules.region.label'}} + {{t 'formBalancerRules.environment.label'}} + {{t 'formBalancerRules.weight.label'}} + {{/if}} {{#if showBackend}} {{t 'formBalancerRules.backendName.label'}} {{/if}} @@ -117,6 +122,30 @@ {{input-integer class="form-control input-sm" min="1" max="65535" value=rule.targetPort placeholder=(t 'formBalancerRules.targetPort.placeholder')}} + {{#if showRegion}} + + {{#if rule.isSelector}} + {{input type="text" class="form-control input-sm" value=rule.region placeholder=(t 'formBalancerRules.region.placeholder')}} + {{else}} + {{t 'generic.na'}} + {{/if}} + + + {{#if rule.isSelector}} + {{input type="text" class="form-control input-sm" value=rule.environment placeholder=(t 'formBalancerRules.environment.placeholder')}} + {{else}} + {{t 'generic.na'}} + {{/if}} + + + {{#if rule.isSelector}} + {{input-integer class="form-control input-sm" min="0" value=rule.weight placeholder=(t 'formBalancerRules.weight.placeholder')}} + {{else}} + {{t 'generic.na'}} + {{/if}} + + {{/if}} + {{#if showBackend}} {{input type="text" class="form-control input-sm" value=rule.backendName placeholder=(t 'formBalancerRules.backendName.placeholder')}} @@ -144,6 +173,11 @@ {{t 'formBalancerRules.help.showIpLink'}} {{/unless}} + {{#if (and hasRegion (not showRegion))}} + + {{t 'formBalancerRules.help.showRegionLink'}} + + {{/if}} {{t 'formBalancerRules.help.suffix'}}

{{else}} diff --git a/app/components/form-command/component.js b/app/components/form-command/component.js index b1794cd73b..96f0b8a702 100644 --- a/app/components/form-command/component.js +++ b/app/components/form-command/component.js @@ -7,6 +7,7 @@ export default Ember.Component.extend(ManageLabels, { instance: null, errors: null, isService: null, + isSidekick: null, editing: true, classNameBindings: ['editing:component-editing:component-static'], @@ -138,4 +139,8 @@ export default Ember.Component.extend(ManageLabels, { restartLimitDidChange: function() { this.set('restart', 'on-failure-cond'); }.observes('restartLimit'), + + showDrainTimeout: function() { + return this.get('isService') && !this.get('isSidekick'); + }.property('isService', 'isSidekick') }); diff --git a/app/components/form-command/template.hbs b/app/components/form-command/template.hbs index 694aba0a1e..78a41ad52b 100644 --- a/app/components/form-command/template.hbs +++ b/app/components/form-command/template.hbs @@ -162,6 +162,20 @@ {{/if}} {{/if}} +{{#if showDrainTimeout}} +
+
+ +
+
+
+ {{input-integer step=100 classNames="form-control" value=instance.drainTimeoutMs}} + {{t 'formCommand.drainTimeout.unit'}} +
+
+
+{{/if}} +
diff --git a/app/components/form-engine-opts/component.js b/app/components/form-engine-opts/component.js index 5157ea6233..1bd6909bde 100644 --- a/app/components/form-engine-opts/component.js +++ b/app/components/form-engine-opts/component.js @@ -18,12 +18,15 @@ export default Ember.Component.extend({ let def = this.get(`settings.${C.SETTING.ENGINE_URL}`); let out = [ {label: this.get('intl').t('formEngineOpts.engineInstallUrl.recommended'), value: def}, - {label: 'v1.10.x', value: 'https://releases.rancher.com/install-docker/1.10.sh'}, - {label: 'v1.11.x', value: 'https://releases.rancher.com/install-docker/1.11.sh'}, {label: 'v1.12.x', value: 'https://releases.rancher.com/install-docker/1.12.sh'}, {label: 'v1.13.x', value: 'https://releases.rancher.com/install-docker/1.13.sh'}, {label: 'v17.03.x', value: 'https://releases.rancher.com/install-docker/17.03.sh'}, - {label: 'v17.04.x', value: 'https://releases.rancher.com/install-docker/17.04.sh'}, + {label: 'v17.06.x', value: 'https://releases.rancher.com/install-docker/17.06.sh'}, + {label: 'v17.09.x', value: 'https://releases.rancher.com/install-docker/17.09.sh'}, + {label: 'v17.12.x', value: 'https://releases.rancher.com/install-docker/17.12.sh'}, + {label: 'v18.03.x', value: 'https://releases.rancher.com/install-docker/18.03.sh'}, + {label: 'v18.09.x', value: 'https://releases.rancher.com/install-docker/18.09.sh'}, + {label: 'v19.03.x', value: 'https://releases.rancher.com/install-docker/19.03.sh'}, {label: this.get('intl').t('formEngineOpts.engineInstallUrl.latest'), value: 'https://get.docker.com'}, ]; diff --git a/app/components/form-networking/component.js b/app/components/form-networking/component.js index 0cf6880cfc..1d026315ae 100644 --- a/app/components/form-networking/component.js +++ b/app/components/form-networking/component.js @@ -4,6 +4,7 @@ import ManageLabels from 'ui/mixins/manage-labels'; import C from 'ui/utils/constants'; export default Ember.Component.extend(ManageLabels, ContainerChoices,{ + intl: Ember.inject.service(), projects: Ember.inject.service(), settings: Ember.inject.service(), @@ -70,12 +71,14 @@ export default Ember.Component.extend(ManageLabels, ContainerChoices,{ isContainerNetwork: Ember.computed.equal('instance.networkMode','container'), initNetwork: function() { var isService = this.get('isService')||false; + var mode = this.get('instance.networkMode'); + var intl = this.get('intl'); var choices = ['bridge','container','host','managed','none']; if ( this.get('projects.current.isWindows') ) { choices = ['nat','transparent']; - if ( this.get('instance.networkMode') === 'managed' ) { - this.set('instance.networkMode','nat'); + if ( mode === 'managed' ) { + this.set('instance.networkMode','transparent'); } } @@ -86,9 +89,13 @@ export default Ember.Component.extend(ManageLabels, ContainerChoices,{ return; } - out.push({label: 'formNetwork.networkMode.'+option, value: option}); + out.push({label: intl.t('formNetwork.networkMode.'+option), value: option}); }); + if ( !out.findBy('value', mode) && !this.get('projects.current.isWindows')) { + out.push({label: mode, value: mode}); + } + this.set('networkChoices', out); }, diff --git a/app/components/form-networking/template.hbs b/app/components/form-networking/template.hbs index 5bc702eb00..f19ae6334d 100644 --- a/app/components/form-networking/template.hbs +++ b/app/components/form-networking/template.hbs @@ -8,28 +8,41 @@ {{new-select classNames="form-control" content=networkChoices - localizedLabel=true value=instance.networkMode }} {{/input-or-display}}
{{#if isContainerNetwork}} -
- -
-
- {{#input-or-display editable=editing value=instance.networkContainerId}} - {{new-select - classNames="form-control" - content=containersOnRequestedHost - optionLabelPath="name" - optionValuePath="id" - optionGroupPath="group" - value=instance.networkContainerId - }} - {{/input-or-display}} -
+ {{#if isService}} +
+ +
+
+ {{#input-or-display editable=editing value=instance.networkLaunchConfig}} + {{input + classNames="form-control" + value=instance.networkLaunchConfig + }} + {{/input-or-display}} +
+ {{else}} +
+ +
+
+ {{#input-or-display editable=editing value=instance.networkContainerId}} + {{new-select + classNames="form-control" + content=containersOnRequestedHost + optionLabelPath="name" + optionValuePath="id" + optionGroupPath="group" + value=instance.networkContainerId + }} + {{/input-or-display}} +
+ {{/if}} {{/if}}
@@ -109,32 +122,34 @@ {{/if}} {{/unless}} -
-
- -
+{{#unless isHostNetwork}} +
+
+ +
-
- {{#if isService}} - {{#input-or-display editable=editing value=hostname}} -
- -
-
- -
-
- - {{input type="text" value=instance.hostname classNames="form-control r-ml10 input-sm" safeStyle="display:inline; width: 200px;" placeholder=(t 'formNetwork.hostname.placeholder') disabled=(not-eq hostname "custom")}} -
- {{/input-or-display}} - {{else}} - {{#input-or-display editable=editing value=instance.hostname}} - {{input type="text" value=instance.hostname classNames="form-control" placeholder=(t 'formNetwork.hostname.placeholder')}} - {{/input-or-display}} - {{/if}} +
+ {{#if isService}} + {{#input-or-display editable=editing value=hostname}} +
+ +
+
+ +
+
+ + {{input type="text" value=instance.hostname classNames="form-control r-ml10 input-sm" safeStyle="display:inline; width: 200px;" placeholder=(t 'formNetwork.hostname.placeholder') disabled=(not-eq hostname "custom")}} +
+ {{/input-or-display}} + {{else}} + {{#input-or-display editable=editing value=instance.hostname}} + {{input type="text" value=instance.hostname classNames="form-control" placeholder=(t 'formNetwork.hostname.placeholder')}} + {{/input-or-display}} + {{/if}} +
-
+{{/unless}}
diff --git a/app/components/form-ports/component.js b/app/components/form-ports/component.js index d90b62010e..5fb7f91055 100644 --- a/app/components/form-ports/component.js +++ b/app/components/form-ports/component.js @@ -54,7 +54,7 @@ export default Ember.Component.extend({ else if ( typeof value === 'string' ) { // Strings, from clone/edit - var parsed = parsePortSpec(value); + var parsed = parsePortSpec(value,'tcp'); if ( parsed.hostIp ) { @@ -139,7 +139,7 @@ export default Ember.Component.extend({ this.set('portsAsStrArray', out); this.sendAction('changed', this.get('portsArray')); this.sendAction('changedStr', this.get('portsAsStrArray')); - }.observes('portsArray.@each.{public,private,protocol}'), + }.observes('portsArray.@each.{bindAddress,public,private,protocol}'), validate: function() { var errors = []; diff --git a/app/components/form-ports/template.hbs b/app/components/form-ports/template.hbs index d136048f96..c308f295a8 100644 --- a/app/components/form-ports/template.hbs +++ b/app/components/form-ports/template.hbs @@ -18,7 +18,7 @@   {{t 'formPorts.private.label'}}   - {{t 'formPorts.protocol.label'}} + {{t 'formPorts.protocol.label'}}   {{#each portsArray as |port|}} diff --git a/app/components/form-security/template.hbs b/app/components/form-security/template.hbs index 07f7eac9bb..63f0a8e724 100644 --- a/app/components/form-security/template.hbs +++ b/app/components/form-security/template.hbs @@ -200,7 +200,7 @@   - {{device-permissions buttonClass="btn-sm" initialSelection=device.permissions changed=(action (mut device.permissions))}} + {{device-permissions buttonClass="btn-sm" initialSelection=device.permissions changed=(action (mut device.permissions)) editing=editing}} diff --git a/app/components/form-service-links/component.js b/app/components/form-service-links/component.js index c0e9af2416..83a1462d10 100644 --- a/app/components/form-service-links/component.js +++ b/app/components/form-service-links/component.js @@ -5,6 +5,7 @@ export default Ember.Component.extend({ service : null, withAlias : true, serviceLinksArray : null, + hasRegion : null, tagName: '', @@ -31,17 +32,22 @@ export default Ember.Component.extend({ out.push(Ember.Object.create({ name: (name === service.get('name') ? '' : name), obj: service, - serviceId: service.get('id'), + customMode: service.get('arbitraryString'), + serviceId: service.get('arbitraryString') ? null : service.get('id'), + service: service.get('arbitraryString') ? service.get('id') : null, })); }); this.set('serviceLinksArray', out); this.serviceLinksArrayDidChange(); + + const regions = this.get('userStore').all('region'); + this.set('hasRegion', regions.get('length') > 0); }, serviceLinksArrayDidChange: function() { this.sendAction('changed', this.get('serviceLinksArray')); - }.observes('serviceLinksArray.@each.{name,serviceId}'), + }.observes('serviceLinksArray.@each.{name,serviceId,customMode,service}'), actions: { addServiceLink: function() { diff --git a/app/components/form-service-links/template.hbs b/app/components/form-service-links/template.hbs index 5a800988c0..d0269023b7 100644 --- a/app/components/form-service-links/template.hbs +++ b/app/components/form-service-links/template.hbs @@ -19,6 +19,9 @@ {{schema/input-service + custom=link.service + customMode=link.customMode + showCustomOption=hasRegion selectClass="form-control input-sm service-link" selected=link.serviceId exclude=service.id diff --git a/app/components/form-targets/component.js b/app/components/form-targets/component.js index 6f2b26d318..1a5ecfdc93 100644 --- a/app/components/form-targets/component.js +++ b/app/components/form-targets/component.js @@ -35,7 +35,7 @@ export default Ember.Component.extend({ var out = []; var existing = this.get('existing'); - if ( existing ) + if ( existing && existing.get('linkedServices') !== null ) { let links = existing.get('linkedServices'); Object.keys(links).forEach((key) => { diff --git a/app/components/form-user-labels/component.js b/app/components/form-user-labels/component.js index 5ae775c3c0..7927bc0d9b 100644 --- a/app/components/form-user-labels/component.js +++ b/app/components/form-user-labels/component.js @@ -4,6 +4,7 @@ import ManageLabels from 'ui/mixins/manage-labels'; export default Ember.Component.extend(ManageLabels, { // Inputs initialLabels: null, + readonlyLabels: null, actions: { addUserLabel() { @@ -21,7 +22,7 @@ export default Ember.Component.extend(ManageLabels, { init() { this._super(...arguments); - this.initLabels(this.get('initialLabels'),'user'); + this.initLabels(this.get('initialLabels'),'user', null, this.get('readonlyLabels')); this.labelsChanged(); }, diff --git a/app/components/form-user-labels/template.hbs b/app/components/form-user-labels/template.hbs index 99bf33b0cd..58c3d781e9 100644 --- a/app/components/form-user-labels/template.hbs +++ b/app/components/form-user-labels/template.hbs @@ -13,7 +13,7 @@ {{#each userLabelArray as |label|}} - {{input-paste pasted="pastedLabels" class="form-control input-sm key" type="text" value=label.key placeholder="formUserLabels.key.placeholder"}} + {{input-paste pasted="pastedLabels" class="form-control input-sm key" type="text" value=label.key placeholder="formUserLabels.key.placeholder" disabled=(eq label.readonly true)}} @@ -21,11 +21,11 @@ - {{input class="form-control input-sm" type="text" value=label.value placeholder=(t 'formUserLabels.value.placeholder')}} + {{input class="form-control input-sm" type="text" value=label.value placeholder=(t 'formUserLabels.value.placeholder') disabled=(eq label.readonly true)}} - + {{/each}} diff --git a/app/components/machine/driver-aliyunecs/component.js b/app/components/machine/driver-aliyunecs/component.js index 2c8eb534b1..7bae7646c4 100644 --- a/app/components/machine/driver-aliyunecs/component.js +++ b/app/components/machine/driver-aliyunecs/component.js @@ -1,7 +1,8 @@ import Ember from 'ember'; import Driver from 'ui/mixins/driver'; +import { validateHostname } from 'ui/utils/validate-dns'; -let isOptimized=[ +let ioOptimized=[ { value : "none", }, @@ -10,23 +11,586 @@ let isOptimized=[ }, ]; +let systemDiskCategory=[{value:"cloud"}]; +let dataDiskCategory=[{value:"cloud"}]; +let optimizedDiskCategory=[ + { + value:"cloud_efficiency", + },{ + value:"cloud_ssd", + } +]; + +let regions=[ + { + value:"cn-shenzhen", + }, + { + value:"cn-qingdao", + }, + { + value:"cn-beijing", + }, + { + value:"cn-zhangjiakou", + }, + { + value:"cn-hangzhou", + }, + { + value:"cn-shanghai", + }, + { + value:"cn-hongkong", + }, + { + value:"ap-northeast-1", + }, + { + value:"ap-southeast-1", + }, + { + value:"ap-southeast-2", + }, + { + value:"us-east-1", + }, + { + value:"us-west-1", + }, + { + value:"me-east-1", + }, + { + value:"eu-central-1", + }, +]; + +let instanceType=[]; + +let notOptimizedinstanceType=[ + { + value: "ecs.t1.small", + description: "ecs.t1.small - 1 CPU,1 GB memory", + }, + { + value: "ecs.s1.small", + description: "ecs.s1.small - 1 CPU,2 GB memory", + }, + { + value: "ecs.s1.medium", + description: "ecs.s1.medium - 1 CPU,4 GB memory", + }, + { + value: "ecs.s1.large", + description: "ecs.s1.large - 1 CPU,8 GB memory", + }, + { + value: "ecs.s2.small", + description: "ecs.s2.small - 2 CPU,2 GB memory", + }, + { + value: "ecs.s2.large", + description: "ecs.s2.large - 2 CPU,4 GB memory", + }, + { + value: "ecs.s2.2xlarge", + description: "ecs.s2.2xlarge - 2 CPU,16 GB memory", + }, + { + value: "ecs.s3.medium", + description: "ecs.s3.medium - 4 CPU,4 GB memory", + }, + { + value: "ecs.s3.large", + description: "ecs.s3.large - 4 CPU,8 GB memory", + }, + { + value: "ecs.m1.medium", + description: "ecs.m1.medium - 4 CPU,16 GB memory", + }, + { + value: "ecs.m2.medium", + description: "ecs.m2.medium - 4 CPU,32 GB memory", + }, +]; + +let isOptimizedinstanceType=[ + { + value: "ecs.n1.tiny", + description: "ecs.n1.tiny - 1 CPU,1 GB memory", + }, + { + value: "ecs.n1.small", + description: "ecs.n1.small - 1 CPU,2 GB memory", + }, + { + value: "ecs.n1.medium", + description: "ecs.n1.medium - 2 CPU,4 GB memory", + }, + { + value: "ecs.n1.large", + description: "ecs.n1.large - 4 CPU,8 GB memory", + }, + { + value: "ecs.n1.xlarge", + description: "ecs.n1.xlarge - 8 CPU,16 GB memory", + }, + { + value: "ecs.n1.3xlarge", + description: "ecs.n1.3xlarge - 16 CPU,32 GB memory", + }, + { + value: "ecs.n1.7xlarge", + description: "ecs.n1.7xlarge - 32 CPU,64 GB memory", + }, + { + value: "ecs.n2.small", + description: "ecs.n2.small - 1 CPU,4 GB memory", + }, + { + value: "ecs.n2.medium", + description: "ecs.n2.medium - 2 CPU,8 GB memory", + }, + { + value: "ecs.n2.large", + description: "ecs.n2.large - 4 CPU,16 GB memory", + }, + { + value: "ecs.n2.xlarge", + description: "ecs.n2.xlarge - 8 CPU,32 GB memory", + }, + { + value: "ecs.n2.3xlarge", + description: "ecs.n2.3xlarge - 16 CPU,64 GB memory", + }, + { + value: "ecs.n2.7xlarge", + description: "ecs.n2.7xlarge - 32 CPU,128 GB memory", + }, + { + value: "ecs.e3.small", + description: "ecs.e3.small - 1 CPU,8 GB memory", + }, + { + value: "ecs.e3.medium", + description: "ecs.e3.medium - 2 CPU,16 GB memory", + }, + { + value: "ecs.e3.large", + description: "ecs.e3.large - 4 CPU,32 GB memory", + }, + { + value: "ecs.e3.xlarge", + description: "ecs.e3.xlarge - 8 CPU,64 GB memory", + }, + { + value: "ecs.e3.3xlarge", + description: "ecs.e3.3xlarge - 16 CPU,128 GB memory", + }, + { + value: "ecs.s2.large", + description: "ecs.s2.large - 2 CPU,4 GB memory", + }, + { + value: "ecs.s2.xlarge", + description: "ecs.s2.xlarge - 2 CPU,8 GB memory", + }, + { + value: "ecs.s2.2xlarge", + description: "ecs.s2.2xlarge - 2 CPU,16 GB memory", + }, + { + value: "ecs.s3.medium", + description: "ecs.s3.medium - 4 CPU,4 GB memory", + }, + { + value: "ecs.s3.large", + description: "ecs.s3.large - 4 CPU,8 GB memory", + }, + { + value: "ecs.m1.medium", + description: "ecs.m1.medium - 4 CPU,16 GB memory", + }, + { + value: "ecs.m1.xlarge", + description: "ecs.m1.xlarge - 8 CPU,32 GB memory", + }, + { + value: "ecs.m2.medium", + description: "ecs.m2.medium - 4 CPU,32 GB memory", + }, + { + value: "ecs.m2.xlarge", + description: "ecs.m2.xlarge - 8 CPU,64 GB memory", + }, + { + value: "ecs.c1.small", + description: "ecs.c1.small - 8 CPU,8 GB memory", + }, + { + value: "ecs.c1.large", + description: "ecs.c1.large - 8 CPU,16 GB memory", + }, + { + value: "ecs.c2.medium", + description: "ecs.c2.medium - 16 CPU,16 GB memory", + }, + { + value: "ecs.c2.large", + description: "ecs.c2.large - 16 CPU,32 GB memory", + }, + { + value: "ecs.c2.xlarge", + description: "ecs.c2.xlarge - 16 CPU,64 GB memory", + }, + { + value: "ecs.n4.small", + description: "ecs.n4.small - 1 CPU,2 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.n4.large", + description: "ecs.n4.large - 2 CPU,4 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.n4.xlarge", + description: "ecs.n4.xlarge - 4 CPU,8 GB memory,0.8 Gbps network bandwidth,80k PPS", + }, + { + value: "ecs.n4.2xlarge", + description: "ecs.n4.2xlarge - 8 CPU,16 GB memory,1.2 Gbps network bandwidth,150k PPS", + }, + { + value: "ecs.n4.4xlarge", + description: "ecs.n4.4xlarge - 16 CPU,32 GB memory,2.5 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.n4.8xlarge", + description: "ecs.n4.8xlarge - 32 CPU,64 GB memory,5 Gbps network bandwidth,500k PPS", + }, + { + value: "ecs.mn4.small", + description: "ecs.mn4.small - 1 CPU,4 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.mn4.large", + description: "ecs.mn4.large - 2 CPU,8 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.mn4.xlarge", + description: "ecs.mn4.xlarge - 4 CPU,16 GB memory,0.8 Gbps network bandwidth,80k PPS", + }, + { + value: "ecs.mn4.2xlarge", + description: "ecs.mn4.2xlarge - 8 CPU,32 GB memory,1.2 Gbps network bandwidth,150k PPS", + }, + { + value: "ecs.mn4.4xlarge", + description: "ecs.mn4.4xlarge - 16 CPU,64 GB memory,2.5 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.mn4.8xlarge", + description: "ecs.mn4.8xlarge - 32 CPU,128 GB memory,5 Gbps network bandwidth,500k PPS", + }, + { + value: "ecs.xn4.small", + description: "ecs.xn4.small - 1 CPU,1 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.e4.small", + description: "ecs.e4.small - 1 CPU,8 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.sn2.medium", + description: "ecs.sn2.medium - 2 CPU,8 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.sn2.large", + description: "ecs.sn2.large - 4 CPU,16 GB memory,0.8 Gbps network bandwidth,100k PPS", + }, + { + value: "ecs.sn2.xlarge", + description: "ecs.sn2.xlarge - 8 CPU,32 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.sn2.3xlarge", + description: "ecs.sn2.3xlarge - 16 CPU,64 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.sn2.13xlarge", + description: "ecs.sn2.13xlarge - 56 CPU,224 GB memory,10 Gbps network bandwidth,1200k PPS", + }, + { + value: "ecs.sn2ne.large", + description: "ecs.sn2ne.large - 2 CPU,8 GB memory,1 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.sn2ne.xlarge", + description: "ecs.sn2ne.xlarge - 4 CPU,16 GB memory,1.5 Gbps network bandwidth,500k PPS", + }, + { + value: "ecs.sn2ne.2xlarge", + description: "ecs.sn2ne.2xlarge - 8 CPU,32 GB memory,2 Gbps network bandwidth,1m PPS", + }, + { + value: "ecs.sn2ne.4xlarge", + description: "ecs.sn2ne.4xlarge - 16 CPU,64 GB memory,3 Gbps network bandwidth,1600k PPS", + }, + { + value: "ecs.sn2ne.8xlarge", + description: "ecs.sn2ne.8xlarge - 32 CPU,128 GB memory,6 Gbps network bandwidth,2500k PPS", + }, + { + value: "ecs.sn2ne.14xlarge", + description: "ecs.sn2ne.14xlarge - 56 CPU,224 GB memory,10 Gbps network bandwidth,4500k PPS", + }, + { + value: "ecs.sn1.medium", + description: "ecs.sn1.medium - 2 CPU,4 GB memory,0.5 Gbps network bandwidth,50k PPS", + }, + { + value: "ecs.sn1.large", + description: "ecs.sn1.large - 4 CPU,8 GB memory,0.8 Gbps network bandwidth,100k PPS", + }, + { + value: "ecs.sn1.xlarge", + description: "ecs.sn1.xlarge - 8 CPU,16 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.sn1.3xlarge", + description: "ecs.sn1.3xlarge - 16 CPU,32 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.sn1.7xlarge", + description: "ecs.sn1.7xlarge - 32 CPU,64 GB memory,6 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.sn1ne.large", + description: "ecs.sn1ne.large - 2 CPU,4 GB memory,1 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.sn1ne.xlarge", + description: "ecs.sn1ne.xlarge - 4 CPU,8 GB memory,1.5 Gbps network bandwidth,500k PPS", + }, + { + value: "ecs.sn1ne.2xlarge", + description: "ecs.sn1ne.2xlarge - 8 CPU,16 GB memory,2 Gbps network bandwidth,1m PPS", + }, + { + value: "ecs.sn1ne.4xlarge", + description: "ecs.sn1ne.4xlarge - 16 CPU,32 GB memory,3 Gbps network bandwidth,1600k PPS", + }, + { + value: "ecs.sn1ne.8xlarge", + description: "ecs.sn1ne.8xlarge - 32 CPU,64 GB memory,6 Gbps network bandwidth,2500k PPS", + }, + { + value: "ecs.se1.xlarge", + description: "ecs.se1.xlarge - 4 CPU,32 GB memory,0.8 Gbps network bandwidth,100k PPS", + }, + { + value: "ecs.se1.2xlarge", + description: "ecs.se1.2xlarge - 8 CPU,64 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.se1.4xlarge", + description: "ecs.se1.4xlarge - 16 CPU,128 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.se1.8xlarge", + description: "ecs.se1.8xlarge - 32 CPU,256 GB memory,6 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.se1.14xlarge", + description: "ecs.se1.14xlarge - 56 CPU,480 GB memory,10 Gbps network bandwidth,1200k PPS", + }, + { + value: "ecs.se1ne.large", + description: "ecs.se1ne.large - 2 CPU,16 GB memory,1 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.se1ne.xlarge", + description: "ecs.se1ne.xlarge - 4 CPU,32 GB memory,1.5 Gbps network bandwidth,500k PPS", + }, + { + value: "ecs.se1ne.2xlarge", + description: "ecs.se1ne.2xlarge - 8 CPU,64 GB memory,2 Gbps network bandwidth,1m PPS", + }, + { + value: "ecs.se1ne.4xlarge", + description: "ecs.se1ne.4xlarge - 16 CPU,128 GB memory,3 Gbps network bandwidth,1600k PPS", + }, + { + value: "ecs.se1ne.8xlarge", + description: "ecs.se1ne.8xlarge - 32 CPU,256 GB memory,6 Gbps network bandwidth,2500k PPS", + }, + { + value: "ecs.se1ne.14xlarge", + description: "ecs.se1ne.14xlarge - 56 CPU,480 GB memory,10 Gbps network bandwidth,4500k PPS", + }, + { + value: "ecs.d1.2xlarge", + description: "ecs.d1.2xlarge - 8 CPU,32 GB memory,3 Gbps network bandwidth,300k PPS", + }, + { + value: "ecs.d1.4xlarge", + description: "ecs.d1.4xlarge - 16 CPU,64 GB memory,6 Gbps network bandwidth,600k PPS", + }, + { + value: "ecs.d1.6xlarge", + description: "ecs.d1.6xlarge - 24 CPU,96 GB memory,8 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.d1.8xlarge", + description: "ecs.d1.8xlarge - 32 CPU,128 GB memory,10 Gbps network bandwidth,1m PPS", + }, + { + value: "ecs.d1.14xlarge", + description: "ecs.d1.14xlarge - 56 CPU,224 GB memory,17 Gbps network bandwidth,1800k PPS", + }, + { + value: "ecs.i1.xlarge", + description: "ecs.i1.xlarge - 8 CPU,16 GB memory,0.8 Gbps network bandwidth,100k PPS", + }, + { + value: "ecs.i1.2xlarge", + description: "ecs.i1.2xlarge - 8 CPU,32 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.i1.4xlarge", + description: "ecs.i1.4xlarge - 16 CPU,64 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.i1-c5d1.4xlarge", + description: "ecs.i1-c5d1.4xlarge - 16 CPU,64 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.i1.8xlarge", + description: "ecs.i1.8xlarge - 32 CPU,128 GB memory,6 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.i1-c10d1.8xlarge", + description: "ecs.i1-c10d1.8xlarge - 32 CPU,128 GB memory,6 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.i1.14xlarge", + description: "ecs.i1.14xlarge - 56 CPU,224 GB memory,10 Gbps network bandwidth,1200k PPS", + }, + { + value: "ecs.cm4.xlarge", + description: "ecs.cm4.xlarge - 4 CPU,16 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.cm4.2xlarge", + description: "ecs.cm4.2xlarge - 8 CPU,32 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.cm4.4xlarge", + description: "ecs.cm4.4xlarge - 16 CPU,64 GB memory,6 Gbps network bandwidth,800k PPS", + }, + { + value: "ecs.cm4.6xlarge", + description: "ecs.cm4.6xlarge - 24 CPU,96 GB memory,10 Gbps network bandwidth,1200k PPS", + }, + { + value: "ecs.ce4.xlarge", + description: "ecs.ce4.xlarge - 4 CPU,32 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.c4.xlarge", + description: "ecs.c4.xlarge - 4 CPU,8 GB memory,1.5 Gbps network bandwidth,200k PPS", + }, + { + value: "ecs.c4.2xlarge", + description: "ecs.c4.2xlarge - 8 CPU,16 GB memory,3 Gbps network bandwidth,400k PPS", + }, + { + value: "ecs.c4.4xlarge", + description: "ecs.c4.4xlarge - 16 CPU,32 GB memory,6 Gbps network bandwidth,800k PPS", + }, +]; + export default Ember.Component.extend(Driver, { driverName : 'aliyunecs', aliyunecsConfig : Ember.computed.alias('model.aliyunecsConfig'), - isOptimized : isOptimized, - - + ioOptimized : ioOptimized, + instanceType: instanceType, + dataDiskCategory: dataDiskCategory, + systemDiskCategory: systemDiskCategory, + regions: regions, + intl: Ember.inject.service(), + settings: Ember.inject.service(), + ioOptimizedObserves: function(){ + if (this.get('aliyunecsConfig.ioOptimized')==='none'){ + this.set('instanceType',notOptimizedinstanceType); + this.set('dataDiskCategory',[{value:"cloud"}]); + this.set('systemDiskCategory',[{value:"cloud"}]); + } + else { + this.set('instanceType',isOptimizedinstanceType); + this.set('dataDiskCategory',optimizedDiskCategory); + this.set('systemDiskCategory',optimizedDiskCategory); + } + }.observes('aliyunecsConfig.ioOptimized'), bootstrap: function() { let config = this.get('store').createRecord({ type : 'aliyunecsConfig', }); - + this.set('instanceType',notOptimizedinstanceType); this.set('model', this.get('store').createRecord({ type: 'host', aliyunecsConfig: config, })); - + this.set('model.engineRegistryMirror',['https://s06nkgus.mirror.aliyuncs.com']); + this.set('model.engineInstallUrl','http://dev-tool.oss-cn-shenzhen.aliyuncs.com/docker-install/1.12.6.sh'); //this.set('editing', false); }, - + validate: function(){ + this._super(); + var errors = this.get('errors') || []; + var name = this.get('model.hostname'); + if (name) { + if (!validateHostname(name)){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.nameNotValidForApp',{appName: this.get('settings.appName')})); + } + //name length rules + if (name.length<2){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.nameTooShort')); + } + //check '.','-' can not be used as the first letter and the last letter + if (!/^[a-zA-Z]([\.]?[a-zA-Z0-9\-]+[\.]?)*[a-zA-Z0-9]$/.test(name)){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.nameNotValid')); + } + //windows hostname can not have more than 15 letter. And we should not use windows image to setup a host, so we don't need to validate name for windows hostname. + + //linux hostname can not have more than 128 letter. + if (name.length>128){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.nameTooLong')); + } + } + var accessKey = this.get('aliyunecsConfig.accessKeyId'); + var accessSecret = this.get('aliyunecsConfig.accessKeySecret'); + if (!accessKey){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.accessKeyRequired')); + } + if (!accessSecret){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.accessSecretRequired')); + } + var sshPassword = this.get('aliyunecsConfig.sshPassword'); + if (sshPassword && (sshPassword.length<8) || sshPassword.length>30){ + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.sshPasswordLengthNotValid')); + } + if (sshPassword&&!/[?+*$^().|<>';:\-=\[\]\{\},&%#@!~`\\a-zA-Z0-9]+/.test(sshPassword)) { + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.sshPasswordInvalidCharacter')); + } + var lower = /[a-z]/.test(sshPassword) ? 1:0; + var upper = /[A-Z]/.test(sshPassword) ? 1:0; + var number = /[0-9]/.test(sshPassword) ? 1:0; + var special = /[?+*$^().|<>';:\-=\[\]\{\},&%#@!~`\\]/.test(sshPassword) ? 1:0; + if (sshPassword&&(lower + upper + number + special <3)) { + errors.push(this.get('intl').t('machine.driverAliyunecs.errors.sshPasswordFormatError')); + } + this.set('errors', errors); + return !errors.length; + }, }); diff --git a/app/components/machine/driver-aliyunecs/template.hbs b/app/components/machine/driver-aliyunecs/template.hbs index 8d60ae4397..0d7de69e96 100644 --- a/app/components/machine/driver-aliyunecs/template.hbs +++ b/app/components/machine/driver-aliyunecs/template.hbs @@ -21,7 +21,7 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.accessKeySecret placeholder=(t 'machine.driverAliyunecs.accessKeySecret.placeholder')}} + {{input type="password" class="form-control" value=aliyunecsConfig.accessKeySecret placeholder=(t 'machine.driverAliyunecs.accessKeySecret.placeholder')}}
@@ -48,7 +48,15 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.instanceType placeholder=(t 'machine.driverAliyunecs.instanceType.placeholder')}} + {{!-- {{input type="text" class="form-control" value=aliyunecsConfig.instanceType placeholder=(t 'machine.driverAliyunecs.instanceType.placeholder')}} --}} + {{new-select + classNames="form-control" + content=instanceType + optionLabelPath='description' + optionValuePath='value' + value=aliyunecsConfig.instanceType + }} + {{!--

--}}
@@ -69,15 +77,6 @@
-
- -
-
-
- {{input type="text" class="form-control" value=aliyunecsConfig.internetMaxBandwidth placeholder=(t 'machine.driverAliyunecs.internetMaxBandwidth.placeholder')}} -
Mbps
-
-
@@ -93,15 +92,15 @@
- +
- {{!--{{input type="text" class="form-control" value=aliyunecsConfig.isOptimized placeholder=(t 'machine.driverAliyunecs.isOptimized.placeholder')}}--}} + {{!--{{input type="text" class="form-control" value=aliyunecsConfig.ioOptimized placeholder=(t 'machine.driverAliyunecs.ioOptimized.placeholder')}}--}} {{new-select classNames="form-control" - content=isOptimized + content=ioOptimized optionLabelPath='value' - value=aliyunecsConfig.isOptimized + value=aliyunecsConfig.ioOptimized }}
@@ -109,7 +108,13 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.systemDiskCategory placeholder=(t 'machine.driverAliyunecs.systemDiskCategory.placeholder')}} + {{!-- {{input type="text" class="form-control" value=aliyunecsConfig.systemDiskCategory placeholder=(t 'machine.driverAliyunecs.systemDiskCategory.placeholder')}} --}} + {{new-select + classNames="form-control" + content=systemDiskCategory + optionLabelPath='value' + value=aliyunecsConfig.systemDiskCategory + }}
@@ -118,7 +123,13 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.diskCategory placeholder=(t 'machine.driverAliyunecs.dataDiskCategory.placeholder')}} + {{!-- {{input type="text" class="form-control" value=aliyunecsConfig.diskCategory placeholder=(t 'machine.driverAliyunecs.dataDiskCategory.placeholder')}} --}} + {{new-select + classNames="form-control" + content=dataDiskCategory + optionLabelPath='value' + value=aliyunecsConfig.diskCategory + }}
@@ -137,7 +148,13 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.region placeholder=(t 'machine.driverAliyunecs.region.placeholder')}} + {{!-- {{input type="text" class="form-control" value=aliyunecsConfig.region placeholder=(t 'machine.driverAliyunecs.region.placeholder')}} --}} + {{new-select + classNames="form-control" + content=regions + optionLabelPath='value' + value=aliyunecsConfig.region + }}
@@ -189,8 +206,19 @@
- {{input type="checkbox" class="form-control" checked=aliyunecsConfig.privateAddressOnly}} + +
+ {{#if (not aliyunecsConfig.privateAddressOnly)}} +
+ +
+
+
+ {{input type="text" class="form-control" value=aliyunecsConfig.internetMaxBandwidth placeholder=(t 'machine.driverAliyunecs.internetMaxBandwidth.placeholder')}} +
Mbps
+
+ {{/if}}
@@ -208,7 +236,7 @@
- {{input type="text" class="form-control" value=aliyunecsConfig.sshPassword placeholder=(t 'machine.driverAliyunecs.sshPassword.placeholder')}} + {{input type="password" class="form-control" value=aliyunecsConfig.sshPassword placeholder=(t 'machine.driverAliyunecs.sshPassword.placeholder')}}
diff --git a/app/components/machine/driver-amazonec2/component.js b/app/components/machine/driver-amazonec2/component.js index 1819cc0fa5..da3629776b 100644 --- a/app/components/machine/driver-amazonec2/component.js +++ b/app/components/machine/driver-amazonec2/component.js @@ -54,15 +54,533 @@ let RANCHER_INGRESS_RULES = [ ]; let INSTANCE_TYPES = [ - 't2.nano','t2.micro','t2.small','t2.medium', 't2.large','t2.xlarge','t2.2xlarge', - 'm3.medium','m3.large','m3.xlarge','m3.2xlarge', - 'm4.large','m4.xlarge','m4.2xlarge','m4.4xlarge','m4.10xlarge', - 'c4.large','c4.xlarge','c4.2xlarge','c4.4xlarge','c4.8xlarge', - 'c3.large','c3.xlarge','c3.2xlarge','c3.4xlarge','c3.8xlarge', - 'r3.large','r3.xlarge','r3.2xlarge','r3.4xlarge','r3.8xlarge', - 'g2.2xlarge','g2.8xlarge', - 'i2.xlarge','i2.2xlarge','i2.4xlarge','i2.8xlarge', - 'd2.xlarge','d2.2xlarge','d2.4xlarge','d2.8xlarge', + { + group: 'T2 - Burstable', + name: 't2.nano' + }, + { + group: 'T2 - Burstable', + name: 't2.micro' + }, + { + group: 'T2 - Burstable', + name: 't2.small' + }, + { + group: 'T2 - Burstable', + name: 't2.medium' + }, + { + group: 'T2 - Burstable', + name: 't2.large' + }, + { + group: 'T2 - Burstable', + name: 't2.xlarge' + }, + { + group: 'T2 - Burstable', + name: 't2.2xlarge' + }, + + { + group: 'T3 - Burstable', + name: 't3.nano' + }, + { + group: 'T3 - Burstable', + name: 't3.micro' + }, + { + group: 'T3 - Burstable', + name: 't3.small' + }, + { + group: 'T3 - Burstable', + name: 't3.medium' + }, + { + group: 'T3 - Burstable', + name: 't3.large' + }, + { + group: 'T3 - Burstable', + name: 't3.xlarge' + }, + { + group: 'T3 - Burstable', + name: 't3.2xlarge' + }, + + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.nano' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.micro' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.small' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.medium' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.large' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.xlarge' + }, + { + group: 'T3a - Burstable AMD Epyc', + name: 't3a.2xlarge' + }, + + { + group: 'M5 - General Purpose', + name: 'm5.large' + }, + { + group: 'M5 - General Purpose', + name: 'm5.xlarge' + }, + { + group: 'M5 - General Purpose', + name: 'm5.2xlarge' + }, + { + group: 'M5 - General Purpose', + name: 'm5.4xlarge' + }, + { + group: 'M5 - General Purpose', + name: 'm5.12xlarge' + }, + { + group: 'M5 - General Purpose', + name: 'm5.24xlarge' + }, + + { + group: 'M5d - General Purpose SSD', + name: 'm5d.large' + }, + { + group: 'M5d - General Purpose SSD', + name: 'm5d.xlarge' + }, + { + group: 'M5d - General Purpose SSD', + name: 'm5d.2xlarge' + }, + { + group: 'M5d - General Purpose SSD', + name: 'm5d.4xlarge' + }, + { + group: 'M5d - General Purpose SSD', + name: 'm5d.12xlarge' + }, + { + group: 'M5d - General Purpose SSD', + name: 'm5d.24xlarge' + }, + + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.large' + }, + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.xlarge' + }, + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.2xlarge' + }, + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.4xlarge' + }, + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.12xlarge' + }, + { + group: 'M5a - General Purpose AMD Epyc', + name: 'm5a.24xlarge' + }, + + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.large' + }, + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.xlarge' + }, + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.2xlarge' + }, + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.4xlarge' + }, + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.12xlarge' + }, + { + group: 'M5ad - General Purpose SSD AMD Epyc', + name: 'm5ad.24xlarge' + }, + + { + group: 'M4 - General Purpose', + name: 'm4.large' + }, + { + group: 'M4 - General Purpose', + name: 'm4.xlarge' + }, + { + group: 'M4 - General Purpose', + name: 'm4.2xlarge' + }, + { + group: 'M4 - General Purpose', + name: 'm4.4xlarge' + }, + { + group: 'M4 - General Purpose', + name: 'm4.10xlarge' + }, + { + group: 'M4 - General Purpose', + name: 'm4.16xlarge' + }, + + { + group: 'M3 - General Purpose', + name: 'm3.medium' + }, + { + group: 'M3 - General Purpose', + name: 'm3.large' + }, + { + group: 'M3 - General Purpose', + name: 'm3.xlarge' + }, + { + group: 'M3 - General Purpose', + name: 'm3.2xlarge' + }, + + { + group: 'C5 - High CPU', + name: 'c5.large' + }, + { + group: 'C5 - High CPU', + name: 'c5.xlarge' + }, + { + group: 'C5 - High CPU', + name: 'c5.2xlarge' + }, + { + group: 'C5 - High CPU', + name: 'c5.4xlarge' + }, + { + group: 'C5 - High CPU', + name: 'c5.9xlarge' + }, + { + group: 'C5 - High CPU', + name: 'c5.18xlarge' + }, + + { + group: 'C4 - High CPU', + name: 'c4.large' + }, + { + group: 'C4 - High CPU', + name: 'c4.xlarge' + }, + { + group: 'C4 - High CPU', + name: 'c4.2xlarge' + }, + { + group: 'C4 - High CPU', + name: 'c4.4xlarge' + }, + { + group: 'C4 - High CPU', + name: 'c4.8xlarge' + }, + + { + group: 'C3 - High CPU', + name: 'c3.large' + }, + { + group: 'C3 - High CPU', + name: 'c3.xlarge' + }, + { + group: 'C3 - High CPU', + name: 'c3.2xlarge' + }, + { + group: 'C3 - High CPU', + name: 'c3.4xlarge' + }, + { + group: 'C3 - High CPU', + name: 'c3.8xlarge' + }, + + { + group: 'R3 - High Memory', + name: 'r3.large' + }, + { + group: 'R3 - High Memory', + name: 'r3.xlarge' + }, + { + group: 'R3 - High Memory', + name: 'r3.2xlarge' + }, + { + group: 'R3 - High Memory', + name: 'r3.4xlarge' + }, + { + group: 'R3 - High Memory', + name: 'r3.8xlarge' + }, + + { + group: 'R4 - High Memory', + name: 'r4.large' + }, + { + group: 'R4 - High Memory', + name: 'r4.xlarge' + }, + { + group: 'R4 - High Memory', + name: 'r4.2xlarge' + }, + { + group: 'R4 - High Memory', + name: 'r4.4xlarge' + }, + { + group: 'R4 - High Memory', + name: 'r4.8xlarge' + }, + { + group: 'R4 - High Memory', + name: 'r4.16xlarge' + }, + + { + group: 'R5 - High Memory Optimized', + name: 'r5.large' + }, + { + group: 'R5 - High Memory Optimized', + name: 'r5.xlarge' + }, + { + group: 'R5 - High Memory Optimized', + name: 'r5.2xlarge' + }, + { + group: 'R5 - High Memory Optimized', + name: 'r5.4xlarge' + }, + { + group: 'R5 - High Memory Optimized', + name: 'r5.12xlarge' + }, + { + group: 'R5 - High Memory Optimized', + name: 'r5.24xlarge' + }, + + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.large' + }, + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.xlarge' + }, + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.2xlarge' + }, + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.4xlarge' + }, + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.12xlarge' + }, + { + group: 'R5d - High Memory Optimized & Local Storage', + name: 'r5d.24xlarge' + }, + + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.large' + }, + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.xlarge' + }, + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.2xlarge' + }, + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.4xlarge' + }, + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.12xlarge' + }, + { + group: 'R5a - High Memory Optimized AMD Epyc', + name: 'r5a.24xlarge' + }, + + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.large' + }, + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.xlarge' + }, + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.2xlarge' + }, + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.4xlarge' + }, + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.12xlarge' + }, + { + group: 'R5ad - High Memory Optimized & Local Storage AMD Epyc', + name: 'r5ad.24xlarge' + }, + + { + group: 'D2 - High Density Storage', + name: 'd2.xlarge' + }, + { + group: 'D2 - High Density Storage', + name: 'd2.2xlarge' + }, + { + group: 'D2 - High Density Storage', + name: 'd2.4xlarge' + }, + { + group: 'D2 - High Density Storage', + name: 'd2.8xlarge' + }, + + { + group: 'I3 - High I/O Storage', + name: 'i3.large' + }, + { + group: 'I3 - High I/O Storage', + name: 'i3.xlarge' + }, + { + group: 'I3 - High I/O Storage', + name: 'i3.2xlarge' + }, + { + group: 'I3 - High I/O Storage', + name: 'i3.4xlarge' + }, + { + group: 'I3 - High I/O Storage', + name: 'i3.8xlarge' + }, + { + group: 'I3 - High I/O Storage', + name: 'i3.16xlarge' + }, + + { + group: 'F1 - FPGA', + name: 'f1.2xlarge' + }, + { + group: 'F1 - FPGA', + name: 'f1.16xlarge' + }, + + { + group: 'G3 - GPU', + name: 'g3.4xlarge' + }, + { + group: 'G3 - GPU', + name: 'g3.8xlarge' + }, + { + group: 'G3 - GPU', + name: 'g3.16xlarge' + }, + + { + group: 'P2 - GPU', + name: 'p2.xlarge' + }, + { + group: 'P2 - GPU', + name: 'p2.8xlarge' + }, + { + group: 'P2 - GPU', + name: 'p2.16xlarge' + }, + + { + group: 'X1 - Really High Memory', + name: 'x1.16xlarge' + }, + { + group: 'X1 - Really High Memory', + name: 'x1.32xlarge' + }, ]; // These need to match the supported list in docker-machine: @@ -77,6 +595,7 @@ let REGIONS = [ "cn-north-1", "eu-west-1", "eu-west-2", + "eu-west-3", "eu-central-1", "sa-east-1", "us-east-1", @@ -107,6 +626,7 @@ export default Ember.Component.extend(Driver, { driverName : 'amazonec2', model : null, amazonec2Config : Ember.computed.alias('model.amazonec2Config'), + intl : Ember.inject.service(), clients : null, allSubnets : null, @@ -507,7 +1027,11 @@ export default Ember.Component.extend(Driver, { }), zoneChoices: function() { - return (this.get('allSubnets')||[]).map((subnet) => {return subnet.get('zone');}).sort().uniq(); + const choices = (this.get('allSubnets')||[]).map((subnet) => {return subnet.get('zone');}).sort().uniq(); + if ( choices.length ) { + this.set('selectedZone', choices[0]); + } + return choices; }.property('allSubnets.@each.{zone}'), subnetChoices: function() { @@ -578,4 +1102,26 @@ export default Ember.Component.extend(Driver, { subnetById: function(id) { return (this.get('allSubnets')||[]).filterBy('subnetId',id)[0]; }, + + validate() { + let errors = []; + let config = this.get('amazonec2Config'); + + if ( !this.get('nameParts.prefix') && !this.get('nameParts.name') ) { + errors.push('Name is required'); + } + + if (Object.keys(config.get('tags'))) { + let tags = config.get('tags'); + + Object.keys(tags).forEach((tag) => { + if (tag.indexOf(',') > -1 || tags[tag].indexOf(',') > -1) { + errors.push(this.get('intl').t('machine.driverAmazon.tags.error', {tag: tag})); + } + }); + } + + this.set('errors', errors); + return errors.length === 0; + }, }); diff --git a/app/components/machine/driver-amazonec2/template.hbs b/app/components/machine/driver-amazonec2/template.hbs index e0c6da65eb..04bab071ed 100644 --- a/app/components/machine/driver-amazonec2/template.hbs +++ b/app/components/machine/driver-amazonec2/template.hbs @@ -238,11 +238,14 @@
- + {{new-select + classNames="form-control" + value=amazonec2Config.instanceType + content=instanceTypes + optionValuePath="name" + optionLabelPath="name" + optionGroupPath="group" + }}
@@ -290,6 +293,22 @@
+
+
+ +
+
+ {{form-key-value + initialMap=amazonec2Config.tags + changed=(action (mut amazonec2Config.tags)) + addActionLabel="machine.driverAmazon.tags.addAction" + keyLabel="machine.driverAmazon.tags.keyLabel" + keyPlaceholder="machine.driverAmazon.tags.keyPlaceholder" + valueLabel="machine.driverAmazon.tags.valueLabel" + valuePlaceholder="machine.driverAmazon.tags.valuePlaceholder" + }} +
+
{{#if model}} {{partial "host/add-options"}} diff --git a/app/components/machine/driver-azure/component.js b/app/components/machine/driver-azure/component.js index 106edd4688..127be32438 100644 --- a/app/components/machine/driver-azure/component.js +++ b/app/components/machine/driver-azure/component.js @@ -1,15 +1,17 @@ import Ember from 'ember'; -import { regions, sizes, storageTypes, environments } from 'ui/utils/azure-choices'; +import { regions, storageTypes, environments } from 'ui/utils/azure-choices'; +import { sizes } from 'ui/utils/azure-vm-choices'; import Driver from 'ui/mixins/driver'; export default Ember.Component.extend(Driver, { azureConfig : Ember.computed.alias('model.azureConfig'), environments : environments.sortBy('value'), - sizeChoices : sizes.sortBy('value'), + vmTypeChoices : sizes, driverName : 'azure', model : null, openPorts : null, publicIpChoice : null, + selectedVmType : null, publicIpChoices : [ { 'name': 'Static', @@ -66,6 +68,28 @@ export default Ember.Component.extend(Driver, { } }, + vmSizeChoices: Ember.computed('azureConfig.location', 'selectedVmType', function() { + const location = this.get('azureConfig.location'); + const selectedVmType = this.get('selectedVmType'); + const found = sizes.findBy('label', selectedVmType); + const out = []; + if ( found && found.series ) { + found.series.filter((ss) => !ss.invalidRegions || ss.invalidRegions.indexOf(location) === -1).forEach(((s) => { + s.sizes.forEach((item) => { + out.push({ + group: s.label, + label: `${item.size} ( ${item.cpu} ${item.cpu > 1 ? 'Cores': 'Core'} ${item.memory}GB RAM )`, + value: item.size, + }); + }); + })); + } + if ( out.length === 0 ) { + this.set('azureConfig.size', null); + } + return out; + }), + regionChoices: Ember.computed('azureConfig.environment', function() { let environment = this.get('azureConfig.environment'); return regions[environment]; diff --git a/app/components/machine/driver-azure/template.hbs b/app/components/machine/driver-azure/template.hbs index f2a5d4bdc5..3d20cfa6c0 100644 --- a/app/components/machine/driver-azure/template.hbs +++ b/app/components/machine/driver-azure/template.hbs @@ -144,17 +144,30 @@
{{input type="text" value=azureConfig.image classNames="form-control" placeholder=(t 'machine.driverAzure.image.placeholder')}}
+ + +
+
+ +
+
+ {{new-select + classNames="form-control" + content=vmTypeChoices + optionValuePath='label' + value=selectedVmType + }} +
{{new-select classNames="form-control" - content=sizeChoices - optionLabelPath='value' + content=vmSizeChoices optionGroupPath='group' value=azureConfig.size - }} + }}
diff --git a/app/components/machine/driver-custom/component.js b/app/components/machine/driver-custom/component.js index 0d7083ff6d..8ba7262b7b 100644 --- a/app/components/machine/driver-custom/component.js +++ b/app/components/machine/driver-custom/component.js @@ -1,12 +1,15 @@ import Ember from 'ember'; import ManageLabels from 'ui/mixins/manage-labels'; import Util from 'ui/utils/util'; +import C from 'ui/utils/constants'; export default Ember.Component.extend(ManageLabels, { settings : Ember.inject.service(), projects : Ember.inject.service(), cattleAgentIp : null, model : null, + subnet : null, + routerIp : null, actions: { cancel() { @@ -15,13 +18,39 @@ export default Ember.Component.extend(ManageLabels, { setLabels(labels) { if ( this.get('model') ) { - var out = {}; + var out = {}; labels.forEach((row) => { out[row.key] = row.value; }); - + var subnet=this.get('subnet'); + var routerIp=this.get('routerIp'); + if (subnet) { + out[C.LABEL.PER_HOST_SUBNET]=subnet; + } + if (routerIp) { + out[C.LABEL.PER_HOST_SUBNET_ROUTING_IP]=routerIp; + } this.set('model.labels', out); } + }, + + subnetOnChange(){ + if ( this.get('model') ) { + var out = {}; + const labels = Object.assign({}, this.get('model.labels')); + for(var tmp in labels){ + out[tmp]=labels[tmp]; + } + var subnet=this.get('subnet'); + var routerIp=this.get('routerIp'); + if (subnet) { + out[C.LABEL.PER_HOST_SUBNET]=subnet; + } + if (routerIp) { + out[C.LABEL.PER_HOST_SUBNET_ROUTING_IP]=routerIp; + } + this.set('model.labels',out); + } } }, @@ -79,11 +108,21 @@ export default Ember.Component.extend(ManageLabels, { registrationCommandWindows: function() { let url = this.get('model.registrationUrl'); - - return `New-Item -Path 'C:\\Program Files\\rancher' -Type Directory -Invoke-WebRequest -UseBasicParsing 'https://github.com/rancher/agent/releases/download/v0.6.0/agent.exe' -OutFile 'C:\\Program Files\\rancher\\agent.exe' -& 'C:\\Program Files\\rancher\\agent.exe' -register-service ${url} -Start-Service rancher-agent`; - }.property('model.command'), + let cattleIp = this.get('cattleAgentIp'); + let env = Util.addQueryParams('', this.get('model.labels')||{}); + let cmd1=`New-Item -Path 'C:\\Program Files\\rancher' -Type Directory`; + let cmd2 = this.get('model.windowsCommand'); + cmd2 = cmd2 + ` -RegisterUrl ${url}`; + if (env) { + env = env.substr(1); + cmd2 = cmd2 + ` -HostLabels "${env}"`; + } + if (cattleIp){ + cmd2 = cmd2 + ` -AgentIp "${cattleIp}"`; + } + cmd2 = `$obj=$(${cmd2})`; + let cmd3 = `$obj |& "C:\\Program Files\\rancher\\startup.ps1"`; + return cmd1 + "\n" + cmd2 + "\n" + cmd3; + }.property('model.command','model.labels', 'cattleAgentIp'), }); diff --git a/app/components/machine/driver-custom/template.hbs b/app/components/machine/driver-custom/template.hbs index f3cb9d83e5..1cc20cacad 100644 --- a/app/components/machine/driver-custom/template.hbs +++ b/app/components/machine/driver-custom/template.hbs @@ -1,43 +1,73 @@ {{#if projects.current.isWindows}}
-

{{t 'machine.driverCustom.windows.windowsHeader'}}

  • 1 - {{format-html-message 'machine.driverCustom.windows.step1'}} + {{format-html-message 'machine.driverCustom.windowsSteps.step1' docsBase=settings.docsBase}}
  • 2 - {{format-html-message 'machine.driverCustom.windows.step2'}} + {{format-html-message 'machine.driverCustom.windowsSteps.step2'}}
    - 
    {{t 'machine.driverCustom.windows.step2Copy'}}
    - {{copy-to-clipboard clipboardText=(t 'machine.driverCustom.windows.step2Copy')}} + 
    {{t 'machine.driverCustom.windowsSteps.step2Copy'}}
    + {{copy-to-clipboard clipboardText=(t 'machine.driverCustom.windowsSteps.step2Copy')}} +
    +
    + {{format-html-message 'machine.driverCustom.windowsSteps.step2Note'}}
  • 3 - {{t 'machine.driverCustom.windows.step3' appName=settings.appName}} + {{format-html-message 'machine.driverCustom.windowsSteps.step3' rancherImage=settings.rancherImage}} +
    + {{input type="text" value=subnet classNames="form-control" input=(action 'subnetOnChange') placeholder=(t 'machine.driverCustom.windowsSteps.subnet.placeholder')}} +
    +
    • +
  • + 4 + {{format-html-message 'machine.driverCustom.windowsSteps.step4' rancherImage=settings.rancherImage}} +
    + {{input type="text" value=routerIp classNames="form-control" input=(action 'subnetOnChange') placeholder=(t 'machine.driverCustom.windowsSteps.routerIp.placeholder')}} +
    +
    • +
  • + 5 + {{format-html-message 'machine.driverCustom.windowsSteps.step5' rancherImage=settings.rancherImage}} +
    + {{input type="text" value=cattleAgentIp classNames="form-control" placeholder=(t 'machine.driverCustom.agentIp.placeholder')}} +
    +
    • +
  • + 6 + {{t 'machine.driverCustom.windowsSteps.step6'}} +
    + {{form-user-labels setLabels=(action 'setLabels')}} +
    +
    • +
  • + 7 + {{t 'machine.driverCustom.windowsSteps.step7' appName=settings.appName}} 
    {{registrationCommandWindows}}
    {{copy-to-clipboard clipboardText=registrationCommandWindows}}
  • - 3 + 8 {{t 'machine.driverCustom.step5Close.part1'}} {{#link-to "hosts"}}{{t 'machine.driverCustom.step5Close.link'}}{{/link-to}} {{t 'machine.driverCustom.step5Close.part2'}}
+
+ +
-{{/if}} +{{else}}
- {{#if projects.current.isWindows}} -

{{t 'machine.driverCustom.windows.linuxHeader'}}

- {{/if}}
    @@ -85,8 +115,8 @@
-
+{{/if}} \ No newline at end of file diff --git a/app/components/machine/driver-digitalocean/component.js b/app/components/machine/driver-digitalocean/component.js index 97bd2ecb61..9eda51ba00 100644 --- a/app/components/machine/driver-digitalocean/component.js +++ b/app/components/machine/driver-digitalocean/component.js @@ -30,6 +30,7 @@ export default Ember.Component.extend(Driver, { sizeChoices: null, imageChoices: null, gettingData: false, + tags: null, filteredSizeChoices: Ember.computed('digitaloceanConfig.region', function(){ let region = this.get('regionChoices').findBy('slug', this.get('digitaloceanConfig.region')); @@ -114,6 +115,9 @@ export default Ember.Component.extend(Driver, { })); }, + tagsDidChange: Ember.observer('tags', function() { + this.set('digitaloceanConfig.tags', this.get('tags').join(',')); + }), validate: function() { this._super(); diff --git a/app/components/machine/driver-digitalocean/template.hbs b/app/components/machine/driver-digitalocean/template.hbs index 6cabd0c09a..23fb0641db 100644 --- a/app/components/machine/driver-digitalocean/template.hbs +++ b/app/components/machine/driver-digitalocean/template.hbs @@ -80,6 +80,16 @@ {{input type="text" value=digitaloceanConfig.sshUser classNames="form-control" placeholder=(t 'machine.driverDigitalocean.sshUser.placeholder')}} +
+
+ {{form-value-array + changed=(action (mut tags)) + addActionLabel='machine.driverDigitalocean.tags.addActionLabel' + valueLabel='machine.driverDigitalocean.tags.valueLabel' + valuePlaceholder='machine.driverDigitalocean.tags.placeholder' + }} +
+
{{t 'machine.driverDigitalocean.optionsSection'}} @@ -102,6 +112,11 @@
+ +
+ +
+ diff --git a/app/components/machine/driver-exoscale/component.js b/app/components/machine/driver-exoscale/component.js index 192f9db6db..2841c4dc43 100644 --- a/app/components/machine/driver-exoscale/component.js +++ b/app/components/machine/driver-exoscale/component.js @@ -2,7 +2,6 @@ import Ember from 'ember'; import Driver from 'ui/mixins/driver'; import { ajaxPromise } from 'ember-api-store/utils/ajax-promise'; -let RANCHER_TEMPLATE = 'Linux Ubuntu 14.04 LTS 64-bit'; let RANCHER_GROUP = 'rancher-machine'; let RANCHER_INGRESS_RULES = [ { @@ -42,9 +41,13 @@ export default Ember.Component.extend(Driver, { model : null, exoscaleConfig : Ember.computed.alias('model.exoscaleConfig'), - allDiskSizes : null, allInstanceProfiles : null, + allTemplates : null, + allZones : null, + selectedZone : null, + defaultZone : 'ch-dk-2', + whichZone : '91e5e9e4-c9ed-4b76-bee4-427004b3baf9', allSecurityGroups : null, selectedSecurityGroup : null, defaultSecurityGroup : null, @@ -60,10 +63,14 @@ export default Ember.Component.extend(Driver, { isStep4 : Ember.computed.equal('step',4), isStep5 : Ember.computed.equal('step',5), isStep6 : Ember.computed.equal('step',6), + isStep7 : Ember.computed.equal('step',7), + isStep8 : Ember.computed.equal('step',8), isGteStep3 : Ember.computed.gte('step',3), isGteStep4 : Ember.computed.gte('step',4), isGteStep5 : Ember.computed.gte('step',5), isGteStep6 : Ember.computed.gte('step',6), + isGteStep7 : Ember.computed.gte('step',7), + isGteStep8 : Ember.computed.gte('step',8), bootstrap: function() { let config = this.get('store').createRecord({ @@ -71,8 +78,9 @@ export default Ember.Component.extend(Driver, { apiKey: '', apiSecretKey: '', diskSize: 50, - instanceProfile: 'small', - securityGroup: 'rancher-machine' + template: 'Linux Ubuntu 14.04 LTS 64-bit', + instanceProfile: 'Medium', + securityGroup: 'rancher-machine', }); this.set('model', this.get('store').createRecord({ @@ -112,11 +120,58 @@ export default Ember.Component.extend(Driver, { this.set('exoscaleConfig.apiKey', (this.get('exoscaleConfig.apiKey')||'').trim()); this.set('exoscaleConfig.apiSecretKey', (this.get('exoscaleConfig.apiSecretKey')||'').trim()); + + this.apiRequest('listZones').then((res) => { + let zones = []; + let defaultZone = null; + + (res.listzonesresponse.zone || []).forEach((zone) => { + let obj = { + id : zone.id, + name : zone.name, + isDefault : zone.name === this.get('defaultZone'), + }; + + zones.push(obj); + if (zone.isDefault && !defaultZone) { + defaultZone = obj; + } + }); + + this.set('step', 3); + this.set('allZones', zones); + this.set('defaultZone', defaultZone); + this.set('selectedZone', this.get('exoscaleConfig.zone') || this.get('allZones.firstObject.id')); + }, (err) => { + let errors = this.get('errors') || []; + errors.pushObject(this.apiErrorMessage( + err, + 'listzonesresponse', + 'While requesting zones', + 'Authentication failure: please check the provided access credentials' + )); + this.set('errors', errors); + this.set('step', 1); + }); + }, + + /* Zone selection */ + selectZone: function() { + this.set('errors',null); + + this.set('exoscaleConfig.zone', this.get('selectedZone')); + (this.get('allZones') || []).forEach((zone) => { + if (zone.id === this.get('selectedZone')) { + this.set('exoscaleConfig.zoneName', zone.name); + } + }); + + this.set('step', 4); this.apiRequest('listSecurityGroups').then((res) => { let groups = []; let defaultGroup = null; - /* Retrieve the list of security groups. */ + // Retrieve the list of security groups. (res.listsecuritygroupsresponse.securitygroup || []) .forEach((group) => { let obj = { @@ -132,8 +187,8 @@ export default Ember.Component.extend(Driver, { } }); - /* Move to next step */ - this.set('step', 3); + // Move to next step + this.set('step', 5); this.set('allSecurityGroups', groups); this.set('defaultSecurityGroup', defaultGroup); this.set('selectedSecurityGroup', this.get('exoscaleConfig.securityGroup') || this.get('allSecurityGroups.firstObject.id')); @@ -144,7 +199,7 @@ export default Ember.Component.extend(Driver, { 'While requesting security groups', 'Authentication failure: please check the provided access credentials')); this.set('errors', errors); - this.set('step', 1); + this.set('step', 3); }); }, @@ -170,7 +225,7 @@ export default Ember.Component.extend(Driver, { } /* We need to create the security group */ - this.set('step', 4); + this.set('step', 6); this.apiRequest('createSecurityGroup', { name : this.get('defaultSecurityGroupName'), description : this.get('settings.appName') + ' default security group' @@ -191,7 +246,7 @@ export default Ember.Component.extend(Driver, { 'While setting default security group', 'Unable to configure the default security group')); this.set('errors', errors); - this.set('step', 3); + this.set('step', 5); } else { this.fetchInstanceSettings(); } @@ -203,23 +258,25 @@ export default Ember.Component.extend(Driver, { 'While creating default security group', 'Unable to create the default security group')); this.set('errors', errors); - this.set('step', 3); + this.set('step', 5); }); } }, fetchInstanceSettings: function() { - this.set('step', 5); + this.set('step', 7); /* First, get a list of templates to get available disk sizes */ this.apiRequest('listTemplates', { templatefilter : 'featured', - name : RANCHER_TEMPLATE + zoneid : this.get('exoscaleConfig.zone') }).then((res) => { - this.set('allDiskSizes', + this.set('allTemplates', res.listtemplatesresponse.template - .map((item) => Math.round(item.size / 1024 / 1024 / 1024)) - .sort((a, b) => (a - b)).uniq()); + .filter((item) => item.name.startsWith('Linux')) + .map((item) => item.name) + .sort() + .uniq()); /* Also get the instance types */ return this.apiRequest('listServiceOfferings', { issystem: 'false' @@ -236,7 +293,7 @@ export default Ember.Component.extend(Driver, { return 0; }) .map((item) => ({ name: item.name, displaytext: item.displaytext }))); - this.set('step', 6); + this.set('step', 8); }, (err) => { let errors = this.get('errors')||[]; errors.pushObject(this.apiErrorMessage(err, @@ -244,7 +301,7 @@ export default Ember.Component.extend(Driver, { 'While getting list of instance types', 'Unable to get list of instance types')); this.set('errors', errors); - this.set('step', 3); + this.set('step', 5); }); }, (err) => { let errors = this.get('errors')||[]; @@ -253,7 +310,7 @@ export default Ember.Component.extend(Driver, { 'While getting list of available images', 'Unable to get list of available images')); this.set('errors', errors); - this.set('step', 3); + this.set('step', 5); }); }, diff --git a/app/components/machine/driver-exoscale/template.hbs b/app/components/machine/driver-exoscale/template.hbs index 7702f44bd7..40a6da0829 100644 --- a/app/components/machine/driver-exoscale/template.hbs +++ b/app/components/machine/driver-exoscale/template.hbs @@ -46,22 +46,65 @@
- {{t 'machine.driverExoscale.loadingSecurity'}} + {{t 'machine.driverExoscale.loadingZone'}}
- {{t 'machine.driverExoscale.securityGroupSection'}} + {{t 'machine.driverExoscale.zoneSection'}}
- +
{{#if isStep3}} + {{#each allZones as |choice|}} +
+ {{/each}} + {{else}} +
+ {{exoscaleConfig.zoneName}} +
+ {{/if}} +
+
+
+ {{#if isStep3}} + {{top-errors errors=errors}} + +
+ + +
+ {{/if}} +
+ + +
+
+ {{t 'machine.driverExoscale.loadingSecurity'}} +
+
+ +
+
+
+ {{t 'machine.driverExoscale.securityGroupSection'}} +
+ +
+
+ +
+
+ {{#if isStep5}}
- {{#if isStep3}} + {{#if isStep5}} {{top-errors errors=errors}}
@@ -108,7 +151,7 @@ {{/if}}
-
+
{{#if defaultSecurityGroup}} @@ -119,13 +162,13 @@
-
+
{{t 'machine.driverExoscale.loadingInstance'}}
-
+
{{t 'machine.driverExoscale.instanceSection'}} @@ -148,15 +191,21 @@
- + {{input type="number" classNames="form-control" min=10 max=1600 step=10 value=exoscaleConfig.diskSize}}
+
+ +
+
+ +
diff --git a/app/components/machine/driver-otc/component.js b/app/components/machine/driver-otc/component.js new file mode 100644 index 0000000000..4442e5b912 --- /dev/null +++ b/app/components/machine/driver-otc/component.js @@ -0,0 +1,394 @@ +import Ember from 'ember'; +import Driver from 'ui/mixins/driver'; +import fetch from 'ember-api-store/utils/fetch'; + +const VOLUME_TYPES = [{ + name: 'SAS', +}, { + name: 'SATA', +}, { + name: 'SSD', +}, ]; + +const URLS = { + ecs: 'https://ecs.eu-de.otc.t-systems.com', + vpc: 'https://vpc.eu-de.otc.t-systems.com' +}; + +const SERVICE = 'ecs'; + +export default Ember.Component.extend(Driver, { + driverName: 'otcConfig', + catalogUrls: null, + step: 1, + _prevStep: 1, + errors: null, + intl: Ember.inject.service(), + volumeTypes: VOLUME_TYPES, + itemsLoading: false, + flavors: null, + images: null, + osAvailabilityZone: null, + subnet: null, + + init: function() { + this._super(...arguments); + if (!this.get('clonedModel')) { + this.initModel(); + } + }, + + + initModel: function() { + var config = this.get('store').createRecord({ + type: 'otcConfig', + serviceEndpoint: URLS.ecs, + region: 'eu-de', + sshUser: 'linux', + }); + + var type = 'host'; + + if (!this.get('useHost')) { + type = 'machine'; + } + + this.set('model', this.get('store').createRecord({ + type: type, + 'otcConfig': config, + })); + }, + + actions: { + authorizeCreds: function() { + this.setProperties({ + _prevStep: 1, + step: 2, + errors: null, + }); + this.getZones().then(() => { + this.getNetworks().then(() => { + }); + }); + }, + goToStep3: function() { + this.setProperties({ + _prevStep: 2, + step: 3, + errors: null, + }); + this.getSubnets().then(() => { + this.getSecurityGroups(); + }); + }, + goToStep4: function() { + this.setProperties({ + _prevStep: 3, + step: 4, + errors: null, + }); + this.getFlavors().then(() => { + this.getImage(); + }); + }, + + }, + + validate() { + this._super(...arguments); + let errors = this.get('errors'); + + if ( !this.get('model.otcConfig.flavorId')) { + errors.push('Flavor is required'); + } + + if ( !this.get('model.otcConfig.imageId')) { + errors.push('Image is required'); + } + + this.set('errors', errors); + return errors.length === 0; + }, + + + getURL: function(type, version, endpoint, qp) { + var proxyEndpoint = this.get('app.proxyEndpoint'); + var catalog = URLS; + var url = `${catalog[type]}/${version}/${this.get('model.otcConfig.tenantId')}`; + var proxyUrl = `${proxyEndpoint}/${url}`; + var parsedURL = parseURL(url); + var host = parsedURL.host; + var path = parsedURL.pathname; + + if (endpoint) { + proxyUrl += '/' + endpoint; + path = path + '/' + endpoint; + + } + + function parseURL(urlIn) { + var parser = document.createElement('a'); + parser.href = urlIn; + // parser.hostname; // => "example.com" + // parser.port; // => "3000" + // parser.pathname; // => "/pathname/" + // parser.search; // => "?search=test" + // parser.hash; // => "#hash" + // parser.host; // => "example.com:3000" + return parser; + + } + return { + endpoint: proxyUrl, + url: path, + host: host, + qp: qp + }; + }, + + describeRequest: function(url, method, t, body) { + return { + url: `${url.endpoint.substr(-1) === '/' ? url.endpoint.replace(/\/$/, '') : url.endpoint}?${url.qp}`, + urlToEncode: url.url.substr(-1) === '/' ? url.url : `${url.url}/`, + method: method, + headers: { + 'x-sdk-date': t, // long date + 'host': url.host, + 'content-type': '', + }, + queryString: url.qp, + body: body, + params: {} + }; + }, + + signAuth: function(credentials, req, time, serviceEndpoint=null) { + var self = this; + var request = req; + var addAuthorization = (credentials) => { + let r = request; + + r.params.Timestamp = time.format('YYYYMMDDTHHmmss') + 'Z'; + r.params.ShortTimestamp = time.format('YYYYMMDD'); + r.params.SignatureMethod = 'SDK-HMAC-SHA256'; + r.params.accessKeyId = credentials.accessKeyId; + r.params.Signature = signature(credentials, serviceEndpoint); + r['Content-Length'] = r.body.length; + r.headers['content-type'] += ' rancher:'; + r.headers['x-api-auth-header'] = buildAuth(r.params, serviceEndpoint); + + return r; + }; + + return addAuthorization(credentials); + + function signature(credentials, serviceEndpoint=null) { + var canonicalRequest = buildCanonicalRequest(request); + var hashedSigingString = AWS.util.crypto.sha256(canonicalRequest, 'hex'); + var credScope = credentialScope(request.params.ShortTimestamp, self.get('model.otcConfig.region'), serviceEndpoint || SERVICE); + var sts = stringToSign(hashedSigingString, credScope, request.params.Timestamp); + var key = generateSigningKey(credentials.secretAccessKey, self.get('model.otcConfig.region'), serviceEndpoint || SERVICE, request.params.ShortTimestamp); + + return AWS.util.crypto.hmac(key, sts, 'hex'); + } + + function generateSigningKey(sk, rn, sn, t) { + var kDate = AWS.util.crypto.hmac(`SDK${sk}`, t, 'buffer'); + var kRegion = AWS.util.crypto.hmac(kDate, rn, 'buffer'); + var kService = AWS.util.crypto.hmac(kRegion, sn, 'buffer'); + var kSigning = AWS.util.crypto.hmac(kService, 'sdk_request', 'buffer'); + return kSigning; + } + + function credentialScope (time, rname, sname) { + return `${time}/${rname}/${sname}/sdk_request`; + } + + function buildCanonicalHeaders(requestHeaders) { + var headers = []; + var parts = []; + + Object.keys(requestHeaders).forEach((key) => { + headers.push([key, requestHeaders[key]]); + }); + + headers.sort(function (a, b) { + return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : 1; + }); + + headers.forEach((item) => { + var key = item[0].toLowerCase(); + parts.push(`${key}:${item[1].toString().replace(/\s+/g, ' ').replace(/^\s+|\s+$/g, '')}`); + }); + + return `${parts.join('\n')}\n`; + } + + function buildCanonicalQS(qs) { + var qsParts = qs.split('&'); + + qsParts.sort(function (a, b) { + return a[0].toLowerCase() < b[0].toLowerCase() ? -1 : 1; + }); + + qsParts.forEach((qString) => { + qString.replace(/\+/g, '%20'); + }); + + return qsParts.join('&'); + } + + function buildCanonicalRequest(request) { + var parts = []; + + parts.push(request.method); + parts.push(encodeURI(request.urlToEncode)); + parts.push(buildCanonicalQS(request.queryString)); + parts.push(buildCanonicalHeaders(request.headers)); + parts.push('content-type;host;x-sdk-date'); + parts.push(AWS.util.crypto.sha256(request.body, 'hex')); + + return parts.join('\n'); + } + + function stringToSign(canonicalRequest, credentialScope, t) { + var parts = []; + + parts.push('SDK-HMAC-SHA256'); + parts.push(t); + parts.push(credentialScope); + parts.push(canonicalRequest); + + return parts.join('\n'); + } + + function buildAuth(params, serviceEndpoint) { + var out = []; + + out.push(`${params.SignatureMethod} Credential=${params.accessKeyId}/${params.ShortTimestamp}/${self.get('model.otcConfig.region')}/${serviceEndpoint || SERVICE}/sdk_request`); + out.push('SignedHeaders=content-type;host;x-sdk-date'); + out.push(`Signature=${params.Signature}`); + + return out.join(', '); + } + + }, + + apiRequest: function(params) { + var time = moment.utc(); + var signature = this.signAuth({ + accessKeyId: this.get('model.otcConfig.accessKeyId'), + secretAccessKey: this.get('model.otcConfig.accessKeySecret') + }, this.describeRequest(this.getURL(params.serviceEndpoint || SERVICE, params.version, params.endpoint, params.queryParams), params.method, `${time.format('YYYYMMDDTHHmmss')}Z`, ''), time); + + this.set('itemsLoading', true); + + delete signature.headers.host; + + return fetch(signature.url, { + method: params.method, + headers: signature.headers, + }).then((xhr) => { + if (xhr.status >= 200 && xhr.status < 300) { + + this.set('itemsLoading', false); + + return xhr.body; + } else { + + this.set('itemsLoading', false); + this.set('step', this.get('_prevStep')); + + return Ember.RSVP.reject(); + } + }).catch((err) => { + let errors = []; + let errMsg = err.body.message || err.body.badRequest.message; // werid case where we get an odd bad response from the otc driver + + errors.push(errMsg); + + this.setProperties({ + itemsLoading: false, + step: this.get('_prevStep'), + errors: errors.uniq() + }); + + return Ember.RSVP.reject(err); + }); + }, + + getSecurityGroups: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'security-groups', + version: 'v1', + serviceEndpoint: 'vpc', + queryParams: '', + }).then((resp) => { + return this.set('securityGroups', resp.security_groups.sortBy('name')); + }); + }, + + getSubnets: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'subnets', + serviceEndpoint: 'vpc', + version: 'v1', + queryParams: `vpc_id=${this.get('model.otcConfig.vpcId')}` + }).then((resp) => { + let subnets = resp.subnets.filterBy('availability_zone', this.get('model.otcConfig.availableZone')); + if ( subnets.length === 0 ) { + subnets = resp.subnets; + } + return this.set('subnets', subnets.sortBy('name')); + }); + }, + + + getNetworks: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'vpcs', + serviceEndpoint: 'vpc', + version: 'v1', + queryParams: '' + }).then((resp) => { + return this.set('networks', resp.vpcs); + }); + }, + + getZones: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'os-availability-zone', + version: 'v2', + queryParams: '' + }).then((resp) => { + return this.set('osAvailabilityZone', resp.availabilityZoneInfo.filterBy('zoneState.available', true).sortBy('zoneName')); + }); + + }, + + getFlavors: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'cloudservers/flavors', + version: 'v1', + queryParams: '' + }).then((resp) => { + return this.set('flavors', resp.flavors.sortBy('name')); + }); + }, + + getImage: function() { + return this.apiRequest({ + method: 'GET', + endpoint: 'images', + version: 'v2', + queryParams: '' + }).then((resp) => { + return this.set('images', resp.images.sortBy('name')); + }); + }, +}); diff --git a/app/components/machine/driver-otc/template.hbs b/app/components/machine/driver-otc/template.hbs new file mode 100644 index 0000000000..d5ff879e31 --- /dev/null +++ b/app/components/machine/driver-otc/template.hbs @@ -0,0 +1,317 @@ +
+
+
+
+ {{t 'machine.driverOtc.access'}} +
+
+
+ +
+
+ {{#if (eq step 1)}} + {{input type="text" + class="form-control" + name="access-key-id" + value=model.otcConfig.accessKeyId + }} + {{else}} +
{{model.otcConfig.accessKeyId}}
+ {{/if}} +
+
+ +
+
+ {{#if (eq step 1)}} + {{input type="password" + class="form-control" + name="access-key-secret" + value=model.otcConfig.accessKeySecret + }} + {{else}} +
{{t 'machine.driverOtc.provided.password'}}
+ {{/if}} +
+
+
+
+ +
+
+ {{#if (eq step 1)}} + {{input type="text" + class="form-control" + name="tenant-id" + value=model.otcConfig.tenantId + }} + {{else}} +
{{model.otcConfig.tenantId}}
+ {{/if}} +
+
+ {{#if (eq step 1)}} +
+ {{#if itemsLoading}} + + {{else}} + {{#if (and model.otcConfig.accessKeyId (and model.otcConfig.accessKeySecret model.otcConfig.tenantId))}} + + {{else}} + + {{/if}} + {{/if}} +
+ {{/if}} +
+ {{#if (and (eq step 2) (not (and osAvailabilityZone networks)))}} +
+ {{t 'machine.driverOtc.loadingAvailability'}} +
+ {{/if}} + + {{#if (and (gte step 2) osAvailabilityZone networks)}} +
+ {{t 'machine.driverOtc.availableZone.header'}} +
+ +
+
+ +
+
+ {{#if (eq step 2)}} + {{new-select + classNames="form-control" + content=osAvailabilityZone + optionLabelPath='zoneName' + optionValuePath='zoneName' + prompt='machine.driverOtc.availableZone.dropdown.zone' + value=model.otcConfig.availableZone + }} + {{else}} +
{{model.otcConfig.availableZone}}
+ {{/if}} +
+
+ +
+
+ {{#if (eq step 2)}} + {{new-select + classNames="form-control" + content=networks + optionLabelPath='name' + optionValuePath='id' + prompt='machine.driverOtc.vpcAndSecurity.dropdown.vpc' + value=model.otcConfig.vpcId + }} + {{else}} +
{{model.otcConfig.vpcId}}
+ {{/if}} +
+
+
+
+ +
+
+
{{model.otcConfig.region}}
+
+
+ {{#if (eq step 2)}} +
+ {{#if itemsLoading}} + + {{else}} + {{#if (and model.otcConfig.availableZone model.otcConfig.vpcId)}} + + {{else}} + + {{/if}} + {{/if}} +
+ {{/if}} + {{/if}} + + {{#if (and (eq step 3) (not (and subnets securityGroups)))}} +
+ {{t 'machine.driverOtc.loadingNetworks'}} +
+ {{/if}} + + {{#if (and (gte step 3) (and subnets securityGroups))}} +
+ {{t 'machine.driverOtc.vpcAndSecurity.header'}} +
+
+
+ +
+
+ {{#if (eq step 3)}} + {{new-select + classNames="form-control" + optionLabelPath='name' + optionValuePath='id' + content=subnets + prompt='machine.driverOtc.vpcAndSecurity.dropdown.subnet' + value=model.otcConfig.subnetId + }} + {{else}} +
{{model.otcConfig.subnetId}}
+ {{/if}} +
+
+ +
+
+ {{#if (eq step 3)}} + {{new-select + classNames="form-control" + optionLabelPath='name' + optionValuePath='name' + content=securityGroups + prompt='machine.driverOtc.vpcAndSecurity.dropdown.security' + value=model.otcConfig.securityGroup + }} + {{else}} +
{{model.otcConfig.securityGroup}}
+ {{/if}} +
+
+ {{#if (eq step 3)}} +
+ {{#if itemsLoading}} + + {{else}} + {{#if (and model.otcConfig.securityGroup model.otcConfig.subnetId)}} + + {{else}} + + {{/if}} + {{/if}} +
+ {{/if}} + {{/if}} + + {{#if (and (gte step 4) (not (and flavors images)))}} +
+ {{t 'machine.driverOtc.loadingFlavors'}} +
+ {{/if}} + + {{#if (and (eq step 4) (and flavors images))}} +
+ {{t 'machine.driverOtc.instance.header'}} +
+ {{!-- This partial contains the quantity, name, and description fields --}} + {{partial "host/add-common"}} + +
+ {{t 'machine.driverOtc.instance.options'}} +
+ +
+
+ +
+
+ {{#if (eq step 4)}} + {{new-select + classNames="form-control" + optionLabelPath="name" + optionValuePath='id' + content=flavors + prompt='machine.driverOtc.instance.dropdown.flavorid' + value=model.otcConfig.flavorId + }} + {{else}} +
{{model.otcConfig.flavorId}}
+ {{/if}} +
+
+ +
+
+ {{#if (eq step 4)}} + {{new-select + classNames="form-control" + optionLabelPath="name" + optionValuePath='id' + content=images + prompt='machine.driverOtc.instance.dropdown.imageid' + value=model.otcConfig.imageId + }} + {{else}} +
{{model.otcConfig.imageId}}
+ {{/if}} +
+
+
+
+ +
+
+ {{input type="text" + class="form-control" + value=model.otcConfig.sshUser + }} +
+
+ +
+
+ {{input type="text" + class="form-control" + value=model.otcConfig.adminPassword + }} +
+
+
+
+ +
+
+
+ {{input type="number" + class="form-control" + value=model.otcConfig.rootVolumeSize + }} + GB +
+
+
+ +
+
+ {{new-select + classNames="form-control" + content=volumeTypes + optionLabelPath='name' + optionValuePath='name' + prompt='machine.driverOtc.instance.dropdown.type' + value=model.otcConfig.rootVolumeType + }} +
+
+
+
+ +
+
+ {{input type="number" + class="form-control" + value=model.otcConfig.bandwidthSize + }} +
+
+ {{!-- This partial contains the Labels and Advanced Options fields --}} + {{partial "host/add-options"}} + {{!-- This component shows the Create and Cancel buttons --}} + {{save-cancel save="save" cancel="cancel"}} + {{/if}} +
+ {{!-- This component shows errors produced by validate() in the component --}} + {{top-errors errors=errors}} +
diff --git a/app/components/modal-shell/component.js b/app/components/modal-shell/component.js index 5362a9eb56..a3f9b27adb 100644 --- a/app/components/modal-shell/component.js +++ b/app/components/modal-shell/component.js @@ -2,7 +2,7 @@ import Ember from 'ember'; import ModalBase from 'lacsso/components/modal-base'; export default ModalBase.extend({ - classNames: ['lacsso', 'modal-container', 'large-modal', 'modal-shell'], + classNames: ['lacsso', 'modal-container', 'large-modal', 'fullscreen-modal', 'modal-shell'], originalModel: Ember.computed.alias('modalService.modalOpts.model'), init() { this._super(...arguments); diff --git a/app/components/new-balancer/component.js b/app/components/new-balancer/component.js index 3337f61e35..cf03cd0ea6 100644 --- a/app/components/new-balancer/component.js +++ b/app/components/new-balancer/component.js @@ -133,6 +133,7 @@ export default Ember.Component.extend(NewOrEdit, { // converts integers to string (so they can be re-parsed later) let srcStr = ((rule.get('sourcePort')||'')+'').trim(); let tgtStr = ((rule.get('targetPort')||'')+'').trim(); + let wgtStr = ((rule.get('weight')||'')+'').trim(); if ( !srcStr ) { errors.push(intl.t('newBalancer.error.noSourcePort')); @@ -152,6 +153,33 @@ export default Ember.Component.extend(NewOrEdit, { return; } + if ( rule.isSelector ) { + if (wgtStr || rule.region || rule.environment) { + let wgt = parseInt(wgtStr,10); + if ( isNaN(wgt) || wgt < 0 ) { + errors.push(intl.t('newBalancer.error.invalidWeight', {num: wgt})); + return; + } + + if ( !rule.environment ) { + errors.push(intl.t('newBalancer.error.missingEnvironment')); + return; + } + + rule.setProperties({ + weight: wgt, + }); + + if(!rule.region) { + delete rule['region']; + } + } else { + delete rule['weight']; + delete rule['region']; + delete rule['environment']; + } + } + let sourceIp = rule.get('sourceIp'); let key; if ( sourceIp ) { diff --git a/app/components/new-catalog/component.js b/app/components/new-catalog/component.js index 38bb4d69e0..f1dc8e7a7a 100644 --- a/app/components/new-catalog/component.js +++ b/app/components/new-catalog/component.js @@ -56,6 +56,7 @@ export default Ember.Component.extend(NewOrEdit, { }, changeTemplate: function(tpl) { + this.set('selectedTemplateUrl', null); this.get('application').transitionToRoute('catalog-tab.launch', tpl.id); }, }, @@ -83,12 +84,19 @@ export default Ember.Component.extend(NewOrEdit, { let model = this.get('selectedTemplateModel'); this.set('readmeContent', null); if ( model && model.hasLink('readme') ) { + this.set('loadingReadme', true); model.followLink('readme').then((response) => { this.set('readmeContent', response); + }).finally(() => { + this.set('loadingReadme', false); }); } }, + showDescription: Ember.computed('loading', 'loadingReadme', function () { + return (!this.get('loading') && !this.get('loadingReadme')); + }), + sortedVersions: function() { let out = this.get('versionsArray').sort((a,b) => { return compareVersion(a.version, b.version); diff --git a/app/components/new-catalog/template.hbs b/app/components/new-catalog/template.hbs index a735c38e3e..9f1f62e473 100644 --- a/app/components/new-catalog/template.hbs +++ b/app/components/new-catalog/template.hbs @@ -42,15 +42,17 @@ {{t 'newCatalog.url'}} {{templateResource.cleanProjectUrl}} {{/if}}
- {{#if readmeContent}} -
- {{common-mark markdown=readmeContent}} -
- {{else}} -

- {{t (if editing titleUpgrade titleAdd) name=templateResource.name}} -

-

{{templateResource.description}}

+ {{#if showDescription}} + {{#if readmeContent}} +
+ {{common-mark markdown=readmeContent}} +
+ {{else}} +

+ {{t (if editing titleUpgrade titleAdd) name=templateResource.name}} +

+

{{templateResource.description}}

+ {{/if}} {{/if}}
diff --git a/app/components/new-container/component.js b/app/components/new-container/component.js index c4bc26f3be..ee6ed2bbdd 100644 --- a/app/components/new-container/component.js +++ b/app/components/new-container/component.js @@ -376,9 +376,10 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, { var service = this.get('service'); var ary = []; this.get('serviceLinksArray').forEach((row) => { - if ( row.serviceId ) - { + if ( row.serviceId ) { ary.push({name: row.name, serviceId: row.serviceId}); + } else if ( row.service ) { + ary.push({name: row.name, service: row.service}); } }); diff --git a/app/components/new-container/template.hbs b/app/components/new-container/template.hbs index 61fe2d18db..8faf11f8fa 100644 --- a/app/components/new-container/template.hbs +++ b/app/components/new-container/template.hbs @@ -120,6 +120,7 @@ initialLabels=launchConfig.labels errors=commandErrors isService=isService + isSidekick=isSidekick setLabels=(action 'setLabels' 'command') }} diff --git a/app/components/new-secret/component.js b/app/components/new-secret/component.js index f1bcbd95c8..7576a2c797 100644 --- a/app/components/new-secret/component.js +++ b/app/components/new-secret/component.js @@ -6,7 +6,7 @@ export default Ember.Component.extend(NewOrEdit, { userValue: '', userValueChanged: Ember.observer('userValue', function() { - this.set('primaryResource.value', btoa(this.get('userValue'))); + this.set('primaryResource.value', AWS.util.base64.encode(this.get('userValue'))); }), actions: { diff --git a/app/components/new-select/component.js b/app/components/new-select/component.js index 002cdef812..76ab09d763 100644 --- a/app/components/new-select/component.js +++ b/app/components/new-select/component.js @@ -31,7 +31,7 @@ export default Ember.Component.extend({ this.set('ungroupedContent', Ember.computed('content.@each.'+this.get('optionGroupPath'), () => { var groupPath = this.get('optionGroupPath'); var out = []; - this.get('content').forEach((opt) => { + (this.get('content')||[]).forEach((opt) => { var key = Ember.get(opt, groupPath); if ( !key ) { @@ -46,7 +46,7 @@ export default Ember.Component.extend({ var groupPath = this.get('optionGroupPath'); var out = []; - this.get('content').forEach((opt) => { + (this.get('content')||[]).forEach((opt) => { var key = Ember.get(opt, groupPath); if ( key ) { @@ -67,6 +67,21 @@ export default Ember.Component.extend({ this.on('change', this, this._change); }, + didRender: function () { + const selectEl = this.$()[0]; + const value = this.get('value'); + for (let i = 0; i < selectEl.options.length; i++) { + if(selectEl.options[i].value === value) { + selectEl.value = value; + break; + } + } + + if (value !== selectEl.value) { + this._change(); + } + }, + willDestroyElement() { this.off('change', this, this._change); }, @@ -74,27 +89,28 @@ export default Ember.Component.extend({ _change() { const selectEl = this.$()[0]; const selectedIndex = selectEl.selectedIndex; + if ( selectedIndex === -1 ) { + return; + } + const selectedValue = selectEl.options[selectedIndex].value; - const content = this.get('content'); + const content = (this.get('content')||[]); const selection = content.filterBy(this.get('optionValuePath'), selectedValue)[0]; - // set the local, shadowed selection to avoid leaking - // changes to `selection` out via 2-way binding - this.set('_selection', selection); + if ( selection ) { + // set the local, shadowed selection to avoid leaking + // changes to `selection` out via 2-way binding + this.set('_selection', selection); - const changeCallback = this.get('action'); - if ( changeCallback ) - { - changeCallback(selection); - } + const changeCallback = this.get('action'); + if ( changeCallback ) + { + changeCallback(selection); + } - if ( selection ) - { this.set('value', Ember.get(selection, this.get('optionValuePath'))); - } - else - { + } else { this.set('value', null); } } diff --git a/app/components/page-footer/template.hbs b/app/components/page-footer/template.hbs index b8785e5020..5efa91027f 100644 --- a/app/components/page-footer/template.hbs +++ b/app/components/page-footer/template.hbs @@ -19,7 +19,7 @@ {{t 'pageFooter.download.link'}}
diff --git a/app/components/webhook/new-receiver/component.js b/app/components/webhook/new-receiver/component.js index a618869455..3c377a9f43 100644 --- a/app/components/webhook/new-receiver/component.js +++ b/app/components/webhook/new-receiver/component.js @@ -4,6 +4,7 @@ import NewOrEdit from 'ui/mixins/new-or-edit'; const DRIVERS = ['scaleService','scaleHost','serviceUpgrade']; export default Ember.Component.extend(NewOrEdit, { + projects: Ember.inject.service(), model: null, init() { @@ -41,13 +42,17 @@ export default Ember.Component.extend(NewOrEdit, { }); break; case 'serviceUpgrade': + const serviceUpgradeSchema = this.get('webhookStore').getById('schema','serviceupgrade'); + const resourceFields = serviceUpgradeSchema.resourceFields; def = store.createRecord({ type: 'serviceUpgrade', tag: '', + addressType: resourceFields.addressType.default, serviceSelector: '', - batchSize: 1, - interval: 2, - startFirst: false, + batchSize: resourceFields.batchSize.default, + intervalMillis: resourceFields.intervalMillis.default, + payloadFormat: resourceFields.payloadFormat.default, + startFirst: resourceFields.startFirst.default }); break; } diff --git a/app/components/webhook/new-receiver/template.hbs b/app/components/webhook/new-receiver/template.hbs index 00fcc6b357..3c78dc556e 100644 --- a/app/components/webhook/new-receiver/template.hbs +++ b/app/components/webhook/new-receiver/template.hbs @@ -19,9 +19,11 @@
diff --git a/app/components/webhook/service-upgrade-config/component.js b/app/components/webhook/service-upgrade-config/component.js index 45e7fd32a3..16d5a72466 100644 --- a/app/components/webhook/service-upgrade-config/component.js +++ b/app/components/webhook/service-upgrade-config/component.js @@ -2,9 +2,29 @@ import Ember from 'ember'; export default Ember.Component.extend({ tagName: '', + payloadFormatChoices: null, + addressTypeChoices: null, + + init() { + this._super(...arguments); + this.set('payloadFormatChoices', this.getChoices('payloadFormat')); + this.set('addressTypeChoices', this.getChoices('addressType')); + }, + + getChoices(field) { + const serviceUpgradeSchema = this.get('webhookStore').getById('schema', 'serviceupgrade'); + const schema = serviceUpgradeSchema.resourceFields[field]; + let choices = []; + if (schema) { + choices = schema.options.map(option => { + return { label: `newReceiver.${field}.${option}`, value: option }; + }); + } + return choices; + }, actions: { - optionsChanged: function(opt) { + optionsChanged: function (opt) { this.get('model').setProperties(opt); } } diff --git a/app/components/webhook/service-upgrade-config/template.hbs b/app/components/webhook/service-upgrade-config/template.hbs index 1388ff7b84..dcc5391701 100644 --- a/app/components/webhook/service-upgrade-config/template.hbs +++ b/app/components/webhook/service-upgrade-config/template.hbs @@ -1,3 +1,37 @@ +
+
+
+ +
+
+ {{new-select + classNames="form-control" + content=payloadFormatChoices + localizedLabel=true + value=model.payloadFormat + }} +
+
+
+ +{{#if (eq model.payloadFormat 'alicloud')}} +
+
+
+ +
+
+ {{new-select + classNames="form-control" + content=addressTypeChoices + localizedLabel=true + value=model.addressType + }} +
+
+
+{{/if}} +
@@ -44,7 +78,7 @@
- {{input-integer class="form-control" value=model.interval}} + {{input-integer class="form-control" value=model.intervalMillis}} {{t 'formUpgrade.sec'}}
diff --git a/app/console/template.hbs b/app/console/template.hbs index 393fc16e7d..d57a351fcb 100644 --- a/app/console/template.hbs +++ b/app/console/template.hbs @@ -7,6 +7,5 @@ dismiss=(action "cancel") disconncted=(action "cancel") }} - {{/container-shell}}
diff --git a/app/container/template.hbs b/app/container/template.hbs index 46a376a0c7..20a11cf28c 100644 --- a/app/container/template.hbs +++ b/app/container/template.hbs @@ -84,6 +84,17 @@ {{model.displayImage}} {{copy-to-clipboard clipboardText=model.displayImage size='small'}} + +
+ +
+ + + {{#tooltip-element inlineBlock=true type="tooltip-basic" tooltipTemplate="tooltip-static" model=(date-str model.created) tagName="span"}} + {{date-from-now model.created}} + {{/tooltip-element~}} + +
diff --git a/app/helpers/array-includes.js b/app/helpers/array-includes.js index 46122ac596..f0828bff30 100644 --- a/app/helpers/array-includes.js +++ b/app/helpers/array-includes.js @@ -20,6 +20,6 @@ export default Ember.Helper.extend({ _haystack = new Ember.A(haystack); this.set('_haystack', _haystack); } - return _haystack.contains(needle); + return _haystack.includes(needle); } }); diff --git a/app/k8s-tab/kubectl/controller.js b/app/k8s-tab/kubectl/controller.js index 3d12c60235..4567e78abb 100644 --- a/app/k8s-tab/kubectl/controller.js +++ b/app/k8s-tab/kubectl/controller.js @@ -84,6 +84,10 @@ export default Ember.Controller.extend({ if ( base.indexOf('http://') === 0 ) { base = base.replace(/^http:\/\//,'https://'); + if ( ! window.location.port ) + { + base += ':80'; + } insecure = true; } diff --git a/app/k8s-tab/kubectl/route.js b/app/k8s-tab/kubectl/route.js index 40c241b925..387ba32905 100644 --- a/app/k8s-tab/kubectl/route.js +++ b/app/k8s-tab/kubectl/route.js @@ -2,9 +2,14 @@ import Ember from 'ember'; import C from 'ui/utils/constants'; export default Ember.Route.extend({ + access: Ember.inject.service(), + cookies: Ember.inject.service(), + model() { return this.get('store').findAll('container').then((containers) => { let inst = null; + let command = ['/bin/bash','-l','-c','echo "# Run kubectl commands inside here\n# e.g. kubectl get rc\n"; TERM=xterm-256color /bin/bash']; + for ( let i = 0 ; i < containers.get('length') ; i++) { let container = containers.objectAt(i); @@ -14,9 +19,21 @@ export default Ember.Route.extend({ } var labels = container.get('labels')||{}; + + // The kubectl container to use will have this label if ( labels[C.LABEL.K8S_KUBECTL]+'' === 'true' ) { inst = container; + + // For 1.6 with RBAC, the command is different + if ( labels[C.LABEL.K8S_TOKEN]+'' === 'true' ) + { + command = [ + 'kubectl-shell.sh', + this.get('cookies').get(C.COOKIE.TOKEN) || 'unauthorized' + ]; + } + break; } } @@ -24,7 +41,7 @@ export default Ember.Route.extend({ if ( inst ) { return Ember.Object.create({ - command: ['/bin/bash','-l','-c','echo "# Run kubectl commands inside here\n# e.g. kubectl get rc\n"; TERM=xterm-256color /bin/bash'], + command: command, instance: inst, }); } diff --git a/app/k8s-tab/kubectl/template.hbs b/app/k8s-tab/kubectl/template.hbs index e79ecdd60f..cd7fd426ae 100644 --- a/app/k8s-tab/kubectl/template.hbs +++ b/app/k8s-tab/kubectl/template.hbs @@ -22,11 +22,11 @@

{{format-html-message 'k8sTab.kubectl.shell.helpText'}}

{{container-shell - classNames="inline-block" - command=model.command - instance=model.instance - cols=120 - rows=30 - showProtip=false + classNames="inline-block full-width" + command=model.command + instance=model.instance + cols=120 + rows=30 + showProtip=false }}
diff --git a/app/login/shibboleth-auth/route.js b/app/login/shibboleth-auth/route.js index a3d9a3c665..a58fdb4fb7 100644 --- a/app/login/shibboleth-auth/route.js +++ b/app/login/shibboleth-auth/route.js @@ -17,15 +17,21 @@ export default Ember.Route.extend({ } else if (params.errCode) { let errMessage = ''; switch (params.errCode) { - case '401': - errMessage = this.get('intl').findTranslationByKey('loginPage.shibbolethError.401'); - break; - case '500': - errMessage = this.get('intl').findTranslationByKey('loginPage.shibbolethError.500'); - break; - default: - errMessage = this.get('intl').findTranslationByKey('loginPage.shibbolethError.generic', {error: params.errCode}); - break; + case '401': + errMessage = this.get('intl').t('loginPage.shibbolethError.401'); + break; + case '403': + errMessage = this.get('intl').t('loginPage.shibbolethError.403'); + break; + case '422': + errMessage = this.get('intl').t('loginPage.shibbolethError.422'); + break; + case '500': + errMessage = this.get('intl').t('loginPage.shibbolethError.500'); + break; + default: + errMessage = this.get('intl').t('loginPage.shibbolethError.generic', { errorCode: params.errCode }); + break; } transition.abort(); diff --git a/app/mixins/cattle-transitioning-resource.js b/app/mixins/cattle-transitioning-resource.js index 597a5dd27a..ed2dc1f510 100644 --- a/app/mixins/cattle-transitioning-resource.js +++ b/app/mixins/cattle-transitioning-resource.js @@ -369,7 +369,9 @@ export default Ember.Mixin.create({ val = this.get(key); intlKey = `model.${this.get('type')}.${key}`; - if ( intl.exists(intlKey) ) { + if ( intl.exists(`${intlKey}.label`) ) { + displayKey = intl.t(`${intlKey}.label`); + } else if ( intl.exists(intlKey) ) { displayKey = intl.t(intlKey); } else { displayKey = Util.camelToTitle(key); diff --git a/app/mixins/manage-labels.js b/app/mixins/manage-labels.js index eeaf97816d..0656050894 100644 --- a/app/mixins/manage-labels.js +++ b/app/mixins/manage-labels.js @@ -249,7 +249,7 @@ export default Ember.Mixin.create({ } }, - initLabels: function(obj, onlyOfType, onlyKeys) { + initLabels: function(obj, onlyOfType, onlyKeys, readonlyKeys) { let out = []; if ( onlyKeys && !Ember.isArray(onlyKeys) ) @@ -257,6 +257,10 @@ export default Ember.Mixin.create({ onlyKeys = [onlyKeys]; } + if ( readonlyKeys && !Ember.isArray(readonlyKeys) ) + { + readonlyKeys = [readonlyKeys]; + } Object.keys(obj||{}).forEach(function(key) { let type = 'user'; @@ -299,11 +303,24 @@ export default Ember.Mixin.create({ return; } - out.push(Ember.Object.create({ - key: key, - value: obj[key]||'', - type: type, - })); + if ( type === AFFINITY && obj[key] && obj[key].indexOf(',') > -1 ) + { + obj[key].split(',').forEach((s) => { + out.push(Ember.Object.create({ + key: key, + value: s || '', + type: type, + readonly: readonlyKeys && readonlyKeys.indexOf(key) >= 0 + })); + }); + } else { + out.push(Ember.Object.create({ + key: key, + value: obj[key]||'', + type: type, + readonly: readonlyKeys && readonlyKeys.indexOf(key) >= 0 + })); + } }); this.set('labelArray', out); diff --git a/app/mixins/subscribe.js b/app/mixins/subscribe.js index be478db308..a9ef89ffa8 100644 --- a/app/mixins/subscribe.js +++ b/app/mixins/subscribe.js @@ -49,8 +49,8 @@ export default Ember.Mixin.create({ //this._trySend('subscribeMessage',d); - if ( d.name === 'resource.change' ) - { + switch ( d.name) { + case 'resource.change': let key = d.resourceType+'Changed'; if ( this[key] ) { this[key](d); @@ -66,11 +66,13 @@ export default Ember.Mixin.create({ store._remove(baseType, resource); } } - - } - else if ( d.name === 'ping' ) - { + break; + case 'logout': + this.send('logout', false); + break; + case 'ping': this.subscribePing(d); + break; } }); }); diff --git a/app/models/amazonec2config.js b/app/models/amazonec2config.js new file mode 100644 index 0000000000..8eff2e3e8c --- /dev/null +++ b/app/models/amazonec2config.js @@ -0,0 +1,42 @@ +import Resource from 'ember-api-store/models/resource'; + +var Amazonec2config = Resource.extend({ + type: 'githubConfig', +}); + + +Amazonec2config.reopenClass({ + //tags are in a really dumb format, key1,value1,key2,value2 + // so we need to fix them before they get to the user + mangleIn: function(data/* , store */) { + if ( data.tags.length > 0 ) { + let tags = data.tags.split(','); + let tagsOut = {}; + + for (var i = 0 ; i < tags.length-1 ; i += 2){ + tagsOut[tags[i]] = tags[i+1]; + } + + data.tags = tagsOut; + } + + return data; + }, + mangleOut: function(data/* , store */) { + if ( data.tags && Object.keys(data.tags) ) { + let tags = data.tags; + let tagsOut = []; + + // key1,value1,key2,value2 + Object.keys(tags).forEach((key) => { + tagsOut.push(key,tags[key]); + }); + + data.tags = tagsOut.join(','); + } + + return data; + } +}); + +export default Amazonec2config; diff --git a/app/models/container.js b/app/models/container.js index eb2adae256..f8ab54aece 100644 --- a/app/models/container.js +++ b/app/models/container.js @@ -62,7 +62,7 @@ var Container = Instance.extend({ let proj = this.get('projects.current.id'); let id = this.get('id'); Ember.run.later(() => { - window.open(`//${window.location.host}/env/${proj}/infra/console?instanceId=${id}&isPopup=true`, '_blank', "toolbars=0,width=717,height=590,left=200,top=200"); + window.open(`//${window.location.host}/env/${proj}/infra/console?instanceId=${id}&isPopup=true`, '_blank', "toolbars=0,width=900,height=700,left=200,top=200"); }); }, diff --git a/app/models/externalservice.js b/app/models/externalservice.js index ddcab4e37a..fd82c20c4b 100644 --- a/app/models/externalservice.js +++ b/app/models/externalservice.js @@ -18,7 +18,7 @@ var ExternalService = Service.extend({ } else { - var ips = this.get('externalIpAddresses'); + var ips = this.get('externalIpAddresses') || []; var num = ips.get('length'); for ( var i = 0 ; i < 3 && i < num ; i++ ) { @@ -31,7 +31,9 @@ var ExternalService = Service.extend({ } } - return ('To: ' + out).htmlSafe(); + if ( out ) { + return ('To: ' + out).htmlSafe(); + } }.property('hostname','externalIpAddresses.[]'), }); diff --git a/app/models/host.js b/app/models/host.js index 86a23dc7df..9ec3e4c54b 100644 --- a/app/models/host.js +++ b/app/models/host.js @@ -117,7 +117,7 @@ var Host = Resource.extend({ supportState: function() { let my = this.get('dockerEngineVersion')||''; - my = my.replace('-ce','').replace('-ee',''); + my = my.replace(/-(cs|ce|ee)[0-9.-]*$/,''); let supported = this.get(`settings.${C.SETTING.SUPPORTED_DOCKER}`); let newest = this.get(`settings.${C.SETTING.NEWEST_DOCKER}`); diff --git a/app/models/identity.js b/app/models/identity.js index 430363a5e0..100430bc1c 100644 --- a/app/models/identity.js +++ b/app/models/identity.js @@ -41,6 +41,7 @@ var Identity = Resource.extend({ case C.PROJECT.TYPE_GITHUB_USER: case C.PROJECT.TYPE_LDAP_USER: case C.PROJECT.TYPE_OPENLDAP_USER: + case C.PROJECT.TYPE_SHIBBOLETH_USER: return C.PROJECT.PERSON; case C.PROJECT.TYPE_GITHUB_TEAM: @@ -50,6 +51,7 @@ var Identity = Resource.extend({ case C.PROJECT.TYPE_AZURE_GROUP: case C.PROJECT.TYPE_LDAP_GROUP: case C.PROJECT.TYPE_OPENLDAP_GROUP: + case C.PROJECT.TYPE_SHIBBOLETH_GROUP: return C.PROJECT.ORG; } }.property('externalIdType'), @@ -73,11 +75,13 @@ var Identity = Resource.extend({ case C.PROJECT.TYPE_AZURE_USER: case C.PROJECT.TYPE_LDAP_USER: case C.PROJECT.TYPE_OPENLDAP_USER: + case C.PROJECT.TYPE_SHIBBOLETH_USER: key = 'model.identity.displayType.user'; break; case C.PROJECT.TYPE_AZURE_GROUP: case C.PROJECT.TYPE_LDAP_GROUP: case C.PROJECT.TYPE_OPENLDAP_GROUP: + case C.PROJECT.TYPE_SHIBBOLETH_GROUP: key = 'model.identity.displayType.group'; break; case C.PROJECT.TYPE_GITHUB_TEAM: diff --git a/app/models/instance.js b/app/models/instance.js index d63cbc41fb..bda584538a 100644 --- a/app/models/instance.js +++ b/app/models/instance.js @@ -3,7 +3,7 @@ import Resource from 'ember-api-store/models/resource'; import C from 'ui/utils/constants'; import { formatSi } from 'ui/utils/util'; -export default Resource.extend({ +var Instance = Resource.extend({ isSystem: function() { if ( this.get('system') ) { return true; @@ -19,3 +19,5 @@ export default Resource.extend({ } }), }); + +export default Instance; diff --git a/app/models/loadbalancerservice.js b/app/models/loadbalancerservice.js index 1e22c5051a..bec428a6c9 100644 --- a/app/models/loadbalancerservice.js +++ b/app/models/loadbalancerservice.js @@ -7,12 +7,12 @@ import { parsePortSpec } from 'ui/utils/parse-port'; const esc = Ember.Handlebars.Utils.escapeExpression; function portToStr(spec) { - var parts = parsePortSpec(spec); + var parts = parsePortSpec(spec,'http'); return parts.host + (parts.protocol === 'http' ? '' : '/' + parts.protocol); } function specToPort(spec) { - var parts = parsePortSpec(spec); + var parts = parsePortSpec(spec,'http'); return parts.hostPort; } diff --git a/app/models/machinedriver.js b/app/models/machinedriver.js index 5f8735a96b..909b7db1de 100644 --- a/app/models/machinedriver.js +++ b/app/models/machinedriver.js @@ -4,7 +4,7 @@ import PolledResource from 'ui/mixins/cattle-polled-resource'; import C from 'ui/utils/constants'; import { parseExternalId } from 'ui/utils/parse-externalid'; -const builtInUi = ['amazonec2','azure','digitalocean','exoscale','packet','rackspace','ubiquity','vmwarevsphere','aliyunecs']; +const builtInUi = ['amazonec2','azure','digitalocean','exoscale','packet','rackspace','ubiquity','vmwarevsphere','aliyunecs','otc']; function displayUrl(url) { url = url||''; @@ -50,8 +50,10 @@ var machineDriver = Resource.extend(PolledResource, { return null; } - return this.get('catalog').getTemplateFromCache(parsedExtId.templateId).get('links.icon'); - + const template = this.get('catalog').getTemplateFromCache(parsedExtId.templateId); + if( template ) { + return template.get('links.icon'); + } }), iconMapFromConstants: Ember.computed('name', function() { diff --git a/app/models/project.js b/app/models/project.js index 8a686c2d4e..238a390138 100644 --- a/app/models/project.js +++ b/app/models/project.js @@ -75,7 +75,7 @@ var Project = Resource.extend(PolledResource, { { label: 'action.switchEnvironment',icon: 'icon icon-folder-open', action: 'switchTo', enabled: this.get('canSwitchTo')}, { label: 'action.setDefault', icon: 'icon icon-home', action: 'setAsDefault', enabled: this.get('canSetDefault')}, { divider: true }, - { label: 'action.edit', icon: 'icon icon-edit', action: 'edit', enabled: !!a.update }, + { label: 'action.edit', icon: 'icon icon-edit', action: 'edit', enabled: !!a.update || !!a.setmembers }, { label: 'action.activate', icon: 'icon icon-play', action: 'activate', enabled: !!a.activate}, { label: 'action.deactivate', icon: 'icon icon-pause', action: 'promptStop', enabled: !!a.deactivate, altAction: 'deactivate'}, { divider: true }, @@ -87,7 +87,7 @@ var Project = Resource.extend(PolledResource, { return choices; - }.property('actionLinks.{activate,deactivate,update,restore,purge}','state','canRemove','canSetDefault','canSwitchTo'), + }.property('actionLinks.{activate,deactivate,update,restore,purge,setmembers}','state','canRemove','canSetDefault','canSwitchTo'), icon: function() { if ( this.get('isDefault') ) diff --git a/app/models/secondarylaunchconfig.js b/app/models/secondarylaunchconfig.js new file mode 100644 index 0000000000..82fbc312cb --- /dev/null +++ b/app/models/secondarylaunchconfig.js @@ -0,0 +1,9 @@ +import Resource from 'ember-api-store/models/resource'; + +var SecondaryLaunchConfig = Resource.extend({ + displayImage: function() { + return (this.get('imageUuid')||'').replace(/^docker:/,''); + }.property('imageUuid'), +}); + +export default SecondaryLaunchConfig; diff --git a/app/models/service.js b/app/models/service.js index 90c74563bb..374bba003f 100644 --- a/app/models/service.js +++ b/app/models/service.js @@ -12,6 +12,7 @@ var Service = Resource.extend({ instances: denormalizeIdArray('instanceIds'), instanceCount: Ember.computed.alias('instances.length'), + projectId: Ember.computed.alias(`tab-session.${C.TABSESSION.PROJECT}`), stack: denormalizeId('stackId'), actions: { @@ -141,7 +142,7 @@ var Service = Resource.extend({ availableActions: function() { var a = this.get('actionLinks'); - var canUpgrade = !!a.upgrade && this.get('canUpgrade'); + var canUpgrade = this.get('canUpgrade'); var isK8s = this.get('isK8s'); var isSwarm = this.get('isSwarm'); var canHaveContainers = this.get('canHaveContainers'); @@ -197,10 +198,15 @@ var Service = Resource.extend({ if ( pos >= 0 ) { name = name.substr(pos+1); } - + const id = links[key]; + const service = store.getById('service', id); return Ember.Object.create({ name: name, - service: store.getById('service', links[key]) + service: service ? service : Ember.Object.create({ + name: id, + id: id, + arbitraryString: true, + }) }); }); @@ -266,7 +272,10 @@ var Service = Resource.extend({ hasPorts: Ember.computed.alias('isReal'), hasImage: Ember.computed.alias('isReal'), hasLabels: Ember.computed.alias('isReal'), - canUpgrade: Ember.computed.alias('isReal'), + + canUpgrade: function() { + return this.get('isReal') && !!this.get('actionLinks.upgrade'); + }.property('isReal','actionLinks.upgrade'), isBalancer: function() { return ['loadbalancerservice'].indexOf(this.get('type').toLowerCase()) >= 0; @@ -392,6 +401,64 @@ var Service = Resource.extend({ return Util.formatSi(this.get('launchConfig.memoryReservation'), 1024, 'iB', 'B'); } }), + + localizedServiceUILabel: function(){ + let labels = this.get('launchConfig.labels'); + if(!labels){ + return; + } + let serviceUILabel = labels[C.LABEL.SERVICE_UI_LABEL] || ''; + let serviceName = this.get('name'); + if(!serviceUILabel){ + return; + } + let language = this.get('intl._locale')[0]; + let localizedLabel = ''; + // if the label is not a valid JSON map, default to use the service name. + try{ + serviceUILabel = JSON.parse(serviceUILabel); + // if the label is not a Object, just use service name as label + if(serviceUILabel.constructor !== Object){ + console.warn(`${C.LABEL.SERVICE_UI_LABEL} in ${serviceName} is not a JSON map`); + return this.get('name'); + } + localizedLabel = serviceUILabel[Object.keys(serviceUILabel)[0]]; + if(serviceUILabel[language]){ + localizedLabel = serviceUILabel[language]; + } + } + catch(err){ + console.warn(`${C.LABEL.SERVICE_UI_LABEL} in ${serviceName} is not valid`); + localizedLabel = this.get('name'); + } + return localizedLabel; + }.property('launchConfig.labels', 'intl._locale'), + + serviceApp: function(){ + let labels = this.get('launchConfig.labels'); + if(!labels){ + return null; + } + let serviceName = this.get('name'); + let serviceUIPath = labels[C.LABEL.SERVICE_UI_PATH] || '/'; + let serviceUIPort = labels[C.LABEL.SERVICE_UI_PORT] || ''; + let localizedServiceUILabel = this.get('localizedServiceUILabel'); + let url; + if( localizedServiceUILabel ){ + url = `${window.location.origin}${this.get('app.magicEndpoint')}/projects/${this.get('projectId')}`; + if(!serviceUIPort){ + url += `/${serviceName}${serviceUIPath}`; + }else{ + url += `/${serviceName}:${serviceUIPort}${serviceUIPath}`; + } + return { + label: localizedServiceUILabel, + url: url + }; + } else { + return null; + } + }.property('name', 'launchConfig.labels', 'localizedServiceUILabel'), }); export function activeIcon(service) diff --git a/app/models/template.js b/app/models/template.js index aff6dce5fb..c3e7558298 100644 --- a/app/models/template.js +++ b/app/models/template.js @@ -65,6 +65,9 @@ export default Resource.extend({ orch = 'kubernetes'; } let list = ((this.get('labels')||{})[C.LABEL.ORCHESTRATION_SUPPORTED]||'').split(/\s*,\s*/).filter((x) => x.length > 0); + if ( orch === 'windows' ) { + return list.includes(orch); + } return list.length === 0 || list.includes(orch); }, diff --git a/app/models/templateversion.js b/app/models/templateversion.js index 161164cc10..c7fca5ea21 100644 --- a/app/models/templateversion.js +++ b/app/models/templateversion.js @@ -28,6 +28,9 @@ export default Resource.extend({ orch = 'kubernetes'; } let list = ((this.get('labels')||{})[C.LABEL.ORCHESTRATION_SUPPORTED]||'').split(/\s*,\s*/).filter((x) => x.length > 0); + if ( orch === 'windows' ) { + return list.includes(orch); + } return list.length === 0 || list.includes(orch); }, }); diff --git a/app/services/access.js b/app/services/access.js index bbe2ea4f96..13dc94dd15 100644 --- a/app/services/access.js +++ b/app/services/access.js @@ -60,9 +60,20 @@ export default Ember.Service.extend({ url: 'token', }) .then((xhr) => { + var session = this.get('session'); // If we get a good response back, the API supports authentication var token = xhr.body.data[0]; + var interesting = {}; + C.TOKEN_TO_SESSION_KEYS.forEach((key) => { + if ( typeof token[key] !== 'undefined' && typeof session.get(key) === 'undefined' ) + { + interesting[key] = token[key]; + } + }); + + session.setProperties(interesting); + this.setProperties({ 'enabled': token.security, 'provider': (token.authProvider||'').toLowerCase(), diff --git a/app/services/growl.js b/app/services/growl.js index f5a539203b..d1b7b16d8e 100644 --- a/app/services/growl.js +++ b/app/services/growl.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import Errors from 'ui/utils/errors'; +import Util from 'ui/utils/util'; export default Ember.Service.extend({ init: function() { @@ -16,7 +17,7 @@ export default Ember.Service.extend({ opt.header = title; } - return $.jGrowl(body, opt); + return $.jGrowl(Util.escapeHtml(body), opt); }, success: function(title, body) { diff --git a/app/styles/app-dark.scss b/app/styles/app-dark.scss index 70cf804ea8..e1024c1114 100644 --- a/app/styles/app-dark.scss +++ b/app/styles/app-dark.scss @@ -64,6 +64,7 @@ @import "app/styles/components/timeline"; @import 'app/styles/components/modals'; @import "app/styles/components/catalog-box"; +@import "app/styles/components/input-service"; @import "app/styles/components/hero-add-service"; @import "app/styles/components/project-upgrade"; @@ -84,6 +85,7 @@ @import "app/styles/pages/catalog"; @import "app/styles/pages/service-addtl-info"; @import "app/styles/pages/virtualmachine"; +@import "app/styles/pages/auth-ldap"; //****************************************** // Responsive Layout diff --git a/app/styles/app-light.scss b/app/styles/app-light.scss index a9142ddb29..ecde65b86b 100644 --- a/app/styles/app-light.scss +++ b/app/styles/app-light.scss @@ -64,6 +64,7 @@ @import "app/styles/components/timeline"; @import 'app/styles/components/modals'; @import "app/styles/components/catalog-box"; +@import "app/styles/components/input-service"; @import "app/styles/components/hero-add-service"; @import "app/styles/components/project-upgrade"; @@ -84,6 +85,7 @@ @import "app/styles/pages/catalog"; @import "app/styles/pages/service-addtl-info"; @import "app/styles/pages/virtualmachine"; +@import "app/styles/pages/auth-ldap"; //****************************************** // Responsive Layout @@ -104,4 +106,3 @@ color: $accent-three; } } - diff --git a/app/styles/components/_catalog-box.scss b/app/styles/components/_catalog-box.scss index c2c765f889..f802dfd93d 100644 --- a/app/styles/components/_catalog-box.scss +++ b/app/styles/components/_catalog-box.scss @@ -228,6 +228,7 @@ $lines-to-show: 4; &.digitalocean { @include digitalocean;} &.exoscale { @include exoscale; } &.generic { @include generic; background-size: 65%; } + &.otc { @include tsystems; } &.openstack { @include openstack; } &.other { @include other; } &.packet { @include packet; } diff --git a/app/styles/components/_container-shell.scss b/app/styles/components/_container-shell.scss index 7d1887726e..9eed1ed178 100644 --- a/app/styles/components/_container-shell.scss +++ b/app/styles/components/_container-shell.scss @@ -1,22 +1,49 @@ .shell-body { - display: flex; + width: 100%; + height: 400px; + margin: 0 auto; + background-color: #000; +} + +.shell-container { + background-color: #000; + padding: 10px; +} +.modal-overlay .shell-body { + height: calc(100vh - 280px); .terminal { - margin: 0 auto; - font-size: 12px; - font-family: "Lucida Console", Monaco, "Courier New", monospace; + height: calc(100vh - 280px); } } +.shell-body .terminal { + margin: 0 auto; + font-size: 12px; + font-family: "Lucida Console", Monaco, "Courier New", monospace; +} + +.fullscreen-modal { + max-width: none !important; +} + +.terminal .xterm-viewport { + overflow-y: auto; +} + +.shell-popup .shell-body{ + height: calc(100vh - 120px); +} + .shell-status { position: absolute; margin: 10px 0; } .shell-popup { - padding: 20px; + padding: 10px; } -.xterm-rows { - padding: 10px; +.shell-popup .footer-actions { + margin: 10px 0; } diff --git a/app/styles/components/_input-service.scss b/app/styles/components/_input-service.scss new file mode 100644 index 0000000000..5070f711c6 --- /dev/null +++ b/app/styles/components/_input-service.scss @@ -0,0 +1,9 @@ +.input-service { + position: relative; + + .input-select { + width: calc(100% - 15px); + position: absolute; + top: 0; + } +} diff --git a/app/styles/components/_tooltip.scss b/app/styles/components/_tooltip.scss index 63cfe1b269..3288df5374 100644 --- a/app/styles/components/_tooltip.scss +++ b/app/styles/components/_tooltip.scss @@ -19,7 +19,6 @@ background : $primary; color : white; min-height : 20px; - max-width : 265px; z-index : 1000; padding : 3px; diff --git a/app/styles/helpers/_mixins.scss b/app/styles/helpers/_mixins.scss index 6980582d2b..af95c15d6a 100644 --- a/app/styles/helpers/_mixins.scss +++ b/app/styles/helpers/_mixins.scss @@ -73,6 +73,10 @@ background-image: url('images/providers/vmwarevsphere.png'); } +@mixin tsystems { + background-image: url('images/providers/otc-tsystems.png'); +} + @mixin other { background-image: url('images/providers/machine.svg'); } diff --git a/app/styles/layout/_layout.scss b/app/styles/layout/_layout.scss index 0840436077..98a0e0c08b 100644 --- a/app/styles/layout/_layout.scss +++ b/app/styles/layout/_layout.scss @@ -401,6 +401,9 @@ TABLE.graphs { .inline-block { display : inline-block; } +.full-width { + width: 100%; +} .block { display: block; } diff --git a/app/styles/pages/_auth-ldap.scss b/app/styles/pages/_auth-ldap.scss new file mode 100644 index 0000000000..57e7fec47e --- /dev/null +++ b/app/styles/pages/_auth-ldap.scss @@ -0,0 +1,7 @@ +.advanced-link { + @extend a; + @extend .hand; +} +.custom-schema { + display: none; +} diff --git a/app/styles/pages/_host.scss b/app/styles/pages/_host.scss index 059a365497..c1ed3d8729 100644 --- a/app/styles/pages/_host.scss +++ b/app/styles/pages/_host.scss @@ -69,6 +69,9 @@ &.aliyunecs { @include aliyunecs; } + &.otc { // this should be changed to tsystems or what ever they rename there driver to. + @include tsystems; + } } .c3 svg { diff --git a/app/styles/pages/_loading.scss b/app/styles/pages/_loading.scss index 5e98de0a5b..ac01f2fd8f 100644 --- a/app/styles/pages/_loading.scss +++ b/app/styles/pages/_loading.scss @@ -13,8 +13,8 @@ top: 0; left: 0; margin : 0 auto; - width : 280px; - height : 280px; + width : 281px; + height : 281px; border : dotted rgba(255,255,255,.25) 3px; border-radius : 50%; -webkit-animation: orbit 20s linear infinite; /* Safari 4+ */ /* Fx 5+ */ /* Opera 12+ */ diff --git a/app/styles/vendors/_prism-theme.scss b/app/styles/vendors/_prism-theme.scss index 1c9901dfc9..bc4236b9ef 100644 --- a/app/styles/vendors/_prism-theme.scss +++ b/app/styles/vendors/_prism-theme.scss @@ -6,13 +6,16 @@ code[class*="language-"], pre[class*="language-"] { - color: #236f2b; + color: #f8f8f2; + background: none; + text-shadow: 0 1px rgba(0, 0, 0, 0.3); font-family: Consolas, Monaco, 'Andale Mono', monospace; direction: ltr; text-align: left; white-space: pre; word-spacing: normal; word-break: normal; + word-wrap: normal; line-height: 1.5; -moz-tab-size: 4; @@ -35,13 +38,14 @@ pre[class*="language-"] { :not(pre) > code[class*="language-"], pre[class*="language-"] { - background: #393d48; + background: #272822; } /* Inline code */ :not(pre) > code[class*="language-"] { padding: .1em; border-radius: .3em; + white-space: normal; } .token.comment, @@ -93,7 +97,7 @@ pre[class*="language-"] { .token.atrule, .token.attr-value, .token.function { - color: #adbce9; + color: #e6db74; } .token.keyword { @@ -107,7 +111,7 @@ pre[class*="language-"] { .token.important, .token.bold { - font-weight: 900; + font-weight: bold; } .token.italic { font-style: italic; diff --git a/app/swarm-tab/console/template.hbs b/app/swarm-tab/console/template.hbs index db5c6b9df9..0ca7812b48 100644 --- a/app/swarm-tab/console/template.hbs +++ b/app/swarm-tab/console/template.hbs @@ -5,7 +5,7 @@
{{container-shell - classNames="inline-block" + classNames="inline-block full-width" command=model.command instance=model.instance cols=120 diff --git a/app/templates/ldap-config.hbs b/app/templates/ldap-config.hbs index 53fce54d4e..b6d3e2ecc1 100644 --- a/app/templates/ldap-config.hbs +++ b/app/templates/ldap-config.hbs @@ -1,52 +1,67 @@

- {{#if access.enabled}} - {{t 'ldap.header.enabled.label' providerName=(t providerName)}} + {{#if canEdit}} + {{#if editing}} + {{t 'ldap.header.editing.label' providerName=(t providerName)}} + {{else}} + {{t 'ldap.header.disabled.label' providerName=(t providerName)}} + {{/if}} {{else}} - {{t 'ldap.header.disabled.label' providerName=(t providerName)}} + {{t 'ldap.header.enabled.label' providerName=(t providerName)}} {{/if}}

- {{#if access.enabled}} - {{t (concat-str 'ldap.header.enabled.' model.accessMode character='') appName=settings.appName providerName=(t providerName) users=numUsers groups=numGroups}} + {{#if canEdit}} + {{#if editing}} + {{t (concat-str 'ldap.header.enabled.' model.accessMode character='') appName=settings.appName providerName=(t providerName) users=numUsers groups=numGroups}} + {{else}} + {{t 'ldap.header.disabled.warning' appName=settings.appName providerName=(t providerName)}} + {{/if}} + {{else}} - {{t 'ldap.header.disabled.warning' appName=settings.appName providerName=(t providerName)}} + {{t (concat-str 'ldap.header.enabled.' model.accessMode character='') appName=settings.appName providerName=(t providerName) users=numUsers groups=numGroups}} {{/if}}
-{{#if access.enabled}} +{{#unless canEdit}}
+ {{#unless isOpenLdap}} + + {{/unless}}

{{t 'ldap.accessEnabled.header'}}

-

{{t 'ldap.accessEnabled.subtext'}}

+

{{t 'ldap.accessEnabled.general.header'}}

-
{{t 'ldap.accessEnabled.general.server'}} {{model.server}}:{{model.port}}
-
{{t 'ldap.accessEnabled.general.tls'}} {{if model.tls "Yes" "No"}}
-
{{t 'ldap.accessEnabled.general.serviceAccount'}} {{model.serviceAccountUsername}}
+
{{t 'ldap.accessEnabled.general.server'}} {{ldapConfig.server}}:{{ldapConfig.port}}
+
{{t 'ldap.accessEnabled.general.tls'}} {{if ldapConfig.tls "Yes" "No"}}
+
{{t 'ldap.accessEnabled.general.serviceAccount'}} {{ldapConfig.serviceAccountUsername}}
{{#unless isOpenLdap}} -
{{t 'ldap.accessEnabled.general.defaultDomain'}} {{model.loginDomain}}
+
{{t 'ldap.accessEnabled.general.defaultDomain'}} {{ldapConfig.loginDomain}}
{{/unless}} +
{{t 'ldap.accessEnabled.general.timeout'}} {{ldapConfig.connectionTimeout}}{{t 'ldap.accessConfig.timeout.unit'}}

{{t 'ldap.accessEnabled.users.header'}}

-
{{t 'ldap.accessEnabled.general.searchBase'}} {{model.domain}}
-
{{t 'ldap.accessEnabled.users.objectClass'}} {{model.userObjectClass}}
-
{{t 'ldap.accessEnabled.users.login'}} {{model.userLoginField}}
-
{{t 'ldap.accessEnabled.users.name'}} {{model.userNameField}}
-
{{t 'ldap.accessEnabled.users.search'}} {{model.userSearchField}}
-
{{t 'ldap.accessEnabled.users.enabled'}} {{model.userEnabledAttribute}}
-
{{t 'ldap.accessEnabled.users.disabledBitMask'}} {{model.userDisabledBitMask}}
+
{{t 'ldap.accessEnabled.general.searchBase'}} {{ldapConfig.domain}}
+
{{t 'ldap.accessEnabled.users.objectClass'}} {{ldapConfig.userObjectClass}}
+
{{t 'ldap.accessEnabled.users.login'}} {{ldapConfig.userLoginField}}
+
{{t 'ldap.accessEnabled.users.name'}} {{ldapConfig.userNameField}}
+
{{t 'ldap.accessEnabled.users.search'}} {{ldapConfig.userSearchField}}
+
{{t 'ldap.accessEnabled.users.enabled'}} {{ldapConfig.userEnabledAttribute}}
+
{{t 'ldap.accessEnabled.users.disabledBitMask'}} {{ldapConfig.userDisabledBitMask}}

{{t 'ldap.accessEnabled.group.header'}}

-
{{t 'ldap.accessEnabled.general.searchBase'}} {{model.groupSearchDomain}}
-
{{t 'ldap.accessEnabled.group.objectClass'}} {{model.groupObjectClass}}
-
{{t 'ldap.accessEnabled.group.name'}} {{model.groupNameField}}
-
{{t 'ldap.accessEnabled.group.search'}} {{model.groupSearchField}}
+
{{t 'ldap.accessEnabled.general.searchBase'}} {{ldapConfig.groupSearchDomain}}
+
{{t 'ldap.accessEnabled.group.objectClass'}} {{ldapConfig.groupObjectClass}}
+
{{t 'ldap.accessEnabled.group.name'}} {{ldapConfig.groupNameField}}
+
{{t 'ldap.accessEnabled.group.search'}} {{ldapConfig.groupSearchField}}
@@ -75,178 +90,209 @@ {{/if}}
-{{/if}} +{{/unless}} -{{#unless access.enabled}} -
-

-

{{t 'ldap.accessConfig.header' providerName=(t providerName)}}

-
-

{{format-html-message 'ldap.accessConfig.subtext1' providerName=(t providerName)}}

-
-
-
- - {{input value=model.server classNames="form-control"}} +{{#if canEdit}} +
+
+

+

{{t 'ldap.accessConfig.header' providerName=(t providerName)}}

+
+

{{format-html-message 'ldap.accessConfig.subtext1' providerName=(t providerName)}}

+
+
+
+ + {{input value=ldapConfig.server name="hostname" classNames="form-control"}} +
-
-
-
- -
- {{input-integer value=model.port min=1 max=65535 classNames="form-control"}} - - - +
+
+ +
+ {{input-integer name="port" value=ldapConfig.port min=1 max=65535 classNames="form-control"}} + + + +
-
-
-
+
+
+ +
+ {{input-integer classNames="form-control" value=ldapConfig.connectionTimeout}} + {{t 'ldap.accessConfig.timeout.unit'}} +
+
-
-

{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}

-
- {{#unless isOpenLdap}} -
+

{{t 'ldap.accessConfig.subtext2' appName=settings.appName}}

+
+ {{#unless isOpenLdap}} +
+
+ + {{input name="loginDomain" value=ldapConfig.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}} +

{{t 'ldap.accessConfig.defaultDomain.helpText'}}

+
+
+ {{/unless}} +
- - {{input value=model.loginDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.defaultDomain.placeholder')}} -

{{t 'ldap.accessConfig.defaultDomain.helpText'}}

+ + {{input name="serviceUsername" value=ldapConfig.serviceAccountUsername classNames="form-control"}}
- {{/unless}} -
-
- - {{input value=model.serviceAccountUsername classNames="form-control"}} -
-
-
-
- - {{input type="password" value=model.serviceAccountPassword classNames="form-control"}} +
+
+ + {{input name="serviceAccountPassword" type="password" value=ldapConfig.serviceAccountPassword classNames="form-control"}} +
-
-
-
-
- - {{input value=model.domain classNames="form-control" placeholder=(t 'ldap.accessConfig.userSearchBase.placeholder')}} -

{{t 'ldap.accessConfig.userSearchBase.helpText'}}

+
+
+
+ + {{input name="domain" value=ldapConfig.domain classNames="form-control" placeholder=(t 'model.openldapconfig.domain.placeholder')}} +

{{t 'model.openldapconfig.domain.help'}}

+
-
-
-
- - {{input value=model.groupSearchDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.groupSearchBase.placeholder')}} -

{{t 'ldap.accessConfig.groupSearchBase.helpText'}}

+
+
+ + {{input name="groupSearchDomain" value=ldapConfig.groupSearchDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.groupSearchBase.placeholder')}} +

{{t 'ldap.accessConfig.groupSearchBase.helpText'}}

+
-
-
+
-
-

{{t 'ldap.customizeSchema.header'}}

-
-

{{t 'ldap.customizeSchema.helpText'}}

-
-
-

{{t 'ldap.customizeSchema.users.header'}}

-
- - {{input value=model.userObjectClass classNames="form-control"}} -
-
- - {{input value=model.userLoginField classNames="form-control"}} -
-
- - {{input value=model.userNameField classNames="form-control"}} -
-
- - {{input value=model.userSearchField classNames="form-control"}} -
-
- - {{input value=model.userEnabledAttribute classNames="form-control"}} -
-
- - {{input-integer value=model.userDisabledBitMask min=1 classNames="form-control"}} -
-
- - {{input value=model.userMemberAttribute classNames="form-control"}} -
+
+
+ + {{#if advancedOpen}} + {{t 'ldap.accessConfig.advanced.open'}} + {{else}} + {{t 'ldap.accessConfig.advanced.closed'}} + {{/if}} +
-
-

{{t 'ldap.customizeSchema.groups.header'}}

-
- - {{input value=model.groupObjectClass classNames="form-control"}} -
-
- - {{input value=model.groupNameField classNames="form-control"}} -
-
- - {{input value=model.groupSearchField classNames="form-control"}} -
-
- - {{input value=model.groupMemberUserAttribute classNames="form-control" placeholder=(t 'ldap.customizeSchema.groups.groupMemberUser.placeholder')}} -
-
- - {{input value=model.groupMemberMappingAttribute classNames="form-control"}} +
+
+

{{t 'ldap.customizeSchema.header'}}

+
+

{{t 'ldap.customizeSchema.helpText'}}

+
+
+

{{t 'ldap.customizeSchema.users.header'}}

+
+ + {{input value=ldapConfig.userObjectClass classNames="form-control"}} +
+
+ + {{input value=ldapConfig.userLoginField classNames="form-control"}} +
+
+ + {{input value=ldapConfig.userNameField classNames="form-control"}} +
+
+ + {{input value=ldapConfig.userSearchField classNames="form-control"}} +
+
+ + {{input value=ldapConfig.userEnabledAttribute classNames="form-control"}} +
+
+ + {{input-integer value=ldapConfig.userDisabledBitMask min=1 classNames="form-control"}} +
+
+ + {{input value=ldapConfig.userMemberAttribute classNames="form-control"}} +
-
- - {{input value=model.groupDNField classNames="form-control" placeholder=(t 'ldap.customizeSchema.groups.groupDN.placeholder')}} +
+

{{t 'ldap.customizeSchema.groups.header'}}

+
+ + {{input value=ldapConfig.groupObjectClass classNames="form-control"}} +
+
+ + {{input value=ldapConfig.groupNameField classNames="form-control"}} +
+
+ + {{input value=ldapConfig.groupSearchField classNames="form-control"}} +
+
+ + {{input value=ldapConfig.groupMemberUserAttribute classNames="form-control" placeholder=(t 'ldap.customizeSchema.groups.groupMemberUser.placeholder')}} +
+
+ + {{input value=ldapConfig.groupMemberMappingAttribute classNames="form-control"}} +
+
+ + {{input value=ldapConfig.groupDNField classNames="form-control" placeholder=(t 'ldap.customizeSchema.groups.groupDN.placeholder')}} +
-
-
+
-
-

{{t 'ldap.testAuth.header'}}

-
-

{{t 'ldap.testAuth.helpText' providerName=(t providerName)}}

- {{top-errors errors=errors}} +
+ {{#if editing}} +

{{t 'ldap.testAuth.editingHeader'}}

+ {{else}} +

{{t 'ldap.testAuth.header'}}

+ {{/if}} +
+

{{t 'ldap.testAuth.helpText' providerName=(t providerName)}}

+ {{top-errors errors=errors}} -
-
-
- - {{input value=username classNames="form-control"}} +
+
+
+ + {{#input-or-display editable=(not editing) value=username }} + {{input name="username" value=username classNames="form-control"}} + {{/input-or-display}} +
-
-
-
- - {{input type="password" value=password classNames="form-control"}} +
+
+ + {{input name="password" type="password" value=password classNames="form-control"}} +
-
-
-
- - + {{#if editing}} + {{/if}} - +
-
-
-{{/unless}} - +
+ +{{/if}} diff --git a/app/utils/azure-choices.js b/app/utils/azure-choices.js index ada9c72f59..f1bc55a964 100644 --- a/app/utils/azure-choices.js +++ b/app/utils/azure-choices.js @@ -40,6 +40,22 @@ export let regions = { "name": "westeurope", "displayName": "West Europe", }, + { + "name": "ukwest", + "displayName": "UK West", + }, + { + "name": "uksouth", + "displayName": "UK South", + }, + { + "name": "francecentral", + "displayName": "France Central", + }, + { + "name": "francesouth", + "displayName": "France South", + }, { "name": "japanwest", "displayName": "Japan West", @@ -48,6 +64,14 @@ export let regions = { "name": "japaneast", "displayName": "Japan East", }, + { + "name": "koreacentral", + "displayName": "Korea Central", + }, + { + "name": "koreasouth", + "displayName": "Korea South", + }, { "name": "brazilsouth", "displayName": "Brazil South", @@ -60,6 +84,14 @@ export let regions = { "name": "australiasoutheast", "displayName": "Australia Southeast", }, + { + "name": "australiacentral1", + "displayName": "Australia Central 1", + }, + { + "name": "australiacentral2", + "displayName": "Australia Central 2", + }, { "name": "southindia", "displayName": "South India", @@ -80,6 +112,14 @@ export let regions = { "name": "canadaeast", "displayName": "Canada East", }, + { + "name": "southafricawest", + "displayName": "South Africa West", + }, + { + "name": "southafricanorth", + "displayName": "South Africa North", + }, { "name": "westcentralus", "displayName": "West Central US", @@ -109,7 +149,7 @@ export let regions = { "displayName": "China East", } ].sortBy('name'), - 'AzureUSGovernment': [ + 'AzureUSGovernmentCloud': [ { "name": "usgovvirginia", "displayName": "US Gov Virginia", @@ -124,214 +164,19 @@ export let regions = { }, { "name": "usgovTexas", - "displayName": "US GovTexas", - } + "displayName": "US Gov Texas", + }, + { + "name": "usdodeast", + "displayName": "US DoD East", + }, + { + "name": "usdodcentral", + "displayName": "US DoD Central", + }, ].sortBy('name') }; -export let sizes = [ - { - group: 'Basic', - value: 'Basic_A0' - }, - { - group: 'Basic', - value: 'Basic_A1' - }, - { - group: 'Basic', - value: 'Basic_A2' - }, - { - group: 'Basic', - value: 'Basic_A3' - }, - { - group: 'Basic', - value: 'Basic_A4' - }, - { - group: 'Standard', - value: 'Standard_A0' - }, - { - group: 'Standard', - value: 'Standard_A1' - }, - { - group: 'Standard', - value: 'Standard_A2' - }, - { - group: 'Standard', - value: 'Standard_A3' - }, - { - group: 'Standard', - value: 'Standard_A4' - }, - { - group: 'Standard', - value: 'Standard_A5' - }, - { - group: 'Standard', - value: 'Standard_A6' - }, - { - group: 'Standard', - value: 'Standard_A7' - }, - { - group: 'Standard', - value: 'Standard_A8' - }, - { - group: 'Standard', - value: 'Standard_A9' - }, - { - group: 'Standard', - value: 'Standard_A10' - }, - { - group: 'Standard', - value: 'Standard_A11' - }, - { - group: 'Standard', - value: 'Standard_D1' - }, - { - group: 'Standard', - value: 'Standard_D2' - }, - { - group: 'Standard', - value: 'Standard_D3' - }, - { - group: 'Standard', - value: 'Standard_D4' - }, - { - group: 'Standard', - value: 'Standard_D11' - }, - { - group: 'Standard', - value: 'Standard_D12' - }, - { - group: 'Standard', - value: 'Standard_D13' - }, - { - group: 'Standard', - value: 'Standard_D14' - }, - { - group: 'Standard', - value: 'Standard_D1_v2' - }, - { - group: 'Standard', - value: 'Standard_D2_v2' - }, - { - group: 'Standard', - value: 'Standard_D3_v2' - }, - { - group: 'Standard', - value: 'Standard_D4_v2' - }, - { - group: 'Standard', - value: 'Standard_D5_v2' - }, - { - group: 'Standard', - value: 'Standard_D11_v2' - }, - { - group: 'Standard', - value: 'Standard_D12_v2' - }, - { - group: 'Standard', - value: 'Standard_D13_v2' - }, - { - group: 'Standard', - value: 'Standard_D14_v2' - }, - { - group: 'Standard', - value: 'Standard_DS1' - }, - { - group: 'Standard', - value: 'Standard_DS2' - }, - { - group: 'Standard', - value: 'Standard_DS3' - }, - { - group: 'Standard', - value: 'Standard_DS12' - }, - { - group: 'Standard', - value: 'Standard_DS13' - }, - { - group: 'Standard', - value: 'Standard_DS14' - }, - { - group: 'Standard', - value: 'Standard_G1' - }, - { - group: 'Standard', - value: 'Standard_G2' - }, - { - group: 'Standard', - value: 'Standard_G3' - }, - { - group: 'Standard', - value: 'Standard_G4' - }, - { - group: 'Standard', - value: 'Standard_G5' - }, - { - group: 'Standard', - value: 'Standard_GS1' - }, - { - group: 'Standard', - value: 'Standard_GS2' - }, - { - group: 'Standard', - value: 'Standard_GS3' - }, - { - group: 'Standard', - value: 'Standard_GS4' - }, - { - group: 'Standard', - value: 'Standard_GS5' - }, -]; - export let storageTypes = [ { name: 'Standard LRS', @@ -366,6 +211,6 @@ export let environments = [ value: 'AzureChinaCloud' }, { - value: 'AzureUSGovernment' + value: 'AzureUSGovernmentCloud' } -]; \ No newline at end of file +]; diff --git a/app/utils/azure-vm-choices.js b/app/utils/azure-vm-choices.js new file mode 100644 index 0000000000..dc9a8d320f --- /dev/null +++ b/app/utils/azure-vm-choices.js @@ -0,0 +1,1421 @@ +export let sizes = [{ + label: 'General Purpose', + series: [{ + label: 'B-series', + invalidRegions: [ + 'germanycentral', + 'germanynortheast', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_B1s', + cpu: 1, + memory: 1, + }, + { + size: 'Standard_B1ms', + cpu: 1, + memory: 2, + }, + { + size: 'Standard_B2s', + cpu: 2, + memory: 4, + }, + { + size: 'Standard_B2ms', + cpu: 2, + memory: 8, + }, + { + size: 'Standard_B4ms', + cpu: 4, + memory: 16, + }, + { + size: 'Standard_B8ms', + cpu: 8, + memory: 32, + } + ] + }, { + label: 'Dsv3-series', + invalidRegions: [ + 'southindia', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_D2s_v3', + cpu: 2, + memory: 8, + }, + { + size: 'Standard_D4s_v3', + cpu: 4, + memory: 16, + }, + { + size: 'Standard_D8s_v3', + cpu: 8, + memory: 32, + }, + { + size: 'Standard_D16s_v3', + cpu: 16, + memory: 64, + }, + { + size: 'Standard_D32s_v3', + cpu: 32, + memory: 128, + }, + { + size: 'Standard_D64s_v3', + cpu: 64, + memory: 256, + } + ] + }, { + label: 'Dv3-series', + invalidRegions: [ + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_D2_v3', + cpu: 2, + memory: 8, + }, + { + size: 'Standard_D4_v3', + cpu: 4, + memory: 16, + }, + { + size: 'Standard_D8_v3', + cpu: 8, + memory: 32, + }, + { + size: 'Standard_D16_v3', + cpu: 16, + memory: 64, + }, + { + size: 'Standard_D32_v3', + cpu: 32, + memory: 128, + }, + { + size: 'Standard_D64_v3', + cpu: 64, + memory: 256, + }, + ] + }, + { + label: 'DSv2-series', + invalidRegions: [ + 'usgovlowa', + ], + sizes: [{ + size: 'Standard_DS1_v2', + cpu: 1, + memory: 3.5, + }, + { + size: 'Standard_DS2_v2', + cpu: 2, + memory: 7, + }, + { + size: 'Standard_DS3_v2', + cpu: 4, + memory: 14, + }, + { + size: 'Standard_DS4_v2', + cpu: 8, + memory: 28, + }, + { + size: 'Standard_DS5_v2', + cpu: 16, + memory: 56, + }, + ] + }, { + label: 'Dv2-series', + sizes: [{ + size: 'Standard_D1_v2', + cpu: 1, + memory: 3.5, + }, + { + size: 'Standard_D2_v2', + cpu: 2, + memory: 7, + }, + { + size: 'Standard_D3_v2', + cpu: 4, + memory: 14, + }, + { + size: 'Standard_D4_v2', + cpu: 8, + memory: 28, + }, + { + size: 'Standard_D5_v2', + cpu: 16, + memory: 56, + } + ] + }, { + label: 'DS-series', + invalidRegions: [ + 'northcentralus', + 'westcentralus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'australiacentral1', + 'australiacentral2', + 'centralindia', + 'westindia', + 'southindia', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_DS1', + cpu: 1, + memory: 3.5, + }, + { + size: 'Standard_DS2', + cpu: 2, + memory: 7, + }, + { + size: 'Standard_DS3', + cpu: 4, + memory: 14, + }, + { + size: 'Standard_DS4', + cpu: 8, + memory: 28, + } + ], + }, { + label: 'D-series', + invalidRegions: [ + 'westcentralus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'australiacentral1', + 'australiacentral2', + 'centralindia', + 'westindia', + 'southindia', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_D1', + cpu: 1, + memory: 3.5, + }, + { + size: 'Standard_D2', + cpu: 2, + memory: 7, + }, + { + size: 'Standard_D3', + cpu: 4, + memory: 14, + }, + { + size: 'Standard_D4', + cpu: 8, + memory: 28, + } + ] + }, { + label: 'Av2-series', + sizes: [{ + size: 'Standard_A1_v2', + cpu: 1, + memory: 2, + }, + { + size: 'Standard_A2_v2', + cpu: 2, + memory: 4, + }, + { + size: 'Standard_A4_v2', + cpu: 4, + memory: 8, + }, + { + size: 'Standard_A8_v2', + cpu: 8, + memory: 16, + }, + { + size: 'Standard_A2m_v2', + cpu: 2, + memory: 16, + }, + { + size: 'Standard_A4m_v2', + cpu: 4, + memory: 32, + }, + { + size: 'Standard_A8m_v2', + cpu: 8, + memory: 64, + } + ] + }, { + label: 'A-series', + sizes: [{ + size: 'Standard_A0', + cpu: 1, + memory: 0.75, + }, + { + size: 'Standard_A1', + cpu: 1, + memory: 1.75, + }, + { + size: 'Standard_A2', + cpu: 2, + memory: 3.5, + }, + { + size: 'Standard_A3', + cpu: 4, + memory: 7, + }, + { + size: 'Standard_A4', + cpu: 8, + memory: 14, + }, + { + size: 'Standard_A5', + cpu: 2, + memory: 14, + }, + { + size: 'Standard_A6', + cpu: 4, + memory: 28, + }, + { + size: 'Standard_A7', + cpu: 8, + memory: 56, + } + ] + }, + { + label: 'Basic A', + sizes: [{ + size: 'Basic_A0', + cpu: 1, + memory: 0.75, + }, + { + size: 'Basic_A1', + cpu: 1, + memory: 1.75, + }, + { + size: 'Basic_A2', + cpu: 2, + memory: 3.5, + }, + { + size: 'Basic_A3', + cpu: 4, + memory: 7, + }, + { + size: 'Basic_A4', + cpu: 8, + memory: 14, + }, + ], + } + ] + }, + { + label: 'Compute Optimized', + series: [{ + label: 'Fsv2-series', + invalidRegions: [ + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'southeastasia', + 'eastasia', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_F2s_v2', + cpu: 2, + memory: 4, + }, + { + size: 'Standard_F4s_v2', + cpu: 4, + memory: 8, + }, + { + size: 'Standard_F8s_v2', + cpu: 8, + memory: 16, + }, + { + size: 'Standard_F16s_v2', + cpu: 16, + memory: 32, + }, + { + size: 'Standard_F32s_v2', + cpu: 32, + memory: 64, + }, + { + size: 'Standard_F64s_v2', + cpu: 64, + memory: 128, + }, + { + size: 'Standard_F72s_v2', + cpu: 72, + memory: 144, + } + ], + }, + { + label: 'Fs-series', + invalidRegions: [ + 'usgovlowa', + ], + sizes: [{ + size: 'Standard_F1s', + cpu: 1, + memory: 2, + }, + { + size: 'Standard_F2s', + cpu: 2, + memory: 4, + }, + { + size: 'Standard_F4s', + cpu: 4, + memory: 8, + }, + { + size: 'Standard_F8s', + cpu: 8, + memory: 16, + }, + { + size: 'Standard_F16s', + cpu: 16, + memory: 32, + }, + ] + }, { + label: 'F-series', + sizes: [{ + size: 'Standard_F1', + cpu: 1, + memory: 2, + }, + { + size: 'Standard_F2', + cpu: 2, + memory: 4, + }, + { + size: 'Standard_F4', + cpu: 4, + memory: 8, + }, + { + size: 'Standard_F8', + cpu: 8, + memory: 16, + }, + { + size: 'Standard_F16', + cpu: 16, + memory: 32, + }, + ] + } + ] + }, + { + label: 'Memory Optimized', + series: [{ + label: 'Esv3-series', + invalidRegions: [ + 'westcentralus', + 'francecentral', + 'francesouth', + 'westindia', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_E2s_v3', + cpu: 2, + memory: 16, + }, + { + size: 'Standard_E4s_v3', + cpu: 4, + memory: 32, + }, + { + size: 'Standard_E8s_v3', + cpu: 8, + memory: 64, + }, + { + size: 'Standard_E16s_v3', + cpu: 16, + memory: 128, + }, + { + size: 'Standard_E32s_v3', + cpu: 32, + memory: 256, + }, + { + size: 'Standard_E64s_v3', + cpu: 64, + memory: 432, + }, + { + size: 'Standard_E64is_v3', + cpu: 64, + memory: 432, + } + ] + }, + { + label: 'Ev3-series', + invalidRegions: [ + 'westcentralus', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_E2_v3', + cpu: 2, + memory: 16, + }, + { + size: 'Standard_E4_v3', + cpu: 4, + memory: 32, + }, + { + size: 'Standard_E8_v3', + cpu: 8, + memory: 64, + }, + { + size: 'Standard_E16_v3', + cpu: 16, + memory: 128, + }, + { + size: 'Standard_E32_v3', + cpu: 32, + memory: 256, + }, + { + size: 'Standard_E64_v3', + cpu: 64, + memory: 432, + }, + { + size: 'Standard_E64i_v3', + cpu: 64, + memory: 432, + } + ] + }, + { + label: 'M-series', + invalidRegions: [ + 'eastus', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_M64s', + cpu: 64, + memory: 1024, + }, + { + size: 'Standard_M64ms', + cpu: 64, + memory: 1792, + }, + { + size: 'Standard_M128s', + cpu: 128, + memory: 2048, + }, + { + size: 'Standard_M128ms', + cpu: 128, + memory: 3800, + }, + ] + }, + { + label: 'GS-series', + invalidRegions: [ + 'eastus', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'westus2', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_GS1', + cpu: 2, + memory: 28, + }, + { + size: 'Standard_GS2', + cpu: 4, + memory: 56, + }, + { + size: 'Standard_GS3', + cpu: 8, + memory: 112, + }, + { + size: 'Standard_GS4', + cpu: 16, + memory: 224, + }, + { + size: 'Standard_GS5', + cpu: 32, + memory: 448, + } + ] + }, + { + label: 'G-series', + invalidRegions: [ + 'eastus', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanynortheast', + 'ukwest', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_G1', + cpu: 2, + memory: 28, + }, + { + size: 'Standard_G2', + cpu: 4, + memory: 56, + }, + { + size: 'Standard_G3', + cpu: 8, + memory: 112, + }, + { + size: 'Standard_G4', + cpu: 16, + memory: 224, + }, + { + size: 'Standard_G5', + cpu: 32, + memory: 448, + } + ] + }, + { + label: 'DSv2-series', + invalidRegions: [ + 'usgovlowa', + ], + sizes: [{ + size: 'Standard_DS11_v2', + cpu: 2, + memory: 14, + }, + { + size: 'Standard_DS12_v2', + cpu: 4, + memory: 28, + }, + { + size: 'Standard_DS13_v2', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_DS14_v2', + cpu: 16, + memory: 112, + }, + { + size: 'Standard_DS15_v2', + cpu: 20, + memory: 140, + }, + ] + }, + { + label: 'Dv2-series', + sizes: [{ + size: 'Standard_D11_v2', + cpu: 2, + memory: 14, + }, + { + size: 'Standard_D12_v2', + cpu: 4, + memory: 28, + }, + { + size: 'Standard_D13_v2', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_D14_v2', + cpu: 16, + memory: 112, + }, + { + size: 'Standard_D15_v2', + cpu: 20, + memory: 140, + }, + ] + }, + { + label: 'DS-series', + invalidRegions: [ + 'northcentralus', + 'westcentralus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'australiacentral1', + 'australiacentral2', + 'centralindia', + 'westindia', + 'southindia', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_DS11', + cpu: 2, + memory: 14, + }, + { + size: 'Standard_DS12', + cpu: 4, + memory: 28, + }, + { + size: 'Standard_DS13', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_DS14', + cpu: 16, + memory: 112, + } + ] + }, + { + label: 'D-series', + invalidRegions: [ + 'westcentralus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'australiacentral1', + 'australiacentral2', + 'centralindia', + 'westindia', + 'southindia', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_D11', + cpu: 2, + memory: 14, + }, + { + size: 'Standard_D12', + cpu: 4, + memory: 28, + }, + { + size: 'Standard_D13', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_D14', + cpu: 16, + memory: 112, + } + ] + } + ] + }, + { + label: 'Storage Optimized', + series: [{ + label: 'Ls-series', + invalidRegions: [ + 'eastus', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_L4s', + cpu: 4, + memory: 32, + }, + { + size: 'Standard_L8s', + cpu: 8, + memory: 64, + }, + { + size: 'Standard_L16s', + cpu: 16, + memory: 128, + }, + { + size: 'Standard_L32s', + cpu: 32, + memory: 256, + }, + ] + }] + }, + { + label: 'GPU', + series: [{ + label: 'NC-series', + invalidRegions: [ + 'centralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'southeastasia', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_NC6', + cpu: 6, + memory: 56, + }, + { + size: 'Standard_NC12', + cpu: 12, + memory: 112, + }, + { + size: 'Standard_NC24', + cpu: 24, + memory: 224, + }, + { + size: 'Standard_NC24r', + cpu: 24, + memory: 224, + }, + ] + }, + { + label: 'NCv2-series', + invalidRegions: [ + 'eastus2', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_NC6s_v2', + cpu: 6, + memory: 112, + }, + { + size: 'Standard_NC12s_v2', + cpu: 12, + memory: 224, + }, + { + size: 'Standard_NC24s_v2', + cpu: 24, + memory: 448, + }, + { + size: 'Standard_NC24rs_v2', + cpu: 24, + memory: 448, + }, + ] + }, + { + label: 'NCv3-series', + invalidRegions: [ + 'eastus2', + 'centralus', + 'northcentralus', + 'westcentralus', + 'westus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'eastasia', + 'southeastasia', + 'australiacentral1', + 'australiacentral2', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_NC6s_v3', + cpu: 6, + memory: 112, + }, + { + size: 'Standard_NC12s_v3', + cpu: 12, + memory: 224, + }, + { + size: 'Standard_NC24s_v3', + cpu: 24, + memory: 448, + }, + { + size: 'Standard_NC24rs_v3', + cpu: 24, + memory: 448, + }, + ] + }, + { + label: 'ND-series', + invalidRegions: [ + 'eastus2', + 'centralus', + 'northcentralus', + 'southcentralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'northeurope', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'japaneast', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_ND6s', + cpu: 6, + memory: 112, + }, + { + size: 'Standard_ND12s', + cpu: 12, + memory: 224, + }, + { + size: 'Standard_ND24s', + cpu: 24, + memory: 448, + }, + { + size: 'Standard_ND24rs', + cpu: 24, + memory: 448, + }, + ] + }, + { + label: 'NV-series', + invalidRegions: [ + 'centralus', + 'westcentralus', + 'westus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'westindia', + 'southindia', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_NV6', + cpu: 6, + memory: 56, + }, + { + size: 'Standard_NV12', + cpu: 12, + memory: 112, + }, + { + size: 'Standard_NV24', + cpu: 24, + memory: 224, + } + ] + } + ] + }, + { + label: 'High Performance Compute', + series: [{ + label: 'H-series', + invalidRegions: [ + 'eastus2', + 'centralus', + 'westcentralus', + 'canadaeast', + 'canadacentral', + 'brazilsouth', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'eastasia', + 'australiacentral1', + 'australiacentral2', + 'australiasoutheast', + 'westindia', + 'southindia', + 'japanwest', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_H8', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_H16', + cpu: 16, + memory: 112, + }, + { + size: 'Standard_H8m', + cpu: 8, + memory: 112, + }, + { + size: 'Standard_H16m', + cpu: 16, + memory: 224, + }, + { + size: 'Standard_H16r', + cpu: 16, + memory: 112, + }, + { + size: 'Standard_H16mr', + cpu: 16, + memory: 224, + } + ] + }, + { + label: 'A-series', + invalidRegions: [ + 'westcentralus', + 'westus2', + 'canadaeast', + 'canadacentral', + 'francecentral', + 'francesouth', + 'germanycentral', + 'germanynortheast', + 'ukwest', + 'uksouth', + 'australiacentral1', + 'australiacentral2', + 'australiaeast', + 'australiasoutheast', + 'centralindia', + 'westindia', + 'southindia', + 'koreacentral', + 'koreasouth', + 'usgovvirginia', + 'usgovlowa', + 'usgovarizona', + 'usgovTexas', + 'usdodeast', + 'usdodcentral', + ], + sizes: [{ + size: 'Standard_A8', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_A9', + cpu: 16, + memory: 112, + }, + { + size: 'Standard_A10', + cpu: 8, + memory: 56, + }, + { + size: 'Standard_A11', + cpu: 16, + memory: 112, + } + ] + } + ], + }, +]; diff --git a/app/utils/constants.js b/app/utils/constants.js index 75d2df65b1..cf946e6a1a 100644 --- a/app/utils/constants.js +++ b/app/utils/constants.js @@ -50,6 +50,7 @@ var C = { COMMUNITY_KEY: 'community', COMMUNITY_VALUE: 'https://git.rancher.io/community-catalog.git', DEFAULT_BRANCH: 'master', + LIBRARY_BRANCH: '${RELEASE}', }, COOKIE: { @@ -149,6 +150,8 @@ var C = { STACK_NAME: 'io.rancher.stack.name', STACK_UUID: 'io.rancher.stack.uuid', SYSTEM_TYPE: 'io.rancher.container.system', + PER_HOST_SUBNET: 'io.rancher.network.per_host_subnet.subnet', + PER_HOST_SUBNET_ROUTING_IP: 'io.rancher.network.per_host_subnet.router_ip', // Catalog CERTIFIED: 'io.rancher.certified', @@ -167,6 +170,7 @@ var C = { // Kubernetes K8S_DASHBOARD: 'io.rancher.k8s.kubernetes-dashboard', K8S_KUBECTL: 'io.rancher.k8s.kubectld', + K8S_TOKEN: 'io.rancher.k8s.token', K8S_POD_NAME: 'io.kubernetes.pod.name', K8S_POD_NAMESPACE: 'io.kubernetes.pod.namespace', @@ -183,6 +187,9 @@ var C = { LAUNCH_CONFIG: 'io.rancher.service.launch.config', LAUNCH_CONFIG_PRIMARY: 'io.rancher.service.primary.launch.config', SIDEKICK: 'io.rancher.sidekicks', + SERVICE_UI_PATH: 'io.rancher.service.ui_link.path', + SERVICE_UI_PORT: 'io.rancher.service.ui_link.port', + SERVICE_UI_LABEL: 'io.rancher.service.ui_link.label', }, PREFS: { @@ -351,6 +358,7 @@ var C = { RACKSPACE: 'rackspace', UBIQUITY: 'ubiquity', VMWAREVSPHERE: 'vmwarevsphere', + OTC: 'otc', OTHER: 'other', CUSTOM: 'custom', ALIYUNECS: 'aliyunecs', diff --git a/app/utils/errors.js b/app/utils/errors.js index 536fa8fcc4..70d4c5a4c1 100644 --- a/app/utils/errors.js +++ b/app/utils/errors.js @@ -67,7 +67,7 @@ export default { } else { - str = err.get('message'); + str = err.get('message') || err.get('xhr.message'); if ( err.get('detail') ) { if ( str ) diff --git a/app/utils/navigation-tree.js b/app/utils/navigation-tree.js index c660898a3b..ee630ed897 100644 --- a/app/utils/navigation-tree.js +++ b/app/utils/navigation-tree.js @@ -12,7 +12,7 @@ export const swarmReady = function() { return this.get('swarmReady'); }; export const swarmNotReady = function() { return !this.get('swarmReady'); }; export const mesosReady = function() { return this.get('mesosReady'); }; export const mesosNotReady = function() { return !this.get('mesosReady'); }; -export const isOwner = function() { return this.get('isOwner'); }; +export const isOwner = function() { return this.get('access').isOwner(); }; /* Tree item options { @@ -416,7 +416,6 @@ function getStacksSubtree() { icon: 'icon icon-tag', route: 'stacks', ctx: [getProjectId], - condition: isOwner, queryParams: {which: C.EXTERNAL_ID.KIND_ALL, tags: choice}, }); }); @@ -474,7 +473,7 @@ function getCatalogSubtree() { out.push({divider: true}); } - repos.forEach((repo) => { + repos.sortBy('name').forEach((repo) => { out.push({ id: 'catalog-'+repo.get('id'), label: repo.get('name'), diff --git a/app/utils/parse-port.js b/app/utils/parse-port.js index f5b0b033f1..62e9107975 100644 --- a/app/utils/parse-port.js +++ b/app/utils/parse-port.js @@ -4,7 +4,7 @@ import Ember from 'ember'; // hostIp::containerPort // hostPort:containerPort // containerPort -export function parsePortSpec(str, defaultProtocol='http') { +export function parsePortSpec(str, defaultProtocol) { str = str.trim(); var match, parts, hostIp = '', hostPort, containerPort, protocol; diff --git a/app/utils/validate-dns.js b/app/utils/validate-dns.js new file mode 100644 index 0000000000..8ae60f7588 --- /dev/null +++ b/app/utils/validate-dns.js @@ -0,0 +1,54 @@ +export function validateHostname(hostname){ + //hostname can not start with a dot + if (hostname.slice(0,1) ==='.'){ + return false; + } + //hostname can not be empty string + if (hostname.length === 0){ + return false; + } + //total length of the hostname can be at most 253 characters (255 minus one for null-termination, and one for the trailing dot if not already present) + if (hostname.length > 253) { + return false; + } + //split the hostname with the dot and validate the element as label + let labels = hostname.split(/\./); + for(var i = 0; i < labels.length; i++){ + let label = labels[i]; + //hostname can end with a dot (this makes it an explicitly fully qualified domain name, but is not always desirable) + //it meas that the last element of the labels can be empty string. + if (i === labels.length-1 && label === ""){ + continue; + } + if (!validateLabel(label)){ + return false; + } + } + return true; +} + +export function validateLabel(label){ + let test = label.toLowerCase(); + //label must consist of the characters a-z (case-insensitive), 0-9, and hyphen + if (!test.match(/^[a-z0-9-]+$/i)){ + return false; + } + //label cannot start with or end with a hyphen + if (test.slice(0,1) === '-' || test.slice(-1) === '-') { + return false; + } + //label cannot contain two consecutive hyphens + if (test.includes('--')){ + return false; + } + //label must be 1-63 characters + if (test.length < 1 || test.length > 63){ + return false; + } + return true; +} + +export default { + validateHostname:validateHostname, + validateLabel:validateLabel, +}; \ No newline at end of file diff --git a/app/utils/xterm-fit-addon.js b/app/utils/xterm-fit-addon.js new file mode 100644 index 0000000000..d33b9f7413 --- /dev/null +++ b/app/utils/xterm-fit-addon.js @@ -0,0 +1,34 @@ + +export function proposeGeometry(term) { + if (!term.element.parentElement) { + return null; + } + var parentElementStyle = window.getComputedStyle(term.element.parentElement), + parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height')), + parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')) - 17), + elementStyle = window.getComputedStyle(term.element), + elementPaddingVer = parseInt(elementStyle.getPropertyValue('padding-top')) + parseInt(elementStyle.getPropertyValue('padding-bottom')), + elementPaddingHor = parseInt(elementStyle.getPropertyValue('padding-right')) + parseInt(elementStyle.getPropertyValue('padding-left')), + availableHeight = parentElementHeight - elementPaddingVer, + availableWidth = parentElementWidth - elementPaddingHor, + subjectRow = term.rowContainer.firstElementChild, + contentBuffer = subjectRow.innerHTML, + characterHeight, + rows, + characterWidth, + cols, + geometry; + + subjectRow.style.display = 'inline'; + subjectRow.innerHTML = 'W'; // Common character for measuring width, although on monospace + characterWidth = subjectRow.getBoundingClientRect().width; + subjectRow.style.display = ''; // Revert style before calculating height, since they differ. + characterHeight = parseInt(subjectRow.offsetHeight); + subjectRow.innerHTML = contentBuffer; + + rows = Math.floor(availableHeight / characterHeight); + cols = Math.floor(availableWidth / characterWidth); + + geometry = { cols: cols, rows: rows }; + return geometry; + } \ No newline at end of file diff --git a/ember-cli-build.js b/ember-cli-build.js index 762b0364bc..1266694fa1 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -3,6 +3,8 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); var util = require('util'); var env = EmberApp.env(); +var nodeSass = require('node-sass'); + module.exports = function(defaults) { // Pull in a few useful environment settings for index.html to use @@ -25,7 +27,9 @@ module.exports = function(defaults) { }, storeConfigInMeta: false, inlineContent: inline, - + sassOptions: { + implementation: nodeSass + }, outputPaths: { app: { css: { @@ -36,7 +40,7 @@ module.exports = function(defaults) { }, nodeAssets: { 'xterm': { - import: ['src/xterm.css'] + import: ['dist/xterm.css'] }, 'lacsso': { import: ['lacsso.css'] diff --git a/package.json b/package.json index d21900625b..9d7efb036f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "1.6.4", + "version": "1.6.52", "private": true, "directories": { "doc": "doc", @@ -23,6 +23,7 @@ "devDependencies": { "ansi_up": "^1.3.0", "broccoli-asset-rev": "^2.4.5", + "dompurify": "^1.0.11", "ember-api-store": "2.2.0", "ember-browserify": "^1.0.1", "ember-cli": "2.9.1", @@ -39,7 +40,7 @@ "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", "ember-cli-rtlcss": "0.0.1", - "ember-cli-sass": "^5.1.0", + "ember-cli-sass": "^10.0.1", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", @@ -55,12 +56,15 @@ "forever-agent": "^0.6.1", "glob": "^5.0.3", "http-proxy": "^1.11.1", - "lacsso": "0.0.58", - "liquid-fire": "0.26.4", + "lacsso": "0.0.59", + "liquid-fire": "^0.27.3", "loader.js": "^4.0.10", "semver": "^5.3.0", "shell-quote": "^1.4.3", - "xterm": "1.0.0", + "xterm": "^2.5.0", "yamljs": "^0.2.7" + }, + "dependencies": { + "node-sass": "^4.12.0" } } diff --git a/public/assets/images/providers/exoscale.svg b/public/assets/images/providers/exoscale.svg index 37c8f57a71..e99c000484 100644 --- a/public/assets/images/providers/exoscale.svg +++ b/public/assets/images/providers/exoscale.svg @@ -1,43 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/public/assets/images/providers/otc-tsystems.png b/public/assets/images/providers/otc-tsystems.png new file mode 100644 index 0000000000..148d3d0ecd Binary files /dev/null and b/public/assets/images/providers/otc-tsystems.png differ diff --git a/scripts/build-static b/scripts/build-static index 7a57c6a06b..cb7921ae86 100755 --- a/scripts/build-static +++ b/scripts/build-static @@ -127,8 +127,8 @@ if [[ $LATEST -eq 1 ]] && [[ $TAG -eq 1 ]]; then fi fi -if ( [[ $TAG -eq 1 ]] || [[ $UPLOAD -ne 0 ]] ) && [[ "${BRANCH}" != "master" ]]; then - echo "You can only tag or upload the master branch (you are on '${BRANCH}')." +if ( [[ $TAG -eq 1 ]] || [[ $UPLOAD -ne 0 ]] ) && [[ "${BRANCH}" != "1.6-dev" ]]; then + echo "You can only tag or upload the master 1.6-dev (you are on '${BRANCH}')." if [[ $FORCE -ne 1 ]]; then exit 1; fi @@ -186,6 +186,9 @@ fi; echo "Building Hosted Version..." FINGERPRINT="${FINGERPRINT}" RANCHER="" CATALOG="" BASE_ASSETS="//${CDN}/${VERSION}/" runCmd ./node_modules/.bin/ember build --environment=${ENVIRONMENT} --output-path=${BUILD_DIR} +# Remove .DS_Store files +runCmd find ${BUILD_DIR} -name '.DS_Store' -exec rm {} \; + # Create a file containing the version echo "${PKG_VERSION}" > ${BUILD_DIR}/VERSION.txt diff --git a/tests/unit/utils/parse-port-test.js b/tests/unit/utils/parse-port-test.js index 019ec4aa18..254b0802ff 100644 --- a/tests/unit/utils/parse-port-test.js +++ b/tests/unit/utils/parse-port-test.js @@ -21,7 +21,7 @@ var data = [ data.forEach(function(obj) { var input = obj.str; - var actual = parsePortSpec(input); + var actual = parsePortSpec(input,'http'); if ( obj.parsed ) { diff --git a/tests/unit/utils/validate-dns-test.js b/tests/unit/utils/validate-dns-test.js new file mode 100644 index 0000000000..5a75a81f24 --- /dev/null +++ b/tests/unit/utils/validate-dns-test.js @@ -0,0 +1,36 @@ +import { module, test } from 'qunit'; +import {validateHostname} from "ui/utils/validate-dns"; + +module('Unit | Utils | validate-dns'); + +//test case +let hostnames = [ + {str:"aA0",result:true}, + {str:"a",result:true}, + //chec for dot + {str:".aA0",result:false}, + {str:"aA0.",result:true}, + {str:"a.A0",result:true}, + {str:"a..A0",result:false}, + //check for dash + {str:"a-A0",result:true}, + {str:"-aA0",result:false}, + {str:"aA0-",result:false}, + {str:"a--A0",result:false}, + //check for specifical character + {str:"aA0/",result:false}, + {str:"a/A0",result:false}, + {str:"/aA0",result:false}, + //check for length + {str:"",result:false}, + {str:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900",result:true}, + {str:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789000",result:false}, + {str:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",result:true}, + {str:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345678900.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",result:false}, +]; + +hostnames.forEach(function(element) { + var input = element.str; + var result = validateHostname(input); + test("validating "+input,function(assert){assert.strictEqual(result,element.result,'validate correctly');}); +}, this); \ No newline at end of file diff --git a/translations/de-de.yaml b/translations/de-de.yaml index eee8160770..2379c45bd1 100644 --- a/translations/de-de.yaml +++ b/translations/de-de.yaml @@ -2096,8 +2096,8 @@ stackSection: } sidekick: | {numSidekicks, plural, - =1 {Sidekick} - other {Sidekicks} + =1 {+ 1 Sidekick} + other {+ # Sidekicks} } add: service: Service hinzufügen diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 03f3c3b34b..c377aec11b 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -17,6 +17,7 @@ generic: disable: Disable disabled: Disabled domainName: Domain Name + edit: Edit emptyString: "" enable: Enable enabled: Enabled @@ -484,6 +485,7 @@ containersPage: on: on in: in infoMultiStats: + created: 'Created:' tooltip: host: Copy IP To Clipboard host: 'Host:' @@ -734,6 +736,8 @@ loginPage: shibbolethMessage: "{appName} uses Shibboleth to manage accounts. Click the button below to log in to the configured Shibboleth IDP." shibbolethError: 401: "Unauthorized" + 403: "Forbidden" + 422: "Unprocessable Entity" 500: "Internal Server Error" generic: "There was an error ({errorCode}) while trying to log you in. Please try again." error: @@ -1146,6 +1150,8 @@ ldap: openldap: OpenLDAP ad: Active Directory header: + editing: + label: Edit Active Directory Configuration enabled: label: "{providerName} is enabled" required: | @@ -1172,10 +1178,9 @@ ldap: disabled: label: "{providerName} is not configured" warning: "{appName} can be configured to restrict access to a set of {providerName} users and groups. This is not currently set up, so anybody that reach this page (or the API) has full control over the system." - accessEnabled: header: Authentication - subtext: "To change the server configuration, disable access control below and then set it up again." + subtext: "To change the server configuration, select the edit button and test the new configuration before saving." general: header: General server: "Server:" @@ -1183,6 +1188,7 @@ ldap: serviceAccount: "Service Account:" searchBase: "Search Base:" defaultDomain: "Default Domain:" + timeout: "Connection Timeout:" users: header: Users objectClass: "Object Class:" @@ -1203,22 +1209,18 @@ ldap: pre: Disable access control post: "Are you sure? Click again to really disable access control" accessConfig: - header: "1. Configure an {providerName} server" + header: "Configure an {providerName} server" subtext1: "Enter the address, port, and protocol to connect to your {providerName} server. 389 is the standard port for insecure, 636 for TLS." subtext2: "{appName} needs a service account that has (read-only) access to all of the domains that will be able to login, so that we can determine what groups a user is a member of when they make a request with an API key." - hostName: - labelText: Hostname or IP Address + advanced: + open: Hide Advanced + closed: Show Advanced + timeout: + labelText: Connection Timeout + unit: ms port: labelText: Port checkbox: TLS - serviceUsername: - labelText: Service Account Username - servicePassword: - labelText: Service Account Password - userSearchBase: - labelText: User Search Base - placeholder: "e.g. ou=Users,dc=mycompany,dc=com" - helpText: "Only users below this base will be used." groupSearchBase: labelText: Group Search Base placeholder: "e.g. ou=Groups,dc=mycompany,dc=com" @@ -1228,7 +1230,7 @@ ldap: labelText: Default Login Domain placeholder: "e.g. mycompany" customizeSchema: - header: "2. Customize Schema" + header: "Customize Schema" helpText: "If your schema does not match the standard ActiveDirectory format, you can customize it here." users: header: Users @@ -1263,7 +1265,8 @@ ldap: labelText: Group DN Field placeholder: distinguishedName testAuth: - header: "3. Test and enable authentication" + header: "Test and enable authentication" + editingHeader: "Test and save new configuration" helpText: "Check that everything is configured correctly by testing authentication with your {providerName} account:" userName: labelText: Your Username @@ -1272,6 +1275,7 @@ ldap: authenticate: pre: Authenticate post: "Testing..." + test: Test and Save servicePartial: noContainers: @@ -1546,7 +1550,7 @@ editStack: envCatalog: header: Manage Catalogs - subtext: You can define your own custom catalog sources here, which will be available only to users of this environment. Global catalogs are available to all enviornments and can only be modified in Admin Settings by an administrator. Each catalog needs a unique name and a URL that git clone can handle (see docs for more info). + subtext: You can define your own custom catalog sources here, which will be available only to users of this environment. Global catalogs are available to all environments and can only be modified in Admin Settings by an administrator. Each catalog needs a unique name and a URL that git clone can handle (see docs for more info). addActionLabel: Add Catalog stackHeader: @@ -1575,6 +1579,15 @@ formBalancerRules: internal: Internal protocol: label: Protocol + region: + label: Region + placeholder: e.g. region1 + environment: + label: Environment + placeholder: e.g. development + weight: + label: Weight + placeholder: e.g. 1 sourceIp: label: Host IP placeholder: e.g. 1.2.3.4 @@ -1606,6 +1619,7 @@ formBalancerRules: prefix: "Host and Path rules are matched top-to-bottom in the order shown. Backends will be named randomly by default; to customize the generated backends, provide a name and then refer to that in the custom haproxy.cfg. " showBackendLink: "Show custom backend names." showIpLink: "Show host IP address options." + showRegionLink: "Show region options." suffix: "" formCommand: @@ -1640,6 +1654,9 @@ formCommand: other {times} } always: Always + drainTimeout: + label: Drain Timeout + unit: ms environment: label: Environment addAction: Add Environment Variable @@ -1981,6 +1998,7 @@ formSecurity: hyperv: HyperV (VM) formServiceLinks: + asName: as name addAction: Service Links noServices: There are no other services to link to. noLinks: This service has no service links. @@ -2388,6 +2406,14 @@ machine: label: Private IP onlyPrivate: label: Use only private IP address + tags: + error: "Tags may not contain comma's. Please fix tag: {tag}" + label: EC2 Tags + addAction: Add Tag + keyLabel: Tag + keyPlaceholder: e.g. FOO + valueLabel: Value + valuePlaceholder: e.g. bar driverAzure: helpBlock: 'You can find instructions on how to create a Client ID and Secret here.' @@ -2404,8 +2430,10 @@ machine: image: label: Image placeholder: 'canonical:UbuntuServer:16.04.0-LTS:latest' + vmType: + label: VM Type size: - label: Size + label: VM Size dockerPort: label: Docker Port placeholder: '2376' @@ -2479,6 +2507,20 @@ machine: step2: "Create a transparent Docker Network:" step2Copy: docker network create -d transparent transparent step3: Copy, paste, and run the command below in PowerShell to start the {appName} agent. + windowsSteps: + step1: Start up a Windows Server 2016 machine somewhere and install a supported version of Docker on it. + step2: "Check and install RemoteAccess and Routing in Windows features:" + step2Copy: Get-WindowsFeature -Name "RemoteAccess","Routing" | Install-WindowsFeature + step2Note: "Note: Windows machine will need to be rebooted if the applications were installed." + step3: Specify a unique subnet for the Windows host. In order to support an overlay network in Windows, each host in the environment must have a unique subnet. + step4: Specify the router IP for the host's subnet. This IP is used to forward network traffic between the different hosts. + routerIp: + placeholder: e.g. 1.2.3.4 + subnet: + placeholder: e.g. 192.168.0.0/24 + step5: "Specify the public IP that should be registered for this host. If left empty, Rancher will auto-detect the IP to use. This generally works for machines with unique public IPs, but will not work if the machine is behind a firewall/NAT or if it is the same machine that is running the {rancherImage} container." + step6: "Optional: Add labels to be applied to the host." + step7: Copy, paste, and run the command below in PowerShell to start the {appName} agent. driverDigitalocean: sizeLabel: | @@ -2512,6 +2554,12 @@ machine: label: Enable IPv6 privateNetworking: label: Enable Private Networking + monitoring: + label: Enable Monitoring + tags: + addActionLabel: Add Droplet Tag + valueLabel: Tags + placeholder: e.g. dev driverExoscale: accountSection: Account Access @@ -2523,7 +2571,7 @@ machine: placeholder: Your Exoscale secret key provided: Provided accountHelp: Paste in your Exoscale key pair here. We'll use this key to create your new Instances. - loginAction: "Next: Authenticate & select a Security Group" + loginAction: "Next: Authenticate & select a Zone" loadingSecurity: Loading security group info from Exoscale... securityGroupSection: Security Group securityGroup: @@ -2533,6 +2581,11 @@ machine: custom: "Custom: Choose an existing group" updating: Updating Security Group... creating: Creating Security Group... + loadingZone: Loading zone info from Exoscale... + zoneSection: Zone + selectZoneAction: "Next: Select a Security Group" + zone: + label: Zone portHelp: link: Learn more text: about the ports that will be opened. @@ -2550,8 +2603,64 @@ machine: label: Root Size sshUser: label: SSH User - placeholder: 'usr1' - + placeholder: 'picked by default by docker-machine' + template: + label: Template + + driverOtc: + access: Account Access + authorize: Authorize + next: + availability: "Next: Select Availability" + networks: "Next: Select Subnet" + instance: "Next: Select Instance Options" + errors: + akId: A Access Key ID is required + akS: A Access Key Secret is required + project: A Project ID is required + loadingAvailability: Loading Availability and VPCs + loadingNetworks: Loading Networks + loadingFlavors: Loading Instance Options + provided: + password: Password Provided + projectId: Project ID + osUsername: OpenStack Username + osPassword: OpenStack Password + osUserDomainName: OpenStack Domain Name + osProjectName: OpenStack Project Name + accessKey: Access Key ID + accessSecret: Access Key Secret + availableZone: + header: Availability + label: + zone: Zone + region: Region + dropdown: + zone: Select a Zone + region: + vpcAndSecurity: + header: Subnet and Security Groups + vpc: VPC + security: Security Group + subnet: Subnet + dropdown: + vpc: Select a VPC + security: Select a Security Group + subnet: Select a Subnet + instance: + header: Instance + options: Instance Options + flavorid: Flavor ID + images: Images + sshUser: SSH User + rootPassword: Root Password + rootVolume: Root Volume Size + rootVolumeType: Root Volume Type + size: Bandwidth Size + dropdown: + flavorid: Select a Flavor + imageid: Select a Image + type: Select a Volume Type driverOther: driverSection: Driver @@ -2684,7 +2793,7 @@ machine: label: Aliyun SLB ID placeholder: Aliyun SLB ID storageSection: Storage Info - isOptimized: + ioOptimized: label: Instance Storage I/O Optimized placeholder: none or optimized systemDiskCategory: @@ -2724,6 +2833,17 @@ machine: sshPassword: label: SSH Password placeholder: Set Instance SSH Password, Blank for Auto set + errors: + nameTooShort: The length of the name must equal or more than two. + nameNotValid: The name is invalid according to the Aliyun ECS hostname rule. + nameTooLong: The length of the name must equal or less than thirty. + accessKeyRequired: Access key is required. + accessSecretRequired: Access secret is required. + sshPasswordLengthNotValid: The length of SSH password must between eight and thirty. + sshPasswordInvalidCharacter: SSH password contains invalid characters. + sshPasswordFormatError: "SSH password must contain at least three out of four kinds of following characters: uppercase letter, lowercase letters, numbers, and special characters." + nameNotValidForApp: The name is invalid according to the {appName} hostname rule. + modalAboutComponent: component: Component @@ -2851,8 +2971,12 @@ newBalancer: error: noRules: "Choose one or more port rules to listen on" noSourcePort: "Source Port is required on each rule" + noRegion: "Region is required for custom service target" + noEnvironment: "Environment is required for custom service target" + missingEnvironment: "Environment is required" invalidSourcePort: "Invalid source port: '{num}'" invalidTargetPort: "Invalid target port: '{num}'" + invalidWeight: "Invalid weight: '{num}'" mixedPort: "Port {num} has multiple rules with conflicting access/protcols" noTarget: "Target is required on each rule" needsCertificate: "A certificate is required because there are SSL/TLS port rules" @@ -2974,6 +3098,17 @@ newReceiver: max: label: Maximum Scale placeholder: e.g. 20 + payloadFormat: + label: Webhook Payload Format + alicloud: Alibaba Cloud Docker Hub + dockerhub: Docker Hub + azure: Azure Container Registry + addressType: + label: Address Type + registry: Public + registry-vpc: VPC + registry-internal: Classic + tag: label: Image Tag placeholder: "e.g. latest" @@ -3001,11 +3136,12 @@ pageFooter: slack: Slack download: link: Download CLI - headerCli: Rancher CLI (beta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows linux: Linux + deprecated: Deprecated pagination: multi: | @@ -3066,6 +3202,9 @@ schema: option: Choose an option... inputService: prompt: Choose a Service... + custom: + prompt: Custom... + placeholder: e.g. region1/environment1/stack1/service1 inputSecret: prompt: Choose a Secret... @@ -3483,6 +3622,17 @@ model: org: Organization localUser: Local User unknown: "{type}?" + openldapconfig: + server: + label: Hostname or IP Address + serviceAccountUsername: + label: Service Account Username + serviceAccountPassword: + label: Service Account Password + domain: + label: User Search Base + placeholder: "e.g. ou=Users,dc=mycompany,dc=com" + help: "Only users below this base will be used." projectMember: role: member: Member diff --git a/translations/fa-ir.yaml b/translations/fa-ir.yaml index 3121b15aed..1b69a643ef 100644 --- a/translations/fa-ir.yaml +++ b/translations/fa-ir.yaml @@ -1452,7 +1452,7 @@ machine: label: حداکثر پهنای باند اینترنت placeholder: 1 تا 100 storageSection: اطلاعات فضای ذخیره سازی - isOptimized: + ioOptimized: placeholder: هیچکدام یا بهینه شده dataDiskSize: placeholder: اندازه دیسک diff --git a/translations/fr-fr.yaml b/translations/fr-fr.yaml index fc586e572b..f8fdddd615 100644 --- a/translations/fr-fr.yaml +++ b/translations/fr-fr.yaml @@ -2116,7 +2116,7 @@ machine: label: Région accessKeyHelp: "Collez votre paire de clés de AWS ici. Nous utiliserons cette clé pour créer vos nouvelles Instances." loginAction: 'Suivant : s''Authentifier & sélectionner un réseau' - loadingAvailability: Chargement des Informations des Zone de disponibilité et des nuages privés virtuels depuis EC2... + loadingAvailability: Chargement des Informations des Zones de disponibilité et des nuages privés virtuels depuis EC2... vpcSection: Zone de Disponibilité & VPC availabilityZone: Zone de Disponibilité subnet: Nuage Virtuel Privé/Sous-Réseau @@ -2286,7 +2286,7 @@ machine: placeholder: Votre clé secrète Exoscale provided: Fourni accountHelp: Collez votre paire de clés de Exoscale ici. Nous utiliserons cette clé pour créer vos nouvelles Instances. - loginAction: 'Suivant : s''authentifier & sélectionner un groupe de sécurité' + loginAction: 'Suivant : s''authentifier & sélectionner une zone' loadingSecurity: Chargement des informations de groupe de sécurité de Exoscale... securityGroupSection: Groupe de Sécurité securityGroup: @@ -2296,6 +2296,11 @@ machine: custom: 'Personnalisé : Choisissez un groupe existant' updating: Mise à jour du Groupe de Sécurité... creating: Création de Groupe de Sécurité... + loadingZone: Chargement des zones de Exoscale... + zoneSection: Zone + selectZoneAction: 'Suivant : Sélectionner un Groupe de Sécurité' + zone: + label: Zone portHelp: link: Pour en savoir plus text: À propos des ports qui seront ouverts. @@ -2314,6 +2319,8 @@ machine: sshUser: label: Utilisateur SSH placeholder: 'utilisateur1' + template: + label: Template driverOther: driverSection: Pilote driver: @@ -2440,7 +2447,7 @@ machine: label: Id de SLB Aliyun placeholder: Id de SLB Aliyun storageSection: Infos de stockage - isOptimized: + ioOptimized: label: Instance de Stockage avec E/S optimisées placeholder: aucun ou optimisé systemDiskCategory: @@ -2700,7 +2707,7 @@ pageFooter: slack: Slack download: link: Télécharger l'Interface de Ligne de Commande (CLI) - headerCli: Rancher CLI (bêta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows @@ -2802,8 +2809,8 @@ stackSection: {numServices, plural, =1 {Service} other {Services}} sidekick: | {numSidekicks, plural, - =1 {Sidekick} - other {Sidekicks} + =1 {+ 1 Sidekick} + other {+ # Sidekicks} } add: service: Ajouter un Service diff --git a/translations/hu-hu.yaml b/translations/hu-hu.yaml index 67dcee024b..52aa2f980d 100644 --- a/translations/hu-hu.yaml +++ b/translations/hu-hu.yaml @@ -2029,7 +2029,7 @@ machine: instanceTag: label: Példány címke placeholder: Aliyun példány címkéd - isOptimized: + ioOptimized: placeholder: none vagy optimized securitySection: Biztonsági szakasz securityGroup: @@ -2180,7 +2180,7 @@ pageFooter: slack: Slack download: link: CLI letöltése - headerCli: Rancher CLI (béta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows diff --git a/translations/ja-jp.yaml b/translations/ja-jp.yaml index 41b856b8e4..73af505bd3 100644 --- a/translations/ja-jp.yaml +++ b/translations/ja-jp.yaml @@ -39,8 +39,9 @@ generic: type: タイプ unknown: 不明 uuid: UUID - noo: false - yess: true + noo: No + yess: Yes + accountsPage: index: header: アカウント @@ -70,6 +71,7 @@ accountsPage: description: labelText: 詳細情報 placeholder: "例: このアカウントは、ジョン ・ スミス用" + apiPage: header: 環境 API キー actionButton: 環境 API キーを追加 @@ -95,6 +97,7 @@ apiPage: paragraph2: "また、アクセス可能な環境に対して作成/削除/操作が行えます。" table: noData: "まだあなたのアカウント API キーはありません" + auditLogsPage: header: 監査ログ form: @@ -122,6 +125,7 @@ auditLogsPage: authIp: "認証 & IP" first: 最初のページ next: 次のページ + authPage: shibboleth: header: @@ -183,7 +187,7 @@ authPage: providerName: shibboleth: シボレス root: - header: Access Control + header: アクセスコントロール github: standard: GitHub enterprise: GitHub エンタープライズ @@ -236,7 +240,7 @@ authPage: li2: text: '"新規アプリケーションの登録" をクリックし、必要事項を入力してください:' ul: - li1: 'アプリケーション名: 自由記載, e.g. My {appName}' + li1: 'アプリケーション名: 自由記載, 例: My {appName}' li2: 'ホームページ URL: ' li3: 'アプリケーションの詳細情報: 自由記載(オプション)' li4: 認証コールバック URL @@ -334,6 +338,7 @@ authPage: post: '有効化中...' 0: header: アクセスコントロール + backupTargetsPage: header: バックアップ対象 linkTo: バックアップ対象を追加 @@ -348,9 +353,11 @@ backupTargetsPage: mountOptions: label: NFS マウントオプション placeholder: '例: nfsvers=4,proto=udp' + catalogPage: index: header: 'カタログ:' + manage: 管理 search: placeholder: 検索... category: "カテゴリー:" @@ -368,9 +375,11 @@ catalogPage: launch: 詳細を見る notCompatible: 互換性がありません alreadyDeployed: 既にデプロイ済みです + consolePage: header: 'シェル:' closeButton: 閉じる + certificatesPage: table: cn: ドメイン名 @@ -407,6 +416,7 @@ certificatesPage: placeholder: '例: mydomain.com' description: placeholder: '例: mydomain.com の EV 証明書' + containersPage: table: ipAddress: IP アドレス @@ -489,20 +499,24 @@ containersPage: error: エラー noData: このコンテナはボリュームを持っていません noContainers: コンテナはありません + containerSubpod: childContainers: コンテナ childSidekicks: サイドキック + dockerCLI: header: Swarm CLI + failWhalePage: header: エラー reloadButton: | 再度試してみるために以下を実施してください
再読み込みまたは logoutButton: ログアウト + haPage: header: 高可用性 setup: - prefix: "ホストの障害時に {{appName}} が稼働し続けるよう複数のサーバーコンテナを異なるホストにデプロイ出来ます。 " + prefix: "ホストの障害時に {appName} が稼働し続けるよう複数のサーバーコンテナを異なるホストにデプロイ出来ます。 " link: ドキュメントを参照してください suffix: "セットアップと使用方法についてご確認ください。" table: @@ -510,6 +524,7 @@ haPage: port: ポート heartbeat: 最終通知時刻 clustered: クラスター + helpPage: header: リンク & インフォメーション banner: アナウンス @@ -579,6 +594,7 @@ helpPage: header: 商用サポート content: | Rancher Labs では {appName} に関して商用またはエンタープライズレベルのサポートを提供しており、24x7 でのサポートチームの利用や優先バグフィックスなどが含まれます。また、実際の構築や {appName} のスケールに興味のある方向けに構築やインテグレーション、コンサルティングサービスなども提供しています。これらのサービスに関して詳細を知りたい方は我々の営業チームまでご連絡ください。sales@rancher.com + hostsPage: addContainer: コンテナを追加 index: @@ -648,6 +664,7 @@ hostsPage: mounts: マウント body: noData: まだこのホストにはボリュームがありません + k8sTab: dashboard: header: Kubernetes ダッシュ ボード @@ -671,6 +688,7 @@ k8sTab: shell: helpText: | または以下のシェルから直接kubectlコマンドを実行します: + loginPage: greeting: "
ようこそ {appName} へ!" githubMessage: "{appName} はアカウントやチームの管理に GitHub を利用しています。 ログインしてあなたの GitHub アカウント情報に読み込み権限でアクセスするために以下のボタンを押して下さい。" @@ -682,6 +700,7 @@ loginPage: error: authFailed: ユーザーネームまたはパスワードが正しくありません。 timedOut: セッションがタイムアウトしました。 続けるには再度ログインをしてください。 + machinePage: header: マシンドライバー inactive: 休止 @@ -702,6 +721,7 @@ machinePage: uiUrl: UI URL checksum: チェックサム noData: マシンドライバーはありません + mesosPage: header: 概要 actionLink: Mesos UI を開く @@ -721,9 +741,11 @@ mesosPage: header: 管理 content: Mesos UI から Mesos を管理します。 button: Mesos UI + notFoundPage: header: "お探しのページは存在しません!" linkTo: ホームに戻る + projectList: index: header: 環境 @@ -749,6 +771,7 @@ projectList: isPublic: パブリック body: noData: "まだ環境のテンプレートはありません" + registriesPage: index: header: レジストリ @@ -767,19 +790,25 @@ registriesPage: form: custom: labelText: アドレス + placeholder: '例: registry.example.com' help: 'プロトコル (https://) を含まないホスト名または IP アドレス' email: labelText: Email + placeholder: '例: you@example.com' username: labelText: ユーザー名 + placeholder: '例: username' password: labelText: パスワード + placeholder: '例: password' + secretsPage: index: header: シークレット linkTo: シークレットを追加 noData: まだシークレットはありません noMatch: 検索条件に一致するシークレットがありません + servicePage: header: 'サービス:' multistat: @@ -848,8 +877,10 @@ servicePage: composeservice: 構成サービス networkdriverservice: ネットワークサービス storagedriverservice: ストレージサービス + settingsPage: header: 設定 + stacksPage: header: all: 全てのスタック @@ -872,6 +903,10 @@ stacksPage: header: スタックを追加 composeLabel: 'オプション: Compose をインポート' form: + name: + placeholder: '例: myapp' + description: + placeholder: '例: MyApp Stack' dockerCompose: label: 'オプション: docker-compose.yml' placeholder: docker-compose.yml の内容 @@ -880,6 +915,7 @@ stacksPage: placeholder: rancher-compose.yml の内容 startOnCreate: label: 作成後にサービスを開始 + storagePoolsPage: header: ストレージドライバー volume: ボリューム ID @@ -894,6 +930,7 @@ storagePoolsPage: form: driverOptions: ドライバーオプション addActionLabel: オプションを追加 + swarmPage: projects: index: @@ -929,6 +966,7 @@ swarmPage: containers: コンテナ body: noData: まだサービスはありません + processesPage: header: プロセス tab: @@ -964,6 +1002,7 @@ processesPage: runAfter: 実開始時間 noData: '{which} のプロセスはありません' noMatch: 検索条件に一致するプロセスがありません + virtualMachinePage: header: '仮想マシン:' multistat: @@ -974,12 +1013,14 @@ virtualMachinePage: description: '詳細情報:' navTabs: labels: ラベル + virtualMachinesPage: header: 仮想マシン linkTo: 仮想マシンを追加 table: body: noData: まだ仮想マシンはありません + waitingPage: hosts: header: | @@ -999,6 +1040,7 @@ waitingPage: mesos: Mesos をセットアップ swarm: Swarm をセットアップ kubernetes: Kubernetes をセットアップ + aliasServicePartial: serviceLinks: labelText: サービスリンク @@ -1006,6 +1048,7 @@ aliasServicePartial: links: リンク noLinks: リンクはありません description: '詳細情報:' + externalServicePartial: extService: labelText: 外部サービス @@ -1013,17 +1056,21 @@ externalServicePartial: ips: IP hostname: 'ホスト名:' description: '詳細情報:' + hostPartial: host: addCommon: quanity: 数 addOptions: labels: ラベル + ldap: providerName: openldap: OpenLDAP ad: Active Directory header: + editing: + label: Active Directory 設定を編集 enabled: label: "{providerName} は有効化されていません" required: | @@ -1060,6 +1107,7 @@ ldap: serviceAccount: "サービスアカウント:" searchBase: "サーチベース:" defaultDomain: "デフォルトドメイン:" + timeout: "コネクションタイムアウト:" users: header: ユーザー objectClass: "オブジェクトクラス:" @@ -1080,11 +1128,17 @@ ldap: pre: アクセスコントロールを無効化 post: "本当によろしいですか? アクセスコントロールを無効化する場合は再度クリックしてください" accessConfig: - header: "1. {providerName} サーバーを設定" + header: "{providerName} サーバーを設定" subtext1: "あなたの {providerName} サーバーに接続するため、アドレス、ポート、プロトコルを入力してください。通常は 389 番ポートが利用され、636はTLSに利用されます。" subtext2: "{appName} はユーザーがどのグループに所属しているか、いつ API キーでリクエストを発行したかなどを特定し、ログイン処理を実行するために全てのドメインに対して (read-only) アクセスが可能なサービスアカウントを必要とします。" + advanced: + open: 拡張設定を隠す + closed: 拡張設定を表示する hostName: labelText: ホスト名または IP アドレス + timeout: + labelText: コネクションタイムアウト + unit: ms port: labelText: ポート checkbox: TLS @@ -1092,14 +1146,20 @@ ldap: labelText: サービスアカウント ユーザー名 servicePassword: labelText: サービスアカウント パスワード - searchBase: - helpText: "ベース配下のユーザー、グループのみ利用されます" - labelText: サーチベース + userSearchBase: + labelText: ユーザーサーチベース + placeholder: "例: ou=Users,dc=mycompany,dc=com" + helpText: "ベース配下のユーザーのみ利用されます" + groupSearchBase: + labelText: グループサーチベース + placeholder: "例: ou=Groups,dc=mycompany,dc=com" + helpText: "ベース配下のグループのみ利用されます" defaultDomain: helpText: "一部を除き、ユーザーがログインする際このドメインが使用されます。" labelText: デフォルト ログインドメイン + placeholder: "例: mycompany" customizeSchema: - header: "2. スキーマのカスタマイズ" + header: "スキーマのカスタマイズ" helpText: "スキーマが標準的な ActiveDirectory フォーマットに一致しない場合、こちらでカスタマイズすることができます。" users: header: ユーザー @@ -1134,7 +1194,8 @@ ldap: labelText: グループ DN フィールド placeholder: 識別名 testAuth: - header: "3. テストのうえ認証を有効化する" + header: "テストのうえ認証を有効化する" + editingHeader: "テストのうえ新しい設定を保存します" helpText: "あなたの {providerName} アカウントで認証テストを行うことで全てが正常に設定されたことを確認します:" userName: labelText: ユーザー名 @@ -1143,11 +1204,14 @@ ldap: authenticate: pre: 認証 post: "テスト中..." + test: テストの上保存 + servicePartial: noContainers: label: まだコンテナはありません inactive: start: 開始 + serviceInfoPartial: info: label: 情報 @@ -1165,8 +1229,10 @@ serviceInfoPartial: links: リンク noLinks: リンクはありません fqdn: 'FQDN:' + advancedSection: hrText: 拡張オプション + catalogSettings: header: カタログ subtext: カタログはユーザーが少ない質問に回答するだけで簡単にアプリケーションをデプロイするための rancher-compose のテンプレートを含みます @@ -1192,15 +1258,21 @@ catalogSettings: label: 名前 url: label: URL + kind: + label: 種類 + native: ネイティブ + helm: Helm branch: label: ブランチ placeholder: '例: master' + confirmDelete: title: '本当に削除してもよろしいですか?' environmentNote: 'Note: {appName} によって作成されたホストなどこの環境内の全てのリソースは完全に削除されます。' protip: 'ProTip: この確認画面を飛ばす場合は削除ボタンのクリック時に {key} キーを長押ししてください。' confirmAction: 削除 cancelAction: キャンセル + containerLogs: title: 'ログ: {instanceName}' onlyCombined: "Note: このコンテナでは TTY (-t) フラグが有効なため、標準出力/標準エラー出力が結合されたログのみが利用可能です。" @@ -1217,6 +1289,7 @@ containerLogs: connected: 接続完了 disconnected: 切断 closed: 閉じる + containerShell: protip: 'ProTip: 新しいウィンドウで起動する場合はシェルアクセスを開く際に {key} を長押ししてください。' status: @@ -1226,30 +1299,36 @@ containerShell: connected: 接続完了 disconnected: 切断 closed: 閉じる + copyToClipboard: tooltip: クリップボードにコピー copied: コピーしました! + dangerZone: header: 拡張設定 subtext: "注意して進めてください; 通常、ユーザーはこの設定を変更する必要はありません。間違った値を入力すると {appName} のインストレーションに問題が生じることがあります。変更のあった部分は太字で表示されます。" showLabel: 私は拡張設定を変更することで問題が生じる可能性があると理解しています。 + devicePermissions: all: 全て none: None read: 読み込み write: 書き込み mknod: Mknod + editAccount: title: アカウントを編集 form: name: label: 名前 + placeholder: '例: John Smith' kind: label: アカウントタイプ user: ユーザー admin: 管理者 description: label: 詳細情報 + placeholder: '例: このアカウントは John Smith 向けアカウントです' publicValue: label: ログイン ユーザー名 oldPassword: @@ -1260,8 +1339,10 @@ editAccount: label: 新しいパスワード(確認用) identity: label: ID + editAliasService: title: サービスのエイリアスを編集 + editApiKey: title: justCreated: API Key は作成されました @@ -1272,10 +1353,11 @@ editApiKey: secretValue: label: 秘密キー (パスワード) description: - placeholder: e.g. このキーはアプリケーションサーバーでコンテナをデプロイするのに使われます + placeholder: "例: このキーはアプリケーションサーバーでコンテナをデプロイするのに使われます" saveWarning1: 上記のキーを保存してください! 以降、秘密キーは参照できません。 saveWarning2: もしキーを無くしてしまった場合、新しい API キーを作成する必要があります。 noteOptional: 名前と詳細情報は何のために利用されるかを示すためのオプションです。 作成をクリックすることで単純に作成することもできます。 + editBalancerService: title: ロードバランサーを編集 haproxy: @@ -1289,17 +1371,27 @@ editBalancerService: defaults: label: 'defaults セクション' prompt: カスタム defaults セクション行 + editCertificate: title: 証明書を編集 + name: + placeholder: '例: mydomain.com' + description: + placeholder: '例: mydomain.com の EV 証明書' noteKeyWriteOnly: 'Note: プライベートキーは書き込み専用のためあえて空にしています。証明書を更新するには変更が無かったとしても再度プライベートキーを入力する必要があります。' + editContainer: title: vm: VM を編集 container: コンテナを編集 + editExternalService: title: 外部サービスを編集 name: - placeholder: 例えば外部の db + placeholder: '例: external-db' + description: + placeholder: '例: 外部の物理 DB サーバー' + editHost: title: ホストを編集 hostname: @@ -1317,6 +1409,11 @@ editHost: valueLabel: IP アドレス addActionLabel: IP アドレスを追加 help: 入力された場合、スケジューラが与えられたパブリック IP アドレス群から対象を選択し公開ポートをバインドします。 + requireAny: + label: 必要となるコンテナラベル + help: 指定した場合、このホストに適切にスケジューリングされるようコンテナは1つまたは複数のラベルを設定する必要があります。値を空のままにした場合一致するキーの有無に関わらずコンテナはスケジュールされます。システムコンテナをこのホストにスケジューリングするにはio.rancher.container.system が必要となります。 + addActionLabel: 必要となるラベルを追加 + editProjectTemplate: title: add: テンプレートを追加 @@ -1332,6 +1429,7 @@ editProjectTemplate: conflict: 競合 enabling: "選択されたバージョンの {tplCategory} スタック \"{stackName}\" は {orchestration} オーケストレーションをサポートしていません。" changing: "現在有効な {tplCategory} スタック \"{stackName}\" は {orchestration} オーケストレーションをサポートしていません。" + editRegistry: title: レジストリを編集 address: @@ -1342,17 +1440,28 @@ editRegistry: label: ユーザー名 password: label: パスワード + editService: title: サービスを編集 + editStack: title: スタックを編集 name: label: 名前 + placeholder: '例: myapp' description: label: 詳細情報 + placeholder: '例: MyApp Stack' group: label: タグ + placeholder: '例: frontend, production' help: スタックのリストはタグ(カンマ区切り) によりフィルターできます + +envCatalog: + header: カタログを管理 + subtext: ここから独自のカスタムされたカタログソースを定義できます。ここから追加されたカタログは対象の環境下でのみ利用できます。各カタログはユニークな名前と git clone 可能な URL が必要となります。(詳細は docs を参照してください)。 + addActionLabel: カタログを追加 + stackHeader: backLink: "スタック:" outputs: 出力 @@ -1362,9 +1471,11 @@ stackHeader: external: 外部サービスを追加 alias: サービスのエイリアスを追加 vm: 仮想マシンを追加 + formatIp: noIp: None unknownIp: 不明 + formBalancerRules: label: ポートルール noRules: ルールはありません @@ -1384,12 +1495,16 @@ formBalancerRules: placeholder: '例: 80' path: label: パス + placeholder: '例: /foo' hostname: label: リクエストホスト + placeholder: '例: example.com' backendName: label: バックエンド + placeholder: '例: webapp' targetPort: label: ポート + placeholder: '例: 80' priority: label: 優先度 moveUp: 上に移動 @@ -1398,19 +1513,25 @@ formBalancerRules: label: サービス selector: label: セレクタ + placeholder: '例: foo=bar' help: prefix: "ホストとパスルールは上位から下位への順番でマッチングが評価されます。バックエンドはデフォルトでランダム名が利用され、生成されるバックエンドをカスタマイズするには名前を入力しカスタマイズされた haproxy.cfg を参照してください。" showBackendLink: "カスタムバックエンド名を見る" showIpLink: "ホストの IP アドレスのオプションを表示します。" + formCommand: command: label: コマンド + placeholder: '例: /usr/sbin/httpd -f httpd.conf' entryPoint: label: エントリーポイント + placeholder: '例: /bin/sh' workingDir: label: ワーキングディレクトリ + placeholder: '例: /myapp' user: label: ユーザー + placeholder: '例: apche' console: label: コンソール both: 'インタラクティブ & TTY (-i -t)' @@ -1435,6 +1556,7 @@ formCommand: addAction: 環境変数を追加 keyLabel: 変数 valueLabel: 値 + formContainerLinks: label: リンク addActionLabel: リンクを追加 @@ -1445,6 +1567,7 @@ formContainerLinks: prompt: コンテナを選択してください... name: label: リンク名 + formDisks: addDiskLabel: ディスクを追加 addRootDiskLabel: ルートディスクを追加 @@ -1460,6 +1583,7 @@ formDisks: label: 書き込み IOPS driver: label: ドライバー + formEngineOpts: engineInstallUrl: label: Docker インストール URL @@ -1486,6 +1610,7 @@ formEngineOpts: label: レジストリミラー addActionLabel: レジストリミラーを追加 valueLabel: ミラー URL + formHealthCheck: label: タイプ checkType: @@ -1497,7 +1622,7 @@ formHealthCheck: method: prompt: "HTTP メソッドを選択:" path: - placeholder: リクエストパス e.g. /healthcheck + placeholder: 'リクエストパス 例: /healthcheck' version: prompt: "HTTP バージョンを選択:" host: @@ -1532,6 +1657,7 @@ formHealthCheck: =1 {コンテナは} other {コンテナは} } 正常です + formKeyValue: addAction: ペアを追加 key: @@ -1542,12 +1668,17 @@ formKeyValue: label: 値 placeholder: 値 protip: 'ProTip: 簡単に入力するには1行以上の key=value ペアをペーストしてください。' + formImage: label: イメージを選択 vm: + placeholder: '例: rancher/vm-ubuntu' dropdownLabel: "{appName} イメージ" + container: + placeholder: '例: ubuntu:trusty' pullImage: label: 常に作成前にイメージを取得する + formNameDescription: name: label: 名前 @@ -1555,6 +1686,7 @@ formNameDescription: description: label: 詳細情報 placeholder: 詳細情報 + formNetwork: links: table: @@ -1576,6 +1708,7 @@ formNetwork: label: コンテナ requestedIp: label: リクエストされた IP + placeholder: '例: 10.42.2.24' help: 10.42.0.0/16 ブロックから特定の IP を指定します。既に利用されている場合ランダムな IP が割り当てられます。 retainIp: label: 保有 IP @@ -1585,25 +1718,33 @@ formNetwork: enable: '{appName} DNS サービスディスカバリを有効化する' hostname: label: ホスト名 + placeholder: '例: web' dockerId: Docker コンテナ ID を使う containerName: コンテナ名を使う custom: 特定のホスト名を設定 domainName: label: ドメイン名 + placeholder: '例: example.com' resolvingServers: label: DNS サーバー addActionLabel: サーバーを追加 + placeholder: '例: 8.8.4.4' searchDomains: label: サーチドメイン + placeholder: '例: prod.example.com' addActionLabel: ドメインを追加 + formPorts: addAction: ポートマップ bindAddress: label: パブリックホスト IP (オプション) + placeholder: '例: 1.2.3.4; デフォルト: any' public: label: パブリックホスト ポート + placeholder: '例: 80' private: label: プライベートコンテナポート + placeholder: '例: 8080' protocol: label: プロトコル noPorts: このコンテナにはポートマップがありません @@ -1613,6 +1754,7 @@ formPorts: mixedIpPort: "ポート {ip}:{port}/{proto} は、1 つ以上のマッピングを保持しています。" mixedPort: "ポート {port}/{proto} は、1 つ以上のマッピングを保持しています。" showIpLink: ホストの IP アドレスフィールドを表示 + formScale: label: スケール global: @@ -1631,10 +1773,11 @@ formScale: =1 {1 コンテナ} other {# コンテナ} } として起動 + formScheduling: canRequestHost: vm: 全て の仮想マシンを特定ホスト上で起動する - containers: all のコンテナを特定ホスト上で起動する + containers: 全て のコンテナを特定ホスト上で起動する runSpecific: 特定のホスト上で起動 noRules: スケジューリングルールはありません autoRun: "スケジューリングルールにマッチした全てのホスト上で自動的に起動:" @@ -1647,10 +1790,14 @@ formScheduling: field: フィールド key: キー value: 値 + formSecrets: label: シークレット noData: シークレットはありません addLabel: シークレットを追加 + name: + label: 名前 + placeholder: '例: db_password' secret: label: シークレット uid: @@ -1662,11 +1809,14 @@ formSecrets: help: prefix: "シークレットはコンテナの /run/secrets/ 内にある指定されたファイル名で利用できます。" showPermissionsLink: "ファイルの所有権 & 権限のカスタマイズ" + formSecurity: key: キー value: 値 logConfig: addActionLabel: オプションを追加 + keyPlaceholder: '例: syslog-facility' + valuePlaceholder: '例: daemon' privileged: label: 特権モード checkbox: ホストへのフルアクセスを許可する @@ -1684,6 +1834,7 @@ formSecurity: placeholder2: 無制限 cpuPinning: label: CPU ピンニング + placeholder: '例: 0,3; デフォルト: All' shares: label: 共有 placeholder: '例: 1024' @@ -1699,10 +1850,13 @@ formSecurity: addActionLabel: バインディングを追加 pathHost: label: ホスト上のパス + placeholder: '例: /dev/sdc' pathContainer: label: コンテナ上のパス + placeholder: '例: /dev/xsdc' permissions: label: 権限 + placeholder: '例: 0,3; デフォルト: All' logDriver: label: ログドライバー placeholder: '例: syslog' @@ -1716,6 +1870,7 @@ formSecurity: label: 分離 default: デフォルト(コンテナ) hyperv: HyperV (VM) + formServiceLinks: addAction: サービスリンク noServices: リンクする他のサービスはありません。 @@ -1724,6 +1879,8 @@ formServiceLinks: label: 対象サービス name: label: 名前 + placeholder: '例: database' + formSslTermination: defaultCertificate: prompt: 証明書を選択してください... @@ -1737,6 +1894,7 @@ formSslTermination: helpBlock: | "Note: いくつかの古い SSL/TLS クライアントは Server Name Indication (SNI) をサポートされていません; これらのクライアントでは常にメイン証明書の提示を求められますが比較的新しいクライアントは一致するものが見つかると代替証明書のリストから適切な証明書を求めてきます。" notNeeded: SSL/TLS ポートは設定されていません + formStickiness: stickiness: スティッキー none: None @@ -1749,11 +1907,13 @@ formStickiness: sendHeader: no-cache ヘッダーを送信 onPost: POST にのみ cookie を設定 noPorts: HTTP ポートルールは設定されていません + formTarget: target: 対象 pointAddress: IP アドレスを指定 pointHostname: ホスト名を指定 addTarget: 対象 IP を追加 + formTargets: title: 対象 addAction: サービスを追加 @@ -1777,17 +1937,22 @@ formTargets: 一致したリクエストは対象サービスの対象ポートに対して送信されます。 設定されていない場合、デフォルトの対象ポートが元ポートに使用されます。それも設定されていない場合は元ポートが使用されます。 noHostnames: "(ホスト名でバランシングできません)" + formUserData: - placeholder: "e.g. コンテナ用設定情報" - isVmPlaceholder: "e.g. 仮想マシン用設定情報" + placeholder: "例: コンテナ用設定情報" + isVmPlaceholder: "例: 仮想マシン用設定情報" + formUserLabels: addAction: ラベルを追加 key: label: キー + placeholder: '例: foo' separator: "=" value: label: 値 + placeholder: '例: bar' protip: 'ProTip: 簡単に入力するには1行以上の key=value ペアをペースト>してください。' + formUpgrade: size: バッチサイズ interval: バッチ間隔 @@ -1795,14 +1960,17 @@ formUpgrade: behavior: 開始の挙動 startStop: 停止前に起動 whichServices: サービス + formValueArray: addActionLabel: 値を追加 valueLabel: 値 valuePlacholder: 値 protip: 'ProTip: 簡単に入力するには1行以上の値をペーストしてください。' + formVirtualMachines: vcpus: vCPUs memory: メモリ + formVolumes: value: prompt: コンテナを選択してください... @@ -1810,12 +1978,14 @@ formVolumes: volumesFrom: 他コンテナのボリューム volumeDriver: label: ボリュームドライバー + placeholder: '例: rancher-nfs' noLaunchConfigs: このサービスにはボリュームを共有するための起動設定がありません。 noHostContainers: このホストには他コンテナのボリュームを利用するためのコンテナがありません。 onlySingleHost: 特定ホストにコンテナを追加した場合のみ利用できます addActionLabel: ボリュームを追加 errors: invalidName: ボリューム名は、文字、数字、ハイフン、アンダー スコア、およびドットのみ含めることができます。 + heroAddService: infra: header: インフラストラクチャ スタックを追加 @@ -1830,17 +2000,24 @@ heroAddService: addService: サービスを定義する addCatalog: 設定 linkToCatalog: カタログを参照 + hookPage: + receiver: + header: レシーバー フック + buttonText: レシーバーを追加 + content: "レシーバー フックでは、{appName} の内部アクションをトリガーするための URL が提供されます。" + noData: レシーバー フックはありません scaleService: label: サービスを拡張 detailPrefix: "{action} を拡張" detailLink: "{displayService}" detailSuffix: "by {amount}" - receiver: - header: レシーバー フック - buttonText: レシーバーを追加 - content: "レシーバー フックでは、{appName} の内部アクションをトリガーするための URL が提供されます。" - noData: レシーバーフックはありません + scaleHost: + label: ホスト数を拡張 + detail: "Matching {labels} {action} by {amount}" + serviceUpgrade: + label: サービスをアップグレード + detail: "Matching {labels} when {tag} changes" fields: kind: label: 種類 @@ -1848,6 +2025,7 @@ hookPage: label: 詳細 url: label: トリガー URL + hostSettings: header: ホスト登録 URL subtext: '{appName} API に接続するための URL は何にしますか?' @@ -1866,6 +2044,7 @@ hostSettings: badTld: alert: | トップレベルドメインである .local はRFC6742 でマルチキャスト DNS 向けに予約されています。そのため登録 URL に利用することは推奨されず、利用した場合 DNS 上の問題が発生する可能性があります。他のホスト名または IP を指定してください。 + hostPod: supportState: unsupported: サポートされていない Docker バージョン @@ -1874,8 +2053,10 @@ hostPod: namespace: '名前空間:' stack: 'スタック:' standalone: 独立型コンテナ + identityBlock: loading: 読込中... + infoMultiStats: connecting: 接続中... utilizationStats: 利用率の統計はアクティブ/起動中の場合のみ利用できます。 @@ -1894,6 +2075,7 @@ infoMultiStats: labelText: ストレージ read: 読み込み write: 書き込み + inputCertificate: key: label: プライベートキー @@ -1907,6 +2089,7 @@ inputCertificate: metaXML: label: メタデータ XML placeholder: "IDP メタデータ XML でペースト" + inputIdentity: placeholder: github: GitHub ユーザーまたは組織名を追加 @@ -1914,10 +2097,13 @@ inputIdentity: dropdownLabel: teams: あなたのチームと組織 groups: あなたのグループ + inputPassword: buttonText: 生成 + inputTextFile: tooltip: ファイルから読み込む + k8s: containerSection: name: コンテナ名 @@ -1987,6 +2173,7 @@ k8s: nodePorts: ノードポート selectors: セレクター noData: サービスはありません + lbAddtlInfo: info: 情報 viewDetails: 詳細を見る @@ -2000,20 +2187,25 @@ lbAddtlInfo: ports: ポート noPorts: パブリックホストのポートはありません targets: ターゲット + labelsSection: kind: 種類 key: キー value: 値 noData: ラベルはありません + loginShibboleth: buttonText: シボレスで認証 + loginGithub: buttonText: GitHub で認証 + loginUserPass: userLabel: ユーザー名 loginLabel: ログイン loggingInLabel: ログイン中... passwordLabel: パスワード + machine: driverAmazon: accessSection: アカウントアクセス @@ -2118,7 +2310,7 @@ machine: placeholder: 可用性セット名 openPort: label: 解放するポート - placeholder: 'カンマ区切り, e.g. 80,443' + placeholder: 'カンマ区切り, 例: 80,443' privateIpAddress: label: プライベート IP placeholder: 127.0.0.1 @@ -2346,7 +2538,7 @@ machine: label: Aliyun SLB ID placeholder: Aliyun SLB ID storageSection: ストレージ情報 - isOptimized: + ioOptimized: label: インスタンスストレージ I/O の最適化 placeholder: none or optimized systemDiskCategory: @@ -2385,6 +2577,7 @@ machine: sshPassword: label: SSH のパスワード placeholder: インスタンスの SSH パスワードを設定してください。自動設定するには空白を指定してください。 + modalAboutComponent: component: コンポーネント version: バージョン @@ -2394,10 +2587,12 @@ modalAboutComponent: compose: Compose machineService: Machine Service close: 閉じる + modalAuditlogInfo: header: 追加のログ情報 request: "リクエストオブジェクト:" response: "レスポンスオブジェクト:" + modalContainerStop: uom: 秒 header: "本当に停止してもよろしいですか?" @@ -2406,6 +2601,7 @@ modalContainerStop: label: タイムアウト placeholder: '10' button: 停止 + modalConfirmDeactivate: header: 本当にこの処理を行ってよろしいですか? protip: 'ProTip: この確認画面を飛ばす場合は {isServiceButton} クリック時に {key} キーを長押ししてください。' @@ -2420,12 +2616,14 @@ modalConfirmDeactivate: default: message: 非アクティブ化 button: 非アクティブ化 + modalEditBackup: edit: バックアップを編集 create: バックアップを作成 nameLabel: バックアップ名 backupTarget: バックアップ対象 backupTargetPlaceholder: 'バックアップ対象を選択してください...' + modalEditDriver: header: create: マシンドライバーを追加 @@ -2440,6 +2638,7 @@ modalEditDriver: checksum: label: チェックサム help: 'オプション: 期待されたチェックサムかどうかダウンロードされたマシンドライバーの整合性を確認します。' + modalEditSetting: title: 拡張設定を編集 name: @@ -2448,30 +2647,38 @@ modalEditSetting: label: 値 reset: label: ディフォルトにリセット + modalEditSnapshot: edit: スナップショットを編集 create: スナップショットを作成 nameLabel: スナップショット名 + modalFeedback: header: '{appName} へようこそ!' subtitle: "開始する前にあなたのことについて少し教えてください..." send: はじめに + modalProcessError: header: 例外情報 cause: "理由:" stackTrace: "スタックトレース:" close: 閉じる + modalRollbackVolume: title: snapshot: スナップショットへのロールバック backup: バックアップへのロールバック + modalShell: title: 'シェル: {instanceName}' + modalWelcome: header: '{appName} へようこそ!' closeModal: 完了! + newAliasService: header: サービスのエイリアスを追加 + newBalancer: header: add: ロードバランサーを追加 @@ -2495,6 +2702,7 @@ newBalancer: mixedPort: "ポート {num} はアクセスするプロトコルが競合する複数のルールを持っています" noTarget: "各ルールには対象が必要です" needsCertificate: "SSL/TLS ポートルールであるため証明書が必要です" + newCatalog: version: prompt: バージョンを選択してください... @@ -2524,6 +2732,7 @@ newCatalog: preview: プレビュー txt: answers.txt noConfig: このテンプレートには設定オプションがありません + newContainer: add: container: コンテナを追加 @@ -2557,36 +2766,76 @@ newContainer: saveUpgrade: アップグレード saveNew: 作成 removeSidekick: このサイドキックを削除 + name: + placeholder: "例: myapp" + description: + placeholder: "例: My Application" emptyPrimaryService: "(基本サービス)" emptySidekick: "(サイドキック #{num})" addSidekickContainer: サイドキックコンテナを追加 addSidekickVm: サイドキック VM を追加 + newExternalService: header: 外部サービスを追加 alert: 'Note: 外部サービスがロードバランサーのターゲットである場合にのみ利用されます。' + newReceiver: title: edit: レシーバーを編集 add: レシーバーを追加 + name: + placeholder: '例: scale-web' driver: label: 種類 action: label: アクション + up: スケールアップ + down: スケールダウン + batchSize: + label: アップグレード バッチサイズ + deleteOption: + label: どのホストをスケールダウン, 削除するか + mostRecent: 直近で作成されたホスト + leastRecent: 最も古いホスト + hostSelector: + label: ホストセレクター + addActionLabel: セレクターラベルを追加 + help: + up: 指定したラベルに一致したホストが新しく展開されるホストのテンプレートとして利用されます + down: 指定したラベルに一致したホストがスケールダウン時に削除される候補になります + image: + label: Docker イメージ名 service: label: 対象サービス + serviceSelector: + label: サービスセレクター + addActionLabel: セレクターラベルを追加 + help: 指定したラベルに一致したサービスがアップグレードされます amount: - label: Scale up/down 単位 + label: スケールアップ/ダウン 単位 min: label: 最小スケール + placeholder: '例: 1' max: label: 最大スケール + placeholder: '例: 20' + tag: + label: イメージタグ + placeholder: '例: latest' + help: 指定したタグでレジストリにプシュされた場合にサービスはアップグレードされます + newSecret: title: edit: シークレットを編集 add: シークレットを追加 + name: + placeholder: '例: api-token' + description: + placeholder: '例: API 用シークレットトークン' value: label: シークレットの値 placeholder: シークレットの値 + pageFooter: notARelease: (未リリース) help: ヘルプ @@ -2597,33 +2846,39 @@ pageFooter: slack: Slack download: link: CLI をダウンロード - headerCli: Rancher CLI (beta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows linux: Linux + pagination: multi: | {pages, plural, =0 {0 項目} =1 {{count} {count, select, =1 {項目} other {項目}}} other {{from} - {to} of {count}}} + pageHeaderEnvironment: namespace: 名前空間 + projectRow: none: 詳細情報はありません orchestration: オーケストレーション + projectUpgrade: header: 環境をアップグレード detail: "{appName} {appVersion} には、既存のシステムサービスやロードバランサーコンテナをアップグレードする必要がある変更が含まれています。" notOwner: "この環境のオーナーまたは管理者だけがアップグレードを実行できます。" actionButton: 今すぐアップグレード banner: 環境をアップグレード中... + registryRow: address: アドレス email: Email username: ユーザー名 created: 作成日 + reservationParameters: label: リソース制限 localStorage: @@ -2635,12 +2890,14 @@ reservationParameters: milliCpu: labelText: CPU unit: 'mCPU' + saveCancel: saving: 保存中... saved: 完了! edit: 保存 create: 作成 cancel: キャンセル + schema: inputBoolean: "y": "はい" @@ -2653,6 +2910,7 @@ schema: prompt: サービスを選択してください... inputSecret: prompt: シークレットを選択してください... + schedulingRuleRow: theHost: ホスト must: must @@ -2665,6 +2923,7 @@ schedulingRuleRow: containerLabel: ラベル付きコンテナ serviceName: 名前付きサービス containerName: 名前付きコンテナ + serviceLink: withAlias: sameStack: "{service} を {alias} とする" @@ -2672,6 +2931,7 @@ serviceLink: noAlias: sameStack: "{service}" differentStack: "{stack}/{service}" + sidekickAddtlInfo: info: 情報 image: イメージ @@ -2681,6 +2941,7 @@ sidekickAddtlInfo: noContainers: コンテナはありません labels: ラベル noLabels: ラベルはありません + siteAccess: header: サイトアクセス helpText: "誰がログインし {appName} を利用できるか設定してください" @@ -2692,8 +2953,10 @@ siteAccess: users: ユーザー groups: グループ organizations: 組織 + snapshotTimeline: noData: スナップショットデータはありません + stackSection: outputs: 出力 description: 詳細情報 @@ -2711,8 +2974,8 @@ stackSection: } sidekick: | {numSidekicks, plural, - =1 {サイドキック} - other {サイドキック} + =1 {+ 1 サイドキック} + other {+ # サイドキック} } add: service: サービスを追加 @@ -2729,9 +2992,11 @@ stackSection: containers: コンテナ actions: アクション upgradeImage: コンテナイメージをアップグレード + snapshotSection: none: バックアップされていません multiple: '複数: {latestDate}' + storagePoolSection: outputs: 出力 readOnly: "(read-only)" @@ -2750,8 +3015,10 @@ storagePoolSection: snapshotName: 'スナップショット名' backedUp: 'バックアップ済み' mounts: 'マウント(コンテナ:パス)' + svgServiceContainer: sidekicks: サイドキック + swarm: containerSection: state: 状態 @@ -2764,6 +3031,7 @@ swarm: ports: ポート containers: コンテナ none: サービスはありません + telemetryOpt: header: 統計情報 subtext: | @@ -2771,13 +3039,16 @@ telemetryOpt: learnMore: label: 詳細を見る label: 匿名の統計情報の収集を許可する + tooltipLink: list: リスト linkGraph: リンクグラフ composeYaml: Compose YAML + tooltipWarning: notConfigured: アクセスコントロールは設定されていません dismiss: 表示しない + upgradeBtn: version: current: '現行' @@ -2791,10 +3062,12 @@ upgradeBtn: notfound: 'テンプレートバージョンが見つかりません' error: 'アップグレードのチェックに失敗しました' required: 'アップグレードが必要です' + viewEditDescription: form: description: - placeholder: e.g. 開発者向けテスト用環境 + placeholder: '例: 開発者向けテスト用環境' + viewEditProject: showEdit: edit: "環境を編集:" @@ -2825,34 +3098,41 @@ vmConsole: footerActions: buttonSend: Ctrl-Alt-Delete を送る buttonCancel: 閉じる + waitKubernetes: addHost: '1台のホストを追加しています' activateHost: 'ホストがアクティブになるのを待っています' createStack: 'Kubernetes のシステムスタックを作成中' startServices: 'サービスを起動中' waitApi: 'Kubernetes API を待っています' + waitMesos: addHost: '3台のホストを追加しています' activateHost: 'ホストがアクティブになるのを待っています' createStack: 'Mesos のシステムスタックを作成中' startServices: 'サービスを起動中' waitApi: 'Mesos マスターを待っています' + waitSwarm: addHost: '1台のホストを追加しています' activateHost: 'ホストがアクティブになるのを待っています' createStack: 'Swarm のシステムスタックを作成中' startServices: 'サービスを起動中' + containerChoices: hostGroup: 'ホスト: {name}' hostGroupWithState: 'ホスト: {name} ({state})' unknownHost: 'ホスト: ???' containerOption: "{name}" containerOptionWithState: "{name} ({state})" + driver: multiHostNames: "ホストは {first} — {last} と命名されます" + allServices: stackGroup: 'スタック: {name}' noName: '(スタック: {id})' + nav: srToggleNav: ナビゲーションを切り替え srToggleDropdown: ドロップダウンを切り替え @@ -2928,6 +3208,7 @@ nav: noHostsWindows: prefix: "最初のサービスまたはコンテナを起動する前に Windows ホストが必要となります。" link: "ホストを追加" + action: activate: アクティブ化 backup: スナップショットをバックアップ @@ -2938,6 +3219,7 @@ action: console: コンソールを開く deactivate: 非アクティブ化 edit: 編集 + evacuate: 退避 execute: シェルを実行 exportConfig: 設定をエクスポート finishUpgrade: アップグレードを完了 @@ -2966,6 +3248,7 @@ action: viewGraph: グラフを見る viewInApi: API を見る viewInstance: インスタンスを見る + model: account: kind: diff --git a/translations/ru-ru.yaml b/translations/ru-ru.yaml index c07c7c0ed7..aa524ea3c7 100644 --- a/translations/ru-ru.yaml +++ b/translations/ru-ru.yaml @@ -2040,7 +2040,7 @@ pageFooter: forums: Форум download: link: Скачать CLI - headerCli: Rancher CLI (beta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows diff --git a/translations/uk-ua.yaml b/translations/uk-ua.yaml index 3807d5f770..e3d36c358e 100644 --- a/translations/uk-ua.yaml +++ b/translations/uk-ua.yaml @@ -2425,7 +2425,7 @@ pageFooter: slack: Slack download: link: Скачати CLI - headerCli: Rancher CLI (бета-версія) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: macOS windows: Windows diff --git a/translations/zh-hans.yaml b/translations/zh-hans.yaml index 82bed0c3c5..f9a61abc2a 100644 --- a/translations/zh-hans.yaml +++ b/translations/zh-hans.yaml @@ -3,18 +3,18 @@ languageContribute: "帮助翻译Rancher" ############################## # Really generic things used in multiple places (use sparingly) -############################## +############################## generic: actions: 操作 activate: 激活 - any: 任何 + any: 任何 as: 以 cancel: 取消 closeModal: 关闭 created: 创建 default: 默认 description: 描述 - disable: 停用 + disable: 停用 disabled: 已停用 domainName: 域名 emptyString: "" @@ -22,15 +22,15 @@ generic: enabled: 已启用 expires: 过期 healthy: 健康 - id: ID + id: ID image: 镜像 internal: 内部 ipAddress: IP地址 - limit: 限制 + limit: 限制 loading: "加载中..." - missing: "*%MISSING%*" + missing: "*%MISSING%*" moreActions: 更多操作 - na: 'n/a' + na: 'n/a' name: 名称 none: 无 ports: 端口 @@ -62,7 +62,7 @@ accountsPage: localLink: 添加账号 table: state: 状态 - id: ID + id: ID kind: 类型 username: 用户名 name: 名称 @@ -82,7 +82,7 @@ accountsPage: placeholder: "例如:John Smith" type: labelText: 账号类型 - dropdownList: 下拉列表 + dropdownList: 下拉列表 description: labelText: 描述 placeholder: "例如:这是John Smith的账号" @@ -97,7 +97,7 @@ apiPage: state: 状态 name: 名称 description: 描述 - publicValue: 访问秘钥 + publicValue: 访问秘钥 created: 已创建 noData: 此环境还没有创建API Keys noName: 无 @@ -119,7 +119,7 @@ auditLogsPage: resourceType: placeholder: "资源类型:" dropdownPlaceholder: '选择一种资源类型:' - dropdownList: 下拉列表 + dropdownList: 下拉列表 resourceId: placeholder: 资源ID requestIp: @@ -127,7 +127,7 @@ auditLogsPage: authType: placeholder: "认证类型:" dropdownPlaceholder: '选择认证类型:' - dropdownList: 下拉列表 + dropdownList: 下拉列表 clearButtonText: 全部清除 searchButtonText: 搜索 table: @@ -170,7 +170,7 @@ authPage: authenticated: header: text: 验证 - helpText: "要修改设置的Shibboleth应用，请在下方禁用访问控制后重新设置。" + helpText: "要修改设置的Shibboleth应用，请在下方禁用访问控制后重新设置。" disableAccess: header: "危险区域™" warning: '警告: 禁用访问控制将导致任何能够访问此页面或API的用户拥有对 {appName} 的完全控制权限。' @@ -201,11 +201,11 @@ authPage: providerName: - shibboleth: Shibboleth + shibboleth: Shibboleth root: header: 访问控制 github: - standard: GitHub + standard: GitHub enterprise: GitHub企业版 header: enabled: @@ -374,7 +374,7 @@ backupTargetsPage: catalogPage: index: header: '应用商店' - manage: 管理 + manage: 管理 search: placeholder: 搜索.... category: "分类:" @@ -384,14 +384,14 @@ catalogPage: partner: 官方 pl: rancher: Core - partner: 官方 + partner: 官方 noData: singular: 没有符合的应用模板 plural: 当前目录下没有符合的应用模板 action: launch: 查看详情 notCompatible: 不兼容 - alreadyDeployed: 已部署 + alreadyDeployed: 已部署 consolePage: header: '命令行:' closeButton: 关闭 @@ -438,7 +438,7 @@ containersPage: primaryHostUnknown: 未知 image: 镜像 stats: 统计 - sparkPrefixCpu: "CPU: " + sparkPrefixCpu: "CPU: " sparkPrefixMemory: '内存:' sparkPrefixNetwork: '网络:' sparkPrefixStorage: '存储:' @@ -457,7 +457,7 @@ containersPage: command: 命令 body: noData: 当前未创建任何容器。 - noMatch: 没有符合搜索条件的容器 + noMatch: 没有符合搜索条件的容器 new: form: name: @@ -470,6 +470,7 @@ containersPage: on: on in: 所属服务 infoMultiStats: + created: '创建于:' tooltip: host: 复制到剪贴板 host: '主机:' @@ -491,7 +492,7 @@ containersPage: networking: 网络 healthCheck: 健康检查 scheduling: 调度 - security: 安全 + security: 安全 portsTab: table: header: @@ -504,11 +505,11 @@ containersPage: volumesTab: table: header: - name: 名称 + name: 名称 mount: 挂载点 shared: 共享 writable: 可写 - snapshot: 快照时间线 + snapshot: 快照时间线 body: error: data: '错误:' @@ -523,7 +524,7 @@ dockerCLI: # If you change translations here also change the translation in app/utils/constants.js under the FALLBACK_TRANSLATIONS key # those are present incase we have an error in the app and can not load the translations file -# the error page will at least make a little sense +# the error page will at least make a little sense failWhalePage: header: 错误 reloadButton: | @@ -539,7 +540,7 @@ haPage: address: 主机地址 port: 端口 heartbeat: 活动时间 - clustered: 集群 + clustered: 集群 helpPage: header: 常用链接及信息 banner: 公告 @@ -594,18 +595,18 @@ helpPage: buttonText: 进入论坛 announcements: header: 公告 - buttonText: 查看更多公告信息 + buttonText: 查看更多公告信息 general: header: 综合 buttonText: 查看更多综合讨论 rancherOs: - header: RancherOS + header: RancherOS buttonText: 查看更多RancherOS讨论 rancher: - header: Rancher + header: Rancher buttonText: 查看更多Rancher讨论 convoy: - header: Convoy + header: Convoy buttonText: 查看更多Convoy讨论 commercial: header: 商业支持 @@ -637,7 +638,7 @@ hostsPage: linkTo: 添加容器 infoMultiStats: ip: 'IP:' - cpu: 'CPU:' + cpu: 'CPU:' memory: '内存:' storage: '存储:' provider: @@ -645,12 +646,12 @@ hostsPage: noHost: 自定义 kernel: '内核:' docker: 'Docker:' - os: '操作系统:' + os: '操作系统:' description: '描述:' milliCpu: labelText: mCPU localStorageMb: - labelText: 本地存储 + labelText: 本地存储 navTabs: containers: 容器 ports: 端口 @@ -694,7 +695,7 @@ k8sTab: header: Kubernetes命令行 stepOne: generateConfigText: | - '要在客户端使用 kubectl (v1.4+ 以上) , 单击以下按钮生成API Key和配置文件:' + '要在客户端使用 kubectl (v1.4+ 以上) , 单击以下按钮生成API Key和配置文件:' generateButton: 生成配置 stepTwo: progress: 生成中... @@ -716,8 +717,8 @@ loginPage: generic: "登录时遇到以下错误 ({errorCode})。请重试。" error: authFailed: 用户名或密码错误. - timedOut: 会话超时，请重新登录. - + timedOut: 会话超时，请重新登录. + machinePage: header: 主机驱动 inactive: 未激活 @@ -756,10 +757,10 @@ mesosPage: manage: header: 管理 content: 通过Mesos UI管理Mesos - button: Mesos UI + button: Mesos UI # If you change translations here also change the translation in app/utils/constants.js under the FALLBACK_TRANSLATIONS key # those are present in case we have an error in the app and can not load the translations file -# the error page will at least make a little sense +# the error page will at least make a little sense notFoundPage: header: "查看的页面不存在！" linkTo: 回到首页 @@ -770,12 +771,12 @@ projectList: subtext: |

{appName} 支持将资源分组归属到多个环境。 每个环境具有自己独立的基础架构资源及服务，并由一个或多个用户、团队或组织所管理。

例如，您可以创建独立的“开发”、“测试”及“生产”环境以确保环境之间的安全隔离，将“开发”环境的访问权限赋予全部人员，但限制“生产”环境的访问权限给一个小的团队。

- - alert: 当前没有活动环境。在进行其他操作前，需要先创建或激活一个环境。 + + alert: 当前没有活动环境。在进行其他操作前，需要先创建或激活一个环境。 table: header: orchestration: 编排 - projectTemplate: 模板 + projectTemplate: 模板 body: noData: "当前未创建任何环境" indexTemplate: @@ -789,7 +790,7 @@ projectList: stacks: 应用 isPublic: 公开 body: - noData: "当前没有任何环境模板" + noData: "当前没有任何环境模板" registriesPage: index: header: 镜像库 @@ -824,12 +825,12 @@ secretsPage: header: 密文 linkTo: 添加密文 noData: 当前未创建任何密文 - noMatch: 没有符合搜索条件的密文 + noMatch: 没有符合搜索条件的密文 servicePage: header: '服务:' multistat: type: '类型:' - fqdn: 'FQDN:' + fqdn: 'FQDN:' scale: '数量:' image: '镜像:' entryPoint: '入口:' @@ -846,7 +847,7 @@ servicePage: containers: 容器 labels: 标签 links: 链接 - log: 日志 + log: 日志 containersTab: table: header: @@ -861,7 +862,7 @@ servicePage: noData: 无链接 certsTab: default: 默认证书 - additional: 其他SNI证书 + additional: 其他SNI证书 new: form: name: @@ -875,7 +876,7 @@ servicePage: description: placeholder: '例如:MyApp最新版本' newBalancer: - upgradeImage: "负载均衡器镜像版本将由 {from} 升级到 {to}." + upgradeImage: "负载均衡器镜像版本将由 {from} 升级到 {to}." form: name: placeholder: '例如:website' @@ -907,18 +908,18 @@ servicePage: kubernetesservice: K8s服务 composeservice: Compose服务 networkdriverservice: 网络服务 - storagedriverservice: 存储服务 + storagedriverservice: 存储服务 settingsPage: - header: 设置 + header: 设置 stacksPage: header: all: 全部应用 user: 用户应用 custom: '{name} 应用' tags: '"{tags}" 应用' - infra: 基础设施应用 + infra: 基础设施应用 actionButton: 添加应用 - catalogButton: 从应用商店添加 + catalogButton: 从应用商店添加 sort: label: 排序 state: 状态 @@ -927,7 +928,7 @@ stacksPage: all: 全部标签 one: '标签: {name}' noInfra: You do not currently have any Infrastructure Stacks - noMatch: No Stacks match the selected tag + noMatch: No Stacks match the selected tag new: header: 添加应用 composeLabel: '可选:导入Compose' @@ -945,14 +946,14 @@ stacksPage: startOnCreate: label: 创建后启动服务 storagePoolsPage: - header: 存储驱动 + header: 存储驱动 volume: 卷ID orphaned: 孤立备份 nav: pools: 池 backups: 备份 index: - noData: 没有存储驱动 + noData: 没有存储驱动 newVolume: header: 添加卷 form: @@ -1033,7 +1034,7 @@ processesPage: runTime: 运行时间 runAfter: 延迟运行 noData: '当前没有进程数据' - noMatch: 没有符合搜索条件的进程 + noMatch: 没有符合搜索条件的进程 virtualMachinePage: header: '虚拟机:' multistat: @@ -1071,7 +1072,7 @@ waitingPage: kubernetes: 设置Kubernetes ############################## # Partials -############################## +############################## aliasServicePartial: serviceLinks: labelText: 服务链接 @@ -1083,7 +1084,7 @@ externalServicePartial: extService: labelText: 外部服务 linkTo: 查看详情 - ips: IPs + ips: IPs hostname: '主机名称:' description: '描述:' hostPartial: @@ -1099,7 +1100,7 @@ hostPartial: ldap: providerName: openldap: OpenLDAP - ad: 活动目录 + ad: 活动目录 header: enabled: label: "{providerName} 已启用" @@ -1163,11 +1164,14 @@ ldap: labelText: 主机名或IP地址 port: labelText: 端口 - checkbox: TLS + checkbox: TLS serviceUsername: labelText: 服务账号用户名 servicePassword: labelText: 服务账号密码 + timeout: + labelText: 连接超时 + unit: 毫秒 userSearchBase: labelText: '用户搜索起点:' placeholder: "例如: ou=Users,dc=mycompany,dc=com" @@ -1175,7 +1179,7 @@ ldap: groupSearchBase: labelText: '组搜索起点:' placeholder: "例如: ou=Groups,dc=mycompany,dc=com" - helpText: "设置后，会在此搜索起点下搜索组而不会在用户搜索起点下搜索组." + helpText: "设置后，会在此搜索起点下搜索组而不会在用户搜索起点下搜索组." defaultDomain: helpText: "当用户未指定登录域时使用该域" labelText: 默认登录域 @@ -1198,7 +1202,7 @@ ldap: disabledBitMask: labelText: 禁用状态位掩码 userMemberAttribute: - labelText: 用户成员属性 + labelText: 用户成员属性 groups: header: 组 objectClass: @@ -1213,8 +1217,8 @@ ldap: groupMemberMapping: labelText: 组成员映射属性 groupDN: - labelText: Group DN - placeholder: distinguishedName + labelText: Group DN + placeholder: distinguishedName testAuth: header: "3. 测试并启用验证" helpText: "通过你的 {providerName} 账号进行验证测试以确认配置是否正确:" @@ -1240,16 +1244,16 @@ serviceInfoPartial: description: '描述:' containers: 容器 scale: 数量 - global: 全局 + global: 全局 noContainers: 无容器 ports: 端口 noPublicPorts: 无映射端口 links: 链接 noLinks: 无链接 - fqdn: 'FQDN:' + fqdn: 'FQDN:' ############################## # Components -############################## +############################## advancedSection: hrText: 高级选项 catalogSettings: @@ -1260,7 +1264,7 @@ catalogSettings: rancher: "{appName} 官方认证" pl: 官方认证 detail: - rancher: "Rancher核心功能所依赖的模板，例如Kubernetes/Mesos/Swarm编排支持。由Rancher官方维护并提供支持。" + rancher: "Rancher核心功能所依赖的模板，例如Kubernetes/Mesos/Swarm编排支持。由Rancher官方维护并提供支持。" pl: 由官方维护的核心功能所需要的模板，例如Kubernetes/Mesos/Swarm等 community: header: @@ -1285,14 +1289,14 @@ catalogSettings: helm: Helm branch: label: 分支 - placeholder: '例如: master' + placeholder: '例如: master' confirmDelete: title: '是否确认要删除' environmentNote: '注意:此环境内的所有资源都将被永久性的删除，包括通过{appName}创建的主机。' protip: '高级技巧:在点击删除时按住 {key} 键以跳过确认操作。' confirmAction: 删除 cancelAction: 取消 - largeDeleteText: '{key} 及 {othersCount} 其他' + largeDeleteText: '{key} 及 {othersCount} 其他' containerLogs: title: '日志: {instanceName}' onlyCombined: "注意: 此容器运行时带有TTY(-t)参数，仅有合并的标准输出和标准错误日志可见" @@ -1324,13 +1328,13 @@ copyToClipboard: dangerZone: header: 高级设置 subtext: "注意：通常情况下用户无需修改此类设置。不正确的设置可能会导致 {appName} 部署损坏。被修改的设置会用粗体显示。" - showLabel: 我确认已经知道修改高级设置可能导致问题 + showLabel: 我确认已经知道修改高级设置可能导致问题 devicePermissions: all: 全部 none: 无 read: 读 write: 写 - mknod: Mknod + mknod: Mknod editAccount: title: 编辑账号 form: @@ -1380,10 +1384,10 @@ editBalancerService: '此处可以设置其他 haproxy.cfg 配置项，相关内容将被附加到 {appName} 生成的配置中。' global: - label: 'global section' + label: 'global section' prompt: 自定义的global section设置 defaults: - label: 'defaults section' + label: 'defaults section' prompt: 自定义的default section设置 editCertificate: title: 编辑证书 @@ -1425,9 +1429,9 @@ editHost: valueLabel: IP地址 valuePlaceholder: '例如: 1.2.3.4' addActionLabel: 添加IP - help: '如果设置，调度器将从中选择一个IP地址并将发布的端口绑定到该地址。' + help: '如果设置，调度器将从中选择一个IP地址并将发布的端口绑定到该地址。' requireAny: - label: 容器标签需求 + label: 容器标签需求 help: '如果设置，容器必须具备设置的一个或者多个标签才能够被调度到该主机。如果仅设置Key而Value留空，具备相应Key的容器可以被调度到该主机而忽略Value的值。io.rancher.container.system标签是运行系统容器所必须的。' addActionLabel: 添加标签需求 @@ -1445,7 +1449,7 @@ editProjectTemplate: error: conflict: 冲突 enabling: "所选的基础设施服务\"{stackName}\"版本 {tplCategory} 不支持 {orchestration} 编排." - changing: "当前启用的基础设施服务\"{stackName}\"版本 {tplCategory} 不支持 {orchestration} 编排." + changing: "当前启用的基础设施服务\"{stackName}\"版本 {tplCategory} 不支持 {orchestration} 编排." editRegistry: title: 编辑镜像库 address: @@ -1477,7 +1481,7 @@ editStack: envCatalog: header: 管理应用商店 subtext: '可以在这里定义自定义的应用商店源，该应用商店仅对当前环境的用户可见。全局应用商店对所有环境可见，仅能由管理员在管理设置中修改。应用商店需要一个唯一的名称并且支持 git clone 的URL地址 (参考 文档 以获取更多信息)。' - addActionLabel: 添加应用商店 + addActionLabel: 添加应用商店 stackHeader: backLink: "应用:" outputs: 输出 @@ -1540,7 +1544,7 @@ formCommand: placeholder: '例如:/usr/sbin/httpd -f httpd.conf' entryPoint: label: 入口 - placeholder: '例如:/bin/sh' + placeholder: '例如:/bin/sh' workingDir: label: 工作目录 placeholder: '例如:/myapp' @@ -1566,8 +1570,11 @@ formCommand: other {次} } always: 总是 + drainTimeout: + label: 优雅停止超时 + unit: 毫秒 environment: - label: 环境变量 + label: 环境变量 addAction: 添加环境变量 keyLabel: 变量 keyPlaceholder: '例如:foo' @@ -1637,7 +1644,7 @@ formEngineOpts: valueLabel: 镜像URL valuePlaceholder: '例如:https://my-mirror.example.com:5000' formHealthCheck: - label: 类型 + label: 类型 checkType: none: 无 tcp: TCP连接 @@ -1669,10 +1676,10 @@ formHealthCheck: label: 检查超时 unit: 毫秒 healthyThreshold: - label: 健康阈值 + label: 健康阈值 unit: 次成功 unhealthyThreshold: - label: 不健康阈值 + label: 不健康阈值 unit: 次失败 strategy: label: 不健康时 @@ -1689,7 +1696,7 @@ formKeyValue: key: label: 键 placeholder: 键 - separator: "=" + separator: "=" value: label: 值 placeholder: 值 @@ -1717,15 +1724,15 @@ formNetwork: as: 名称 data: dest: '模板容器:' - as: '名称:' + as: '名称:' networkMode: label: 网络 bridge: 桥接 - container: 容器 + container: 容器 host: 主机 managed: 托管 nat: NAT - transparent: Transparent + transparent: Transparent none: 无 container: label: 容器 @@ -1737,7 +1744,7 @@ formNetwork: label: 保持IP reuse: 当升级或替换不健康的容器实例时保持IP地址不变。 dns: - label: DNS + label: DNS enable: 启用 {appName} DNS服务发现 hostname: label: 主机名 @@ -1750,12 +1757,12 @@ formNetwork: placeholder: '例如: example.com' resolvingServers: label: DNS服务器 - addActionLabel: 添加服务器 + addActionLabel: 添加服务器 placeholder: '例如: 8.8.4.4' searchDomains: label: 搜索域 placeholder: '例如: prod.example.com' - addActionLabel: 添加搜索域 + addActionLabel: 添加搜索域 formPorts: addAction: 端口映射 bindAddress: @@ -1763,7 +1770,7 @@ formPorts: placeholder: "例如: 1.2.3.4; 默认: any" public: label: 公开主机端口 - placeholder: "例如: 80" + placeholder: "例如: 80" private: label: 私有容器端口 placeholder: "例如:8080" @@ -1775,7 +1782,7 @@ formPorts: publicRequired: 指定主机IP时必须设置公开主机端口 mixedIpPort: "Port {ip}:{port}/{proto} 有超过一条映射规则" mixedPort: "Port {port}/{proto} 有超过一条映射规则" - showIpLink: 显示主机IP选项 + showIpLink: 显示主机IP选项 formScale: label: 数量 global: @@ -1800,7 +1807,7 @@ formScheduling: containers: 在指定主机上运行 全部 容器 runSpecific: 在指定主机上运行 noRules: 无调度规则 - autoRun: "自动在符合调度规则的每一台主机上运行:" + autoRun: "自动在符合调度规则的每一台主机上运行:" autoPick: vm: "为每一个虚拟机自动选择符合调度规则的主机:" container: "为每一个容器自动选择符合调度规则的主机:" @@ -1834,7 +1841,7 @@ formSecrets: suffix: "" formSecurity: key: 键 - value: 值 + value: 值 logConfig: addActionLabel: 添加选项 keyPlaceholder: '例如: syslog-facility' @@ -1848,10 +1855,10 @@ formSecurity: memoryLimit: label: 内存限制 placeholder: 无限制 - mb: MB + mb: MB swapLimit: label: + 交换限制 - mb: MB + mb: MB placeholder1: 请求内存限制 placeholder2: 无限制 cpuPinning: @@ -1869,7 +1876,7 @@ formSecurity: link: 更多信息 deviceBinding: label: 设备绑定 - addActionLabel: 增加绑定 + addActionLabel: 增加绑定 pathHost: label: 主机内路径 placeholder: '例如: /dev/sdc' @@ -1912,10 +1919,10 @@ formSslTermination: alternateCerts: 备选证书 addAlternate: 添加备选证书 noCertificates: 当前无证书可用 - noAlternateCertificates: 当前无其他证书可用 + noAlternateCertificates: 当前无其他证书可用 helpBlock: | "注意: 一些旧的 SSL/TLS 客户端不支持 Server Name Indication (SNI) 功能，对于这些客户端将只提供主证书。 对于支持SNI功能的现代客户端将根据匹配结果从备选证书列表中选择一个合适的证书。" - notNeeded: 未设置SSL/TLS端口 + notNeeded: 未设置SSL/TLS端口 formStickiness: stickiness: 会话保持 @@ -1928,7 +1935,7 @@ formStickiness: indirect: 间接 sendHeader: 发送no-cache头 onPost: 仅对POST请求设置Cookie - noPorts: 未设置HTTP端口规则 + noPorts: 未设置HTTP端口规则 placeholder: sticky: '例如: sticky' @@ -1944,7 +1951,7 @@ formTargets: title: 目标 addAction: 添加服务 hostname: - label: 请求头信息 + label: 请求头信息 placeholder: '例如:svc.com' srcPort: label: 源端口 @@ -1976,7 +1983,7 @@ formUserLabels: key: label: 键 placeholder: '例如: foo' - + value: label: 值 placeholder: '例如:bar' @@ -2014,7 +2021,7 @@ formVolumes: addActionLabel: 添加卷 errors: invalidName: '卷名称只能包含字母、数字、-、_和.' - + heroAddService: infra: header: 添加基础设施应用 @@ -2023,37 +2030,37 @@ heroAddService: header: 创建第一个应用 paragraph1: | '服务是一组由相同docker镜像创建的容器，服务扩展了Docker的“link”概念以利用{appName}的轻量级分布式DNS服务用于服务发现。服务可以单独添加或通过应用商店部署。' - paragraph2: '服务也能够利用其他{appName}内置服务，如负载均衡、健康监控、升级支持以及高可用。' + paragraph2: '服务也能够利用其他{appName}内置服务，如负载均衡、健康监控、升级支持以及高可用。' contentLink: 了解更多 addService: 定义一个服务 addCatalog: 配置 - linkToCatalog: 浏览应用商店 - - - - - - - - - - - - - - - - - - - - - - - - - - + linkToCatalog: 浏览应用商店 + + + + + + + + + + + + + + + + + + + + + + + + + + hookPage: receiver: header: Receiver Hooks @@ -2106,7 +2113,7 @@ hostPod: groupedInstances: namespace: '命名空间:' stack: '应用:' - standalone: 独立容器 + standalone: 独立容器 identityBlock: loading: 加载中... @@ -2142,7 +2149,7 @@ inputCertificate: placeholder: "可选:粘贴或导入额外的证书链，以-----BEGIN CERTIFICATE-----开头" metaXML: label: Metadata XML - placeholder: "粘贴 IDP Metadata XML" + placeholder: "粘贴 IDP Metadata XML" inputIdentity: placeholder: @@ -2192,7 +2199,7 @@ k8s: header: 添加第一个应用 content: | Stacks are deployed from the {appName} Catalog and keep a group of related Deployments, Replication Controllers, or other resources organized. - linkToCatalog: 从应用商店添加 + linkToCatalog: 从应用商店添加 newOrEditResource: edit: 编辑 add: 添加 @@ -2202,7 +2209,7 @@ k8s: status: 状态 containers: 容器 hostIp: 主机IP - podIp: Pod IP + podIp: Pod IP noData: 无Pods rcSection: name: 复制控制器名称 @@ -2223,7 +2230,7 @@ k8s: protocol: 协议 noPorts: 无端口 serviceRow: - defaultType: ClusterIP + defaultType: ClusterIP serviceSection: name: 服务名称 clusterIp: Cluster IP @@ -2245,8 +2252,8 @@ lbAddtlInfo: global: 全局 ports: 端口 noPorts: 无公开主机端口 - targets: 目标 - to: 到 + targets: 目标 + to: 到 labelsSection: kind: 类型 @@ -2271,10 +2278,10 @@ machine: driverAmazon: accessSection: 账户访问 accessKey: - label: Access Key + label: Access Key placeholder: 你的AWS access key secretKey: - label: Secret Key + label: Secret Key placeholder: 你的AWS secret key provided: 已提供 region: @@ -2284,7 +2291,7 @@ machine: loadingAvailability: 从EC2加载可用区和VPC信息... vpcSection: 可用区 & VPC availabilityZone: 可用区 - subnet: VPC/Subnet + subnet: VPC/Subnet securityGroupSelect: '下一步:选择安全组' loadingSecurity: 从EC2加载安全组信息... securityGroupSection: 安全组 @@ -2310,7 +2317,7 @@ machine: label: 实例类型 rootSize: label: 根分区硬盘大小 - unit: GB + unit: GB ami: label: Amazon系统映像(AMI) placeholder: Ubuntu AMI @@ -2326,10 +2333,10 @@ machine: label: 仅使用私有IP地址 driverAzure: - helpBlock: '参考链接文档创建客户端ID和秘钥' + helpBlock: '参考链接文档创建客户端ID和秘钥' accountAccessSection: 账户访问 placementSection: 位置 - networkSection: 网络 + networkSection: 网络 subscriptionId: label: 订阅ID placeholder: Azure订阅ID @@ -2388,20 +2395,20 @@ machine: placeholder: Your Client ID clientSecret: label: 客户端秘钥 - placeholder: Your Client Secret + placeholder: Your Client Secret regionSection: 区域 region: labl: 区域 driverCustom: - step1: Start up a Linux machine somewhere and install a supported version of Docker on it. - step2: "确认安全组或防火墙允许以下通讯:" + step1: 启动一台Linux主机并在主机上安装好我们支持的版本的Docker。 + step2: "确认安全组或防火墙允许以下通讯:" step2li: 与其他所有主机之间的 UDP 端口 500 和 4500 (用于IPsec网络) step3: '可选项: 在主机上增加标签' step4: "指定用于注册这台主机的公网IP。如果留空，Rancher会自动检测IP注册。通常在主机有唯一公网IP 的情况下这是可以的。如果主机位于防火墙/NAT设备之后，或者主机同时也是运行{rancherImage}容器的主机时，则必须设置此IP。" agentIp: placeholder: '例如: 1.2.3.4' - step5Copy: 将下列脚本拷贝到每一台主机上运行以注册 + step5Copy: 将下列脚本拷贝到每一台主机上运行以注册 generating: "生成注册URL..." step5Close: part1: 点击下面的关闭按钮，新的主机注册后会显示在 @@ -2411,10 +2418,24 @@ machine: windows: windowsHeader: Windows主机 linuxHeader: Linux主机 - step1: 运行一台Windows 2016主机并安装最新版本的 Docker on it. + step1: 运行一台Windows 2016主机并安装最新版本的 Docker step2: "创建一个 transparent Docker 网络:" step2Copy: docker network create -d transparent transparent - step3: '复制粘贴下面的命令到Powershell命令行中运行以启动 {appName} agent' + step3: '复制粘贴下面的命令到Powershell命令行中运行以启动 {appName} agent' + windowsSteps: + step1: 运行一台Windows 2016主机并安装支持的版本的Docker。 + step2: "检查并安装Windoes功能 RemoteAccess, Routing:" + step2Copy: Get-WindowsFeature -Name "RemoteAccess","Routing" | Install-WindowsFeature + step2Note: "注意：安装功能成功后，Windows主机需要被重启。" + step3: 请设置Windows主机的子网. 在Windows环境中，只支持 per-host-subnet网络模型 + step4: 请设置子网的路由IP，此IP用于转发不同主机上容器之间的网络流量 + routerIp: + placeholder: e.g. 1.2.3.4 + subnet: + placeholder: e.g. 192.168.0.0/24 + step5: "指定用于注册这台主机的公网IP。如果留空，Rancher会自动检测IP注册。通常在主机有唯一公网IP 的情况下这是可以的。如果主机位于防火墙/NAT设备之后，或者主机同时也是运行{rancherImage}容器的主机时，则必须设置此IP。" + step6: "可选项: 在主机上增加标签" + step7: 制粘贴下面的命令到Powershell命令行中运行以启动 {appName} agent driverDigitalocean: sizeLabel: | @@ -2435,7 +2456,7 @@ machine: label: 镜像 sshUser: label: SSH用户 - placeholder: 'usr1' + placeholder: 'usr1' size: label: 大小 regionSection: 区域 @@ -2448,14 +2469,20 @@ machine: label: 启用IPv6 privateNetworking: label: 启用私有网络 + monitoring: + label: 启用监控 + tags: + addActionLabel: 添加Tag + valueLabel: Tag + placeholder: '例如: dev' driverExoscale: accountSection: 账户访问 apiKey: - label: API Key + label: API Key placeholder: 你的Exoscale API Key secretKey: - label: Secret Key + label: Secret Key placeholder: 你的Exoscale secret key provided: 已提供 accountHelp: 在此粘贴你的Exoscale密钥对，我们将用秘钥创建新的实例。 @@ -2501,7 +2528,7 @@ machine: label: 项目 placeholder: 你的Packet项目ID apiKey: - label: API Key + label: API Key placeholder: 你的Packet API Key apiKeyHelp: '由Packet的 API Keys 页面获取' instanceSection: 实例 @@ -2527,18 +2554,18 @@ machine: label: 区域 instanceSection: 实例 flavor: - label: 偏好 + label: 偏好 driverUbiquity: accountSection: 账户访问 clientId: - label: Reseller ID + label: Reseller ID placeholder: 你的Ubiquity Hosting API Reseller ID apiUsername: - label: Remote ID + label: Remote ID placeholder: 你的Ubiquity Hosting API Reseller ID apiToken: - label: Access Key + label: Access Key placeholder: 你的Ubiquity Hosting Access Key provided: 已提供 accountHelp: '你可以从 这里 找到你的Ubiquity Hosting API密码。还没有账号？了解更多 Ubiquity Hosting 信息！' @@ -2569,12 +2596,12 @@ machine: label: CPUs memorySize: label: 内存 - unit: MB + unit: MB diskSize: label: 磁盘 - unit: MB + unit: MB boot2dockerUrl: - label: 操作系统ISO下载地址 + label: 操作系统ISO下载地址 placeholder: '缺省:最新的boot2docker镜像' schedulingSection: 计划 dataCenter: @@ -2592,11 +2619,11 @@ machine: driverAliyunecs: accountSection: 账户设置 accessKey: - label: Access Key* + label: Access Key* placeholder: 阿里云账号中的 Access Key accessKeySecret: label: Secret Key* - placeholder: 账号Key的secret + placeholder: 账号Key的secret apiEndpoint: label: API网关地址 placeholder: 如果你是私有的阿里云服务器,请输入API地址 @@ -2615,14 +2642,14 @@ machine: placeholder: 阿里云中实例显示的标签 internetMaxBandwidth: label: 最大网络带宽 - placeholder: 1 到 100 + placeholder: 1 到 100 aliyunSLB: label: 阿里云负载均衡ID placeholder: 如果需要使用阿里云的负载均衡服务,请输入ID storageSection: 存储设置 - isOptimized: + ioOptimized: label: 是否存储IO优化(none代表不优化,optimized代表优化) - placeholder: none 或 optimized + placeholder: none 或 optimized systemDiskCategory: label: 系统盘种类 placeholder: 选择了优化IO时,可输入cloud_efficiency, cloud_ssd or ephemeral_ssd. @@ -2641,7 +2668,7 @@ machine: networkSection: 网络设置 routeCIDR: label: 路由CIDR - placeholder: '例如: 192.168.1.0/24' + placeholder: '例如: 192.168.1.0/24' vpcId: label: 阿里云虚拟网络ID placeholder: 如果需要使用阿里云虚拟网络,请输入虚拟网络ID @@ -2660,6 +2687,17 @@ machine: sshPassword: label: SSH 密码 placeholder: 创建实例后SSH远程登录密码,留空则自动设置 + errors: + nameTooShort: 名称至少含有2个字符。 + nameNotValid: 名称不符合 Aliyunecs 上主机名称的规则。 + nameTooLong: 名称不能超过30个字符。 + accessKeyRequired: Access key 不能为空。 + accessSecretRequired: Access Secret 不能为空。 + sshPasswordRequired: SSH 密码 不能为空。 + sshPasswordLengthNotValid: SSH 密码 至少含有8个字符，并不多于30个字符。 + sshPasswordInvalidCharacter: SSH 密码中含有非法字符。 + sshPasswordFormatError: SSH 密码 中必需含有大写字母，小写字母，数字，特殊字符中的至少三种。 + nameNotValidForApp: 名称不符合 {appName} 主机名称规则 modalAboutComponent: component: 组件 @@ -2668,7 +2706,7 @@ modalAboutComponent: cli: CLI ui: 用户界面 compose: Compose - machineService: 主机服务 + machineService: 主机服务 cloe: 关闭 modalAuditlogInfo: @@ -2750,7 +2788,7 @@ modalHostEvacuate: modalProcessError: header: 异常信息 cause: "原因:" - none: N/A + none: N/A stackTrace: "堆栈跟踪:" cloe: 关闭 @@ -2760,11 +2798,11 @@ modalRollbackVolume: backup: 回滚到备份 modalShell: - title: '命令行: {instnceName}' + title: '命令行: {instanceName}' modalWelcome: header: 欢迎使用 {appName}! - closeModal: 确认 + closeModal: 确认 newAliasService: header: 添加服务别名 @@ -2774,7 +2812,7 @@ newBalancer: header: add: 添加负载均衡 edit: 编辑负载均衡 - upgrade: 升级负载均衡 + upgrade: 升级负载均衡 tabs: ssl: SSL终止 stickiness: 会话粘性 @@ -2792,12 +2830,12 @@ newBalancer: invalidTargetPort: "不正确的目标端口: '{num}'" mixedPort: "端口 {num} 有多条冲突的访问/协议规则" noTarget: "每条规则必须设置目标端口" - needsCertificate: "设置SSL/TLS规则时需要证书" + needsCertificate: "设置SSL/TLS规则时需要证书" newCatalog: version: prompt: 选择版本... - default: 当前默认 (当前版本 {version}) + default: 当前默认 (当前版本 {version}) saveUpgrade: 升级 saveNew: 启动 saveConfigure: 设置 @@ -2812,11 +2850,11 @@ newCatalog: url: "项目URL:" titleAdd: "添加 {name} 应用" titleUpgrade: "升级 {name} 应用" - titleConfigure: "设置 {name} 应用" + titleConfigure: "设置 {name} 应用" templateVersion: 模板版本 selectVersionAdd: 选择一个模板版本部署 selectVersionUpgrade: 选择一个模板版本升级 - selectVersionConfigure: 选择一个模板版本设置 + selectVersionConfigure: 选择一个模板版本设置 newStack: 新应用 config: 配置选项 unknownType: "未识别问题类型:" @@ -2854,7 +2892,7 @@ newContainer: scheduling: 调度 balancing: 负载均衡 secrets: 密文 - selectUpgrade: 选择一个或者多个服务进行升级 + selectUpgrade: 选择一个或者多个服务进行升级 saveUpgrade: 升级 saveNew: 创建 removeSidekick: 删除从容器 @@ -2911,6 +2949,15 @@ newReceiver: max: label: 最大数量 placeholder: '例如: 20' + payloadFormat: + label: 镜像仓库Webhook参数格式 + alicloud: 阿里云 + dockerhub: Docker Hub + addressType: + label: 地址类型 + registry: 公网地址 + registry-vpc: VPC网络 + registry-internal: 经典内网 tag: label: 镜像标签 placeholder: "例如: latest" @@ -2938,7 +2985,7 @@ pageFooter: wechat: 微信 download: link: 下载CLI - headerCli: Rancher CLI (beta) + headerCli: Rancher CLI headerCompose: Rancher Compose mac: Mac OS X windows: Windows @@ -2949,7 +2996,7 @@ pagination: {pages, plural, =0 {0 Items} =1 {{count} {count, select, =1 {Item} other {Items}}} - other {{from} - {to} of {count}}} + other {{from} - {to} of {count}}} pageHeaderEnvironment: namespace: 命名空间 @@ -2963,7 +3010,7 @@ projectUpgrade: detail: "{appName} {appVersion} 包含更新需要升级已有的系统服务以及负载均衡器容器。" notOwner: "只有环境的所有者或者管理员能够进行升级操作。" actionButton: 立刻升级 - banner: 环境升级中... + banner: 环境升级中... registryRow: address: 地址 @@ -2991,7 +3038,7 @@ saveCancel: saved: 已保存! edit: 保存 create: 创建 - cancl: 取消 + cancel: 取消 schema: inputBoolean: @@ -3004,7 +3051,7 @@ schema: inputService: prompt: 选择服务... inputSecret: - prompt: 选择密文... + prompt: 选择密文... schedulingRuleRow: theHost: 主机 @@ -3025,7 +3072,7 @@ serviceLink: differentStack: "{stack}/{service} 链接为 {alias}" noAlias: sameStack: "{service}" - differentStack: "{stack}/{service}" + differentStack: "{stack}/{service}" sidekickAddtlInfo: info: 信息 @@ -3086,7 +3133,7 @@ stackSection: details: 查看详情 containers: 容器 actions: 操作 - upgradeImage: 升级容器镜像 + upgradeImage: 升级容器镜像 snapshotSection: @@ -3110,7 +3157,7 @@ storagePoolSection: snapshotState: '快照状态' snapshotName: '快照名称' backedUp: '已备份' - mounts: '挂载点 (Container: Path)' + mounts: '挂载点 (Container: Path)' svgServiceContainer: sidekicks: 从容器 @@ -3132,7 +3179,7 @@ swarmTab: dashboard: header: 仪表板 dashboard: - content: 'Portainer是一个轻量级的管理UI界面，能够让你方便的管理Docker Swarm集群。' + content: 'Portainer是一个轻量级的管理UI界面，能够让你方便的管理Docker Swarm集群。' button: Portainer UI telemetryOpt: @@ -3141,12 +3188,12 @@ telemetryOpt: Rancher Labs希望能够收集您环境的匿名配置信息以帮助改进{appName}产品。
您的信息不会被提供给任何第三方，收集的信息不包含特定的资源名称或地址。 learnMore: label: 了解更多 - label: 允许收集匿名统计信息 + label: 允许收集匿名统计信息 tooltipLink: list: 列表 linkGraph: 链接图 - composeYaml: 编排文件 + composeYaml: 编排文件 tooltipWarning: notConfigured: 未设置访问控制 @@ -3154,7 +3201,7 @@ tooltipWarning: upgradeBtn: version: - current: '当前版本' + current: '当前版本' status: none: '无' loading: '检查更新...' @@ -3164,7 +3211,7 @@ upgradeBtn: upgraded: '已升级: 完成升级' notfound: '未识别模板版本' error: '检查更新出错' - required: '需要升级' + required: '需要升级' viewEditDescription: form: @@ -3212,7 +3259,7 @@ volumeRow: readOnly: "(read-only)" waitOrchestration: - count: '({sub} of {count})' + count: '({sub} of {count})' waitKubernetes: addHost: '添加至少一台主机' @@ -3242,21 +3289,21 @@ containerChoices: hostGroupWithState: '主机:{name}{state}' unknownHost: '主机:???' containerOption: "{name}" - containerOptionWithState: "{name} ({state})" + containerOptionWithState: "{name} ({state})" driver: multiHostNames: "主机将被命名为 {first} — {ast}" ############################## # Services -############################## +############################## allServices: stackGroup: '应用:{name}' noName: '(应用:{id})' ############################## # Navigation -############################## +############################## nav: srToggleNav: 切换导航 srToggleDropdown: 切换下拉菜单 @@ -3266,35 +3313,35 @@ nav: your: 你的环境 selected: 当前环境 manage: 环境管理 - edit: '编辑 "{name}"' + edit: '编辑 "{name}"' namespace: label: 命名空间 manage: 命名空间管理 - notReady: 设置中... + notReady: 设置中... k8s: tab: Kubernetes cli: CLI dashboard: 仪表板 - system: 基础设施 + system: 基础设施 swarm: tab: Swarm cli: CLI dashboard: Portainer - system: 基础设施 + system: 基础设施 mesos: - tab: Mesos + tab: Mesos web: 概览 - system: 基础设施 + system: 基础设施 cattle: tab: 应用 all: 全部 user: 用户 - system: 基础设施 + system: 基础设施 catalog: tab: 应用商店 all: 全部 library: 官方认证 - community: 社区共享 + community: 社区共享 infra: tab: 基础架构 hosts: 主机 @@ -3304,7 +3351,7 @@ nav: backupTarget: 备份目标 certificates: 证书 registries: 镜像库 - secrets: 密文 + secrets: 密文 admin: tab: 系统管理 audit: 审计日志 @@ -3317,7 +3364,7 @@ nav: api: tab: API keys: 密钥 - hooks: Webhooks + hooks: Webhooks user: label: '用户菜单:{username}' logout: 注销 @@ -3338,7 +3385,7 @@ nav: ############################## # Resource Actions -############################## +############################## action: activate: 激活 backup: 备份快照 @@ -3349,7 +3396,7 @@ action: console: 打开控制台 deactivate: 停用 edit: 编辑 - evacuate: 疏散 + evacuate: 疏散 execute: 执行命令行 exportConfig: 导出配置 finishUpgrade: 升级完成 @@ -3357,7 +3404,7 @@ action: machineConfig: 主机配置 purge: 清除 remove: 删除 - replay: 重播 + replay: 重播 restart: 重启 restore: 恢复 retry: 重试 @@ -3373,11 +3420,11 @@ action: switchNamespace: 切换至此命名空间 switchEnvironment: 切换至此环境 upgrade: 升级 - upgradeOrEdit: 升级/编辑 + upgradeOrEdit: 升级/编辑 viewConfig: 查看配置 viewGraph: 查看图形 viewInApi: API查看 - viewInstance: 查看实例 + viewInstance: 查看实例 ############################## # Resource Actions @@ -3403,7 +3450,7 @@ validation: ############################## # Model Properties -############################## +############################## model: account: kind: @@ -3413,6 +3460,17 @@ model: user: 用户 admin: 管理员 project: 环境 + openldapconfig: + server: + label: 主机名或IP地址 + serviceAccountUsername: + label: 服务账号用户名 + serviceAccountPassword: + label: 服务账号密码 + domain: + label: '用户搜索起点:' + placeholder: "例如: ou=Users,dc=mycompany,dc=com" + help: "该搜索起点下仅有用户会被使用。" identity: displayType: user: 用户 @@ -3420,7 +3478,7 @@ model: group: 组 org: 组织 localUser: 本地用户 - unknown: "{type}?" + unknown: "{type}?" projectMember: role: member: 成员 diff --git a/vendor/aws-sdk-ec2.js b/vendor/aws-sdk-ec2.js index 9d90e1293e..caec3bc127 100644 --- a/vendor/aws-sdk-ec2.js +++ b/vendor/aws-sdk-ec2.js @@ -6889,7 +6889,7 @@ function hash(alg, key) { return { update: function (data) { if(!Buffer.isBuffer(data)) data = new Buffer(data) - + bufs.push(data) length += data.length return this