Merge pull request #23 from dxos/tel-kube

xbox -> kube
This commit is contained in:
Thomas E Lackey 2020-06-22 20:39:20 -05:00 committed by GitHub
commit 965df32ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions

View File

@ -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'

View File

@ -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;
}

View File

@ -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' },

View File

@ -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()
}
}