From 85657ceab6ab2299741650f4cd265ae231f2931b Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 22 Jun 2020 14:20:52 -0500 Subject: [PATCH] xbox -> kube --- packages/console-app/config.yml.kube | 18 +++++++++--------- .../console-app/src/containers/VersionCheck.js | 4 ++-- .../src/containers/panels/wns/WNSRecords.js | 2 +- .../{config.yml.xbox => config.yml.kube} | 0 .../console-server/src/resolvers/system.js | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename packages/console-server/{config.yml.xbox => config.yml.kube} (100%) diff --git a/packages/console-app/config.yml.kube b/packages/console-app/config.yml.kube index bc0d99b..5db8f2e 100644 --- a/packages/console-app/config.yml.kube +++ b/packages/console-app/config.yml.kube @@ -11,7 +11,7 @@ app: publicUrl: '/console' api: - server: 'https://xbox.local' + server: 'https://kube.local' path: '/api' intervalLog: 5000 pollInterval: 10000 @@ -22,19 +22,19 @@ system: services: app: prefix: '/app' - server: 'https://xbox.local' + server: 'https://kube.local' wns: - server: 'https://xbox.local/dxos/wns/api' - webui: 'https://xbox.local/dxos/wns/console' + server: 'https://kube.local/dxos/wns/api' + webui: 'https://kube.local/dxos/wns/console' signal: - server: 'wss://xbox.local/dxos/signal' - api: 'https://xbox.local/dxos/signal' + server: 'wss://kube.local/dxos/signal' + api: 'https://kube.local/dxos/signal' ipfs: - server: 'https://xbox.local/dxos/ipfs/api' - gateway: 'https://xbox.local/dxos/ipfs/gateway' + server: 'https://kube.local/dxos/ipfs/api' + gateway: 'https://kube.local/dxos/ipfs/gateway' wellknown: - endpoint: 'https://xbox.local:9000/.well-known/dxos' + endpoint: 'https://kube.local:9000/.well-known/dxos' diff --git a/packages/console-app/src/containers/VersionCheck.js b/packages/console-app/src/containers/VersionCheck.js index be52219..a8c41d6 100644 --- a/packages/console-app/src/containers/VersionCheck.js +++ b/packages/console-app/src/containers/VersionCheck.js @@ -39,12 +39,12 @@ const VersionCheck = () => { const statusData = JSON.parse(statusResponse.system_status.json); const wnsData = JSON.parse(wnsResponse.wns_records.json); - const current = get(statusData, 'dxos.xbox.version', '0.0.0'); + const current = get(statusData, 'dxos.kube.version', '0.0.0'); let latest = current; wnsData.forEach(({ attributes: { name, version } }) => { // TODO(burdon): Filter by type (WRN?) - if (name.startsWith('dxos/xbox:')) { + if (name.startsWith('dxos/kube:')) { if (compareVersions(version, latest) > 0) { latest = version; } diff --git a/packages/console-app/src/containers/panels/wns/WNSRecords.js b/packages/console-app/src/containers/panels/wns/WNSRecords.js index 9e59bd4..ade8c57 100644 --- a/packages/console-app/src/containers/panels/wns/WNSRecords.js +++ b/packages/console-app/src/containers/panels/wns/WNSRecords.js @@ -25,7 +25,7 @@ import AppLink from '../../../components/AppLink'; const types = [ { key: null, label: 'ALL' }, - { key: 'wrn:xbox', label: 'XBox' }, + { key: 'wrn:kube', label: 'Kube' }, { key: 'wrn:resource', label: 'Resource' }, { key: 'wrn:service', label: 'Service' }, { key: 'wrn:app', label: 'App' }, diff --git a/packages/console-server/config.yml.xbox b/packages/console-server/config.yml.kube similarity index 100% rename from packages/console-server/config.yml.xbox rename to packages/console-server/config.yml.kube diff --git a/packages/console-server/src/resolvers/system.js b/packages/console-server/src/resolvers/system.js index 702355b..52e63bd 100644 --- a/packages/console-server/src/resolvers/system.js +++ b/packages/console-server/src/resolvers/system.js @@ -26,7 +26,7 @@ const size = (n, unit) => { const getVersionInfo = () => { // TODO(telackey): Get from config (or figure out a better way to do this). - const versionFile = '/opt/xbox/VERSION'; + const versionFile = '/opt/kube/VERSION'; if (fs.existsSync(versionFile)) { return fs.readFileSync(versionFile, { encoding: 'UTF8' }).replace(/^\s+|\s+$/g, ''); } @@ -87,7 +87,7 @@ const getSystemInfo = async () => { }, dxos: { - xbox: { + kube: { version: getVersionInfo() } }