diff --git a/app/authenticated/route.js b/app/authenticated/route.js index d16209e81..1727fe2f4 100644 --- a/app/authenticated/route.js +++ b/app/authenticated/route.js @@ -64,7 +64,7 @@ export default Route.extend(Preload, { this.loadClusters(), this.loadProjects(), this.loadPreferences(), - //this.loadPublicSettings(), + this.loadPublicSettings(), ]); }).catch((err) => { return this.loadingError(err, transition); @@ -142,13 +142,7 @@ export default Route.extend(Preload, { }, loadPublicSettings() { - return get(this,'globalStore').find('setting', null, { - url: 'settings', - forceReload: true, - filter: { - all: 'false' - } - }); + return get(this,'globalStore').find('setting', null, { url: 'settings' }); }, loadSecrets() { diff --git a/lib/global-admin/addon/application/route.js b/lib/global-admin/addon/application/route.js index ad13cf764..55511f342 100644 --- a/lib/global-admin/addon/application/route.js +++ b/lib/global-admin/addon/application/route.js @@ -11,7 +11,6 @@ export default Route.extend({ this._super(...arguments); return this.get('settings').load([ C.SETTING.API_HOST, - C.SETTING.CATALOG_URL, C.SETTING.TELEMETRY, ]); }, diff --git a/lib/global-admin/addon/clusters/new/route.js b/lib/global-admin/addon/clusters/new/route.js index bca3d65dc..87c8d0445 100644 --- a/lib/global-admin/addon/clusters/new/route.js +++ b/lib/global-admin/addon/clusters/new/route.js @@ -12,8 +12,9 @@ export default Route.extend({ model() { let store = this.get('globalStore'); - let def = JSON.parse(this.get(`settings.${C.SETTING.CLUSTER_TEMPLATE}`)) || {}; - def.type = 'cluster'; + let def ={ + type: 'cluster' + }; let cluster = store.createRecord(def); cluster.set('nodes', []); diff --git a/lib/shared/addon/components/modal-about/template.hbs b/lib/shared/addon/components/modal-about/template.hbs index 4203565d1..c1002b314 100644 --- a/lib/shared/addon/components/modal-about/template.hbs +++ b/lib/shared/addon/components/modal-about/template.hbs @@ -16,12 +16,6 @@ {{settings.rancherVersion}} {{/if}} - {{#if settings.cattleVersion}} - - {{t 'modalAboutComponent.cattle'}} - {{settings.cattleVersion}} - - {{/if}} {{#if settings.uiVersion}} {{t 'modalAboutComponent.ui'}} @@ -34,21 +28,16 @@ {{settings.cliVersion}} {{/if}} - {{#if settings.composeVersion}} + {{#if settings.helmVersion}} - {{settings.appName}} {{t 'modalAboutComponent.compose'}} - {{settings.composeVersion}} + {{t 'modalAboutComponent.helm'}} + {{settings.helmVersion}} {{/if}} - {{#if settings.goMachineVersion}} + {{#if settings.dockerMachineVersion}} - {{t 'modalAboutComponent.machineService'}} - - {{settings.goMachineVersion}} - {{#if settings.dockerMachineVersion}} - ({{t 'modalAboutComponent.dockerMachine'}} {{settings.dockerMachineVersion}}) - {{/if}} - + {{t 'modalAboutComponent.machine'}} + {{t 'modalAboutComponent.dockerMachine'}} {{/if}} diff --git a/lib/shared/addon/components/modal-kubeconfig/component.js b/lib/shared/addon/components/modal-kubeconfig/component.js index 69563ec96..eafe0eb54 100644 --- a/lib/shared/addon/components/modal-kubeconfig/component.js +++ b/lib/shared/addon/components/modal-kubeconfig/component.js @@ -1,5 +1,6 @@ import { inject as service } from '@ember/service'; import { get, set, computed } from '@ember/object'; +import C from 'shared/utils/constants'; import Component from '@ember/component'; import ModalBase from 'shared/mixins/modal-base'; import layout from './template'; @@ -9,8 +10,9 @@ kind: Config clusters: - name: "%clusterName%" cluster: - api-version: v1%maybeInsecure% server: "%baseUrl%/k8s/clusters/%clusterId%" + api-version: v1%maybeInsecure%%maybeCertificate% + certificate-authority-data: %clusterCert% users: - name: "%username%" @@ -57,6 +59,7 @@ export default Component.extend(ModalBase, { const me = get(this, 'access.me'); const cluster = get(this, 'scope.currentCluster'); const tokenObj = get(this, 'token'); + const certificate = get(this, `settings.${C.SETTING.CA_CERTS}`); let token = ''; if ( tokenObj ) { @@ -68,6 +71,7 @@ export default Component.extend(ModalBase, { .replace(/%maybeInsecure%/g,(insecure ? '\n insecure-skip-tls-verify: true' : '')) .replace(/%clusterId%/g, get(cluster, 'id')) .replace(/%clusterName%/g, get(cluster, 'displayName')) + .replace(/%maybeCertificate%/g, (certificate ? '\n certificate-authority-data: ' + certificate : '')) .replace(/%username%/g, get(me, 'username')) .replace(/%token%/g, token); }, diff --git a/lib/shared/addon/components/page-footer/component.js b/lib/shared/addon/components/page-footer/component.js index 179b40db6..ce80f18ac 100644 --- a/lib/shared/addon/components/page-footer/component.js +++ b/lib/shared/addon/components/page-footer/component.js @@ -31,14 +31,8 @@ export default Component.extend({ cli[key.toLowerCase()] = settings.get(C.SETTING.CLI_URL[key]); }); - let compose = {}; - Object.keys(C.SETTING.COMPOSE_URL).forEach((key) => { - compose[key.toLowerCase()] = settings.get(C.SETTING.COMPOSE_URL[key]); - }); - this.setProperties({ - cli: cli, - compose: compose, + cli }); }, diff --git a/lib/shared/addon/settings/service.js b/lib/shared/addon/settings/service.js index b4c173438..cd1c27638 100644 --- a/lib/shared/addon/settings/service.js +++ b/lib/shared/addon/settings/service.js @@ -7,11 +7,11 @@ import C from 'shared/utils/constants'; import { minorVersion } from 'shared/utils/parse-version'; export function normalizeName(str) { - return str.replace(/\./g, C.SETTING.DOT_CHAR).toLowerCase(); + return str; //.replace(/\./g, C.SETTING.DOT_CHAR).toLowerCase(); } export function denormalizeName(str) { - return str.replace(new RegExp('['+C.SETTING.DOT_CHAR+']','g'),'.').toLowerCase(); + return str; //.replace(new RegExp('['+C.SETTING.DOT_CHAR+']','g'),'.').toLowerCase(); } export default Service.extend(Evented, { @@ -147,7 +147,6 @@ export default Service.extend(Evented, { issueUrl: function() { var str = '*Describe your issue here*\n\n\n---\n| Useful | Info |\n| :-- | :-- |\n' + `|Versions|Rancher \`${this.get('rancherVersion')||'-'}\` ` + - `Cattle: \`${this.get('cattleVersion')||'-'}\` ` + `UI: \`${this.get('uiVersion')||'--'}\` |\n`; if ( this.get('access.enabled') ) @@ -164,15 +163,13 @@ export default Service.extend(Evented, { var url = C.EXT_REFERENCES.GITHUB + '/issues/new?body=' + encodeURIComponent(str); return url; - }.property('app.currentRouteName','access.{provider,admin}','cattleVersion','rancherVersion','uiVersion'), + }.property('app.currentRouteName','access.{provider,admin}','rancherVersion','uiVersion'), rancherImage: alias(`asMap.${C.SETTING.IMAGE_RANCHER}.value`), rancherVersion: alias(`asMap.${C.SETTING.VERSION_RANCHER}.value`), - composeVersion: alias(`asMap.${C.SETTING.VERSION_COMPOSE}.value`), - cattleVersion: alias(`asMap.${C.SETTING.VERSION_CATTLE}.value`), cliVersion: alias(`asMap.${C.SETTING.VERSION_CLI}.value`), dockerMachineVersion: alias(`asMap.${C.SETTING.VERSION_MACHINE}.value`), - goMachineVersion: alias(`asMap.${C.SETTING.VERSION_GMS}.value`), + helmVersion: alias(`asMap.${C.SETTING.VERSION_HELM}.value`), _plValue: function() { let TRUE=true; // @TODO-2.0 diff --git a/lib/shared/addon/utils/constants.js b/lib/shared/addon/utils/constants.js index 1ce890b38..5c01ce49d 100644 --- a/lib/shared/addon/utils/constants.js +++ b/lib/shared/addon/utils/constants.js @@ -206,7 +206,6 @@ var C = { CLUSTER_DEFAULT : 'defaultClusterId', LAST_SCALE_MODE : 'lastScaleMode', LAST_NAMESPACE : 'lastNamespace', - SHOW_SYSTEM : 'showSystem', SORT_STACKS_BY : 'sortStacksBy', TABLE_COUNT : 'tableCount', THEME : 'theme', @@ -413,37 +412,27 @@ var C = { }, SETTING: { - // Dots in key names do not mix well with Ember, so we use $ in their place. - DOT_CHAR: '$', - IMAGE_RANCHER: 'rancher$server$image', - VERSION_RANCHER: 'rancher$server$version', - VERSION_COMPOSE: 'rancher$compose$version', - VERSION_CLI: 'rancher$cli$version', - VERSION_CATTLE: 'cattle$version', - VERSION_MACHINE: 'docker$machine$version', - VERSION_GMS: 'go$machine$service$version', + IMAGE_RANCHER: 'server-image', + VERSION_RANCHER: 'server-version', + VERSION_COMPOSE: 'compose-version', + VERSION_CLI: 'cli-version', + VERSION_MACHINE: 'machine-version', + VERSION_HELM: 'helm-version', CLI_URL: { - DARWIN: 'rancher$cli$darwin$url', - WINDOWS: 'rancher$cli$windows$url', - LINUX: 'rancher$cli$linux$url', + DARWIN: 'cli-url-darwin', + WINDOWS: 'cli-url-windows', + LINUX: 'cli-url-linux', }, - COMPOSE_URL: { - DARWIN: 'rancher$compose$darwin$url', - WINDOWS: 'rancher$compose$windows$url', - LINUX: 'rancher$compose$linux$url', - }, - API_HOST: 'api$host', - CATALOG_URL: 'catalog$url', - ENGINE_URL: 'engine$install$url', - SUPPORTED_DOCKER: 'supported$docker$range', - NEWEST_DOCKER: 'newest$docker$version', - TELEMETRY: 'telemetry$opt', - AUTH_LOCAL_VALIDATE_DESC: 'api$auth$local$validate$description', - BALANCER_IMAGE: 'lb$instance$image', - FEEDBACK_FORM: 'ui$feedback$form', - SHOW_SYSTEM: 'ui$show$system', - SHOW_CUSTOM_HOST: 'ui$show$custom$host', - CLUSTER_TEMPLATE: 'default$cluster$template', + CA_CERTS: 'ca-certs', + API_HOST: 'api-host', + ENGINE_URL: 'engine-install-url', + SUPPORTED_DOCKER: 'engine-supported-range', + NEWEST_DOCKER: 'engine-newest-version', + TELEMETRY: 'telemetry-opt', + + AUTH_LOCAL_VALIDATE_DESC: 'auth-password-requirements-description', + BALANCER_IMAGE: 'balancer-instance-image', + FEEDBACK_FORM: 'ui-feedback-form', }, TABLES: { @@ -451,7 +440,7 @@ var C = { }, THEME: { - AUTO_UPDATE_TIMER : 1800000, + AUTO_UPDATE_TIMER : 30*60*1000, START_HOUR : 7, END_HOUR : 18, DEFAULT : 'ui-light',