@fnndsc/stratus 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/chris/values-openshift.yaml +59 -0
- package/dist/backend.d.ts +6 -3
- package/dist/backend.js +12 -5
- package/dist/backend.js.map +1 -1
- package/dist/cloud/builder.d.ts +3 -1
- package/dist/cloud/builder.js +1 -1
- package/dist/cloud/builder.js.map +1 -1
- package/dist/cloud/fake/builder.d.ts +4 -1
- package/dist/cloud/fake/builder.js +14 -9
- package/dist/cloud/fake/builder.js.map +1 -1
- package/dist/cloud/fake/driver.d.ts +1 -1
- package/dist/cloud/fake/driver.js +9 -9
- package/dist/cloud/fake/driver.js.map +1 -1
- package/dist/cloud/oci/api.js +15 -15
- package/dist/cloud/oci/api.js.map +1 -1
- package/dist/cloud/oci/buildApi.d.ts +2 -0
- package/dist/cloud/oci/buildApi.js +10 -9
- package/dist/cloud/oci/buildApi.js.map +1 -1
- package/dist/cloud/oci/builder.d.ts +14 -1
- package/dist/cloud/oci/builder.js +46 -14
- package/dist/cloud/oci/builder.js.map +1 -1
- package/dist/cloud/oci/driver.d.ts +1 -1
- package/dist/cloud/oci/driver.js +21 -21
- package/dist/cloud/oci/driver.js.map +1 -1
- package/dist/cloud/oci/errors.d.ts +13 -0
- package/dist/cloud/oci/errors.js +16 -0
- package/dist/cloud/oci/errors.js.map +1 -0
- package/dist/cloud/oci/resourceApi.js +22 -22
- package/dist/cloud/oci/resourceApi.js.map +1 -1
- package/dist/cloud/oci/resourceMap.d.ts +3 -3
- package/dist/cloud/oci/resourceMap.js +3 -3
- package/dist/cloud/oci/resourceMap.js.map +1 -1
- package/dist/cloud/oci/rmApi.js +7 -7
- package/dist/cloud/oci/rmApi.js.map +1 -1
- package/dist/cloud/oci/stackVars.d.ts +1 -1
- package/dist/cloud/oci/stackVars.js +2 -2
- package/dist/cloud/oci/stackVars.js.map +1 -1
- package/dist/cluster/chris.d.ts +156 -0
- package/dist/cluster/chris.js +493 -0
- package/dist/cluster/chris.js.map +1 -0
- package/dist/cluster/fakeKube.d.ts +6 -0
- package/dist/cluster/fakeKube.js +21 -0
- package/dist/cluster/fakeKube.js.map +1 -1
- package/dist/cluster/kubeHttp.d.ts +7 -0
- package/dist/cluster/kubeHttp.js +26 -1
- package/dist/cluster/kubeHttp.js.map +1 -1
- package/dist/commands/build.d.ts +18 -0
- package/dist/commands/build.js +63 -17
- package/dist/commands/build.js.map +1 -1
- package/dist/commands/capacity.d.ts +1 -1
- package/dist/commands/capacity.js +2 -2
- package/dist/commands/capacity.js.map +1 -1
- package/dist/commands/size.js +10 -6
- package/dist/commands/size.js.map +1 -1
- package/dist/commands/verify.js +4 -14
- package/dist/commands/verify.js.map +1 -1
- package/dist/domain/adopt.d.ts +11 -1
- package/dist/domain/adopt.js +26 -2
- package/dist/domain/adopt.js.map +1 -1
- package/dist/domain/readout.d.ts +8 -13
- package/dist/domain/readout.js +26 -24
- package/dist/domain/readout.js.map +1 -1
- package/dist/domain/sizing.d.ts +1 -1
- package/dist/domain/sizing.js +3 -3
- package/dist/domain/sizing.js.map +1 -1
- package/dist/domain/spec.d.ts +1 -1
- package/dist/domain/spec.js +1 -1
- package/dist/domain/spec.js.map +1 -1
- package/dist/domain/state.d.ts +2 -2
- package/dist/domain/state.js +11 -11
- package/dist/domain/state.js.map +1 -1
- package/dist/domain/steps.d.ts +18 -20
- package/dist/domain/steps.js +111 -10
- package/dist/domain/steps.js.map +1 -1
- package/dist/domain/verify.d.ts +39 -0
- package/dist/domain/verify.js +64 -17
- package/dist/domain/verify.js.map +1 -1
- package/dist/domain/view.d.ts +1 -1
- package/dist/domain/view.js +3 -3
- package/dist/domain/view.js.map +1 -1
- package/dist/domains/harborOci.d.ts +1 -1
- package/dist/domains/harborOci.js +1 -1
- package/dist/domains/harborOci.js.map +1 -1
- package/dist/index.d.ts +7 -7
- package/dist/index.js +7 -7
- package/dist/index.js.map +1 -1
- package/dist/names.d.ts +1 -1
- package/dist/names.js +2 -2
- package/dist/names.js.map +1 -1
- package/dist/prompt.d.ts +1 -1
- package/dist/prompt.js +2 -2
- package/dist/prompt.js.map +1 -1
- package/dist/stratus.js +3 -2
- package/dist/stratus.js.map +1 -1
- package/dist/vfs/domains.js +2 -2
- package/dist/vfs/domains.js.map +1 -1
- package/dist/vfs/resources.d.ts +4 -4
- package/dist/vfs/resources.js +14 -14
- package/dist/vfs/resources.js.map +1 -1
- package/dist/vfs/tenancy.d.ts +3 -3
- package/dist/vfs/tenancy.js +10 -10
- package/dist/vfs/tenancy.js.map +1 -1
- package/manifests/tenant.mise +8 -10
- package/package.json +7 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kubeHttp.js","sourceRoot":"","sources":["../../src/cluster/kubeHttp.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAiC,MAAM,WAAW,CAAC;AAErE,mDAAmD;AACnD,MAAM,eAAe,GAAW,MAAM,CAAC;AAEvC;;;;;;;;GAQG;AACH,SAAS,IAAI,CAAC,MAAkB,EAAE,MAAc,EAAE,IAAY,EAAE,IAAc;IAC5E,MAAM,GAAG,GAAQ,IAAI,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAuB,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC1F,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;QAC3C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;YACvB,MAAM;YACN,OAAO,EAAE,eAAe;YACxB,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,GAAG,CAAC,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,OAAO,EAAE;gBACP,MAAM,EAAE,uBAAuB;gBAC/B,GAAG,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7E,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvH;SACF,EAAE,CAAC,GAAG,EAAQ,EAAE;YACf,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAQ,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAS,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACrH,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAS,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,kBAAkB,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACxB,IAAI,OAAO,KAAK,SAAS;YAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9C,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,MAAkB;IAC7C,MAAM,EAAE,GAAG,KAAK,EAAE,MAAc,EAAE,IAAY,EAAE,IAAc,EAAmB,EAAE;QACjF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"kubeHttp.js","sourceRoot":"","sources":["../../src/cluster/kubeHttp.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/build.d.ts
CHANGED
|
@@ -58,6 +58,24 @@ export declare function options_read(words: ReadonlyArray<string>, known: Readon
|
|
|
58
58
|
* @returns `E5 · plane 3 × 8 vCPU 24 GiB · …`.
|
|
59
59
|
*/
|
|
60
60
|
export declare function spec_line(spec: DomainSpec): string;
|
|
61
|
+
/**
|
|
62
|
+
* The DNS zones the tenancy holds, by name; none when the cloud cannot say.
|
|
63
|
+
*
|
|
64
|
+
* @param context - The session.
|
|
65
|
+
* @param region - The region the calls go through.
|
|
66
|
+
* @returns The zones' names.
|
|
67
|
+
*/
|
|
68
|
+
export declare function dnsZones_read(context: BuildCommandContext, region: string): Promise<string[]>;
|
|
69
|
+
/**
|
|
70
|
+
* The zone a new domain's names live under when none is named: the session's,
|
|
71
|
+
* else the tenancy's only one; null when there is none, or several to choose
|
|
72
|
+
* between.
|
|
73
|
+
*
|
|
74
|
+
* @param context - The session.
|
|
75
|
+
* @param zones - The tenancy's zones.
|
|
76
|
+
* @returns The zone, or null.
|
|
77
|
+
*/
|
|
78
|
+
export declare function baseDomain_default(context: BuildCommandContext, zones: ReadonlyArray<string>): string | null;
|
|
61
79
|
/**
|
|
62
80
|
* `domain new <name> [options]`.
|
|
63
81
|
*
|
package/dist/commands/build.js
CHANGED
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
import chalk from 'chalk';
|
|
17
17
|
import { envelope_error, envelope_ok, STRATUS_DOMAIN_STATE_EVENT, taskState_isOver } from '@fnndsc/menu';
|
|
18
18
|
import { commandCancellation_enable, commandCancellation_signalGet, JobRefusal, repl_confirm, repl_question, repl_questionHidden, runner_get, sink_dataLine, sink_get, surface_get, } from '@fnndsc/brasa/core';
|
|
19
|
-
import { planCounts_alter,
|
|
19
|
+
import { planCounts_alter, plan_count, planCounts_words } from '../cloud/builder.js';
|
|
20
20
|
import { adoption_keep, adoptRun_make, checkout_read } from '../domain/adopt.js';
|
|
21
21
|
import { DOMAIN_NAME } from '../domain/state.js';
|
|
22
22
|
import { SPEC_DEFAULT, specOptions_apply } from '../domain/spec.js';
|
|
23
|
-
import { cost_words, familyShape_find,
|
|
23
|
+
import { cost_words, familyShape_find, specCost_compute, specFit_read } from '../domain/sizing.js';
|
|
24
24
|
import { domainSummary_read } from '../domain/readout.js';
|
|
25
|
-
import { BUILD_STEPS, buildJob_id, buildRun_make, FIRST_BILLING_STEP, planRun_make,
|
|
25
|
+
import { BUILD_STEPS, buildJob_id, buildRun_make, FIRST_BILLING_STEP, planRun_make, stepNext_find, STEPS_SOURCE, STEPS_WRITTEN } from '../domain/steps.js';
|
|
26
26
|
/**
|
|
27
27
|
* Shows a domain as the host knows it, as a `stratus.domain.state` event: at
|
|
28
28
|
* a build's start, on each line it logs and before each question,
|
|
@@ -76,6 +76,35 @@ export function spec_line(spec) {
|
|
|
76
76
|
const workers = spec.workers.count === 0 ? 'workers 0 (compact)' : `workers ${spec.workers.count} × ${spec.workers.vcpu} vCPU ${spec.workers.ramGib} GiB`;
|
|
77
77
|
return `${spec.family} · plane ${spec.controlPlane.count} × ${spec.controlPlane.vcpu} vCPU ${spec.controlPlane.ramGib} GiB · ${workers} · ChRIS data ${spec.chris.dataGib} GiB`;
|
|
78
78
|
}
|
|
79
|
+
/**
|
|
80
|
+
* The DNS zones the tenancy holds, by name; none when the cloud cannot say.
|
|
81
|
+
*
|
|
82
|
+
* @param context - The session.
|
|
83
|
+
* @param region - The region the calls go through.
|
|
84
|
+
* @returns The zones' names.
|
|
85
|
+
*/
|
|
86
|
+
export async function dnsZones_read(context, region) {
|
|
87
|
+
if (context.builder?.zones_list === undefined)
|
|
88
|
+
return [];
|
|
89
|
+
try {
|
|
90
|
+
return await context.builder.zones_list(region);
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return [];
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* The zone a new domain's names live under when none is named: the session's,
|
|
98
|
+
* else the tenancy's only one; null when there is none, or several to choose
|
|
99
|
+
* between.
|
|
100
|
+
*
|
|
101
|
+
* @param context - The session.
|
|
102
|
+
* @param zones - The tenancy's zones.
|
|
103
|
+
* @returns The zone, or null.
|
|
104
|
+
*/
|
|
105
|
+
export function baseDomain_default(context, zones) {
|
|
106
|
+
return context.baseDomain ?? (zones.length === 1 ? zones[0] : null);
|
|
107
|
+
}
|
|
79
108
|
/**
|
|
80
109
|
* `domain new <name> [options]`.
|
|
81
110
|
*
|
|
@@ -97,9 +126,16 @@ export async function domainNew_run(context, args) {
|
|
|
97
126
|
const region = context.region();
|
|
98
127
|
if (region === null)
|
|
99
128
|
return envelope_error('', undefined, 'domain new: not connected\n');
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
129
|
+
// The zone is found where it lives (D14): named, it must be one the tenancy holds; unnamed, the tenancy's only one.
|
|
130
|
+
const zones = await dnsZones_read(context, region);
|
|
131
|
+
const named = read.options.get('--base-domain');
|
|
132
|
+
if (named !== undefined && zones.length > 0 && !zones.includes(named))
|
|
133
|
+
return envelope_error('', undefined, `domain new: --base-domain ${named}: no such zone in the tenancy (${zones.join(', ')})\n`);
|
|
134
|
+
const baseDomain = named ?? baseDomain_default(context, zones);
|
|
135
|
+
if (baseDomain === null) {
|
|
136
|
+
const why = zones.length === 0 ? 'the tenancy holds no DNS zone to find' : `the tenancy holds ${zones.length}: ${zones.join(', ')}`;
|
|
137
|
+
return envelope_error('', undefined, `domain new: --base-domain <zone> is needed: the DNS zone the cluster's names live under (${why})\n`);
|
|
138
|
+
}
|
|
103
139
|
const sized = specOptions_apply(SPEC_DEFAULT, new Map([...read.options].filter(([option]) => option !== '--base-domain' && option !== '--compartment')));
|
|
104
140
|
const compartmentId = read.options.get('--compartment');
|
|
105
141
|
if ('error' in sized)
|
|
@@ -107,7 +143,7 @@ export async function domainNew_run(context, args) {
|
|
|
107
143
|
const record = { name, created: new Date().toISOString(), region, baseDomain, steps: {}, ids: {}, protected: true, ...(compartmentId !== undefined ? { compartmentId } : {}) };
|
|
108
144
|
context.store.create(record, sized.spec);
|
|
109
145
|
const lines = [
|
|
110
|
-
`${chalk.bold(name)} ${name}.${baseDomain} spec written: ${context.store.
|
|
146
|
+
`${chalk.bold(name)} ${name}.${baseDomain} spec written: ${context.store.folder_derive(name)}/spec.yaml`,
|
|
111
147
|
` ${spec_line(sized.spec)}`,
|
|
112
148
|
chalk.gray(`Nothing is made in the tenancy until domain build ${name}; domain plan ${name} says what it takes and costs.`),
|
|
113
149
|
];
|
|
@@ -148,7 +184,7 @@ function builtDomain_need(context, verb, name) {
|
|
|
148
184
|
async function cost_read(context, region, spec) {
|
|
149
185
|
const shape = familyShape_find(await context.driver.shapes_list(region), spec.family);
|
|
150
186
|
const prices = await context.driver.prices_list();
|
|
151
|
-
return
|
|
187
|
+
return specCost_compute(spec, shape, prices);
|
|
152
188
|
}
|
|
153
189
|
/**
|
|
154
190
|
* Whether the session may start jobs: the `tasks` tier.
|
|
@@ -181,7 +217,7 @@ export async function domainPlan_run(context, args) {
|
|
|
181
217
|
lines.push(` ${fit.zone.padEnd(24)} ${fit.nodes.join(' ').padEnd(28)} ${room(fit.coresNeeded, fit.coresFree, 'cores')}, ${room(fit.memoryNeeded, fit.memoryFree, 'GiB')} ${verdict}`);
|
|
182
218
|
}
|
|
183
219
|
lines.push(`cost ${cost === null ? chalk.gray(`${spec.family} is not in the price list`) : chalk.yellow(cost_words(cost))}`);
|
|
184
|
-
const next =
|
|
220
|
+
const next = stepNext_find(record);
|
|
185
221
|
lines.push(`steps ${next === null ? 'every step done' : `next: ${next}`}`);
|
|
186
222
|
if (record.ids['stackRef'] !== undefined && tasks_granted() && context.builder !== null) {
|
|
187
223
|
const ran = await job_runFollowed(`${domain.name}-plan`, `plan ${domain.name}`, planRun_make(domain.name, context.builder, context.store));
|
|
@@ -193,7 +229,7 @@ export async function domainPlan_run(context, args) {
|
|
|
193
229
|
}
|
|
194
230
|
const planText = context.store.file_read(domain.name, 'plan.json');
|
|
195
231
|
if (planText !== null) {
|
|
196
|
-
const counts =
|
|
232
|
+
const counts = plan_count(JSON.parse(planText));
|
|
197
233
|
lines.push(`plan ${planCounts_words(counts)}${planCounts_alter(counts) ? chalk.red(' · an apply would touch what exists: refused unless allowed by name') : ''}`);
|
|
198
234
|
if (record.adopted !== undefined)
|
|
199
235
|
lines.push(chalk.gray(` adopted from ${record.adopted.from}: planned against, never built on`));
|
|
@@ -217,7 +253,7 @@ export async function domainPlan_run(context, args) {
|
|
|
217
253
|
async function run_follow(runner, id, shown) {
|
|
218
254
|
commandCancellation_enable();
|
|
219
255
|
const signal = commandCancellation_signalGet();
|
|
220
|
-
return runner.
|
|
256
|
+
return runner.job_followAside(STEPS_SOURCE, id, (line) => { sink_dataLine(line); shown?.(); }, signal);
|
|
221
257
|
}
|
|
222
258
|
/**
|
|
223
259
|
* Starts a job and follows it to its end.
|
|
@@ -258,7 +294,7 @@ export async function job_runFollowed(id, label, run) {
|
|
|
258
294
|
*/
|
|
259
295
|
async function billing_question(context, name, record, spec) {
|
|
260
296
|
const planText = context.store.file_read(name, 'plan.json');
|
|
261
|
-
const created = planText === null ? 0 :
|
|
297
|
+
const created = planText === null ? 0 : plan_count(JSON.parse(planText)).create;
|
|
262
298
|
const cost = await cost_read(context, record.region, spec);
|
|
263
299
|
return `${FIRST_BILLING_STEP} creates ${created} resources. Billing starts at ${cost === null ? 'an unpriced rate' : cost_words(cost)}. Continue? [y/N]`;
|
|
264
300
|
}
|
|
@@ -325,7 +361,7 @@ export async function domainBuild_run(context, args) {
|
|
|
325
361
|
context.store.record_update(name, (current) => { current.billingAccepted = new Date().toISOString(); });
|
|
326
362
|
continue;
|
|
327
363
|
}
|
|
328
|
-
const next =
|
|
364
|
+
const next = stepNext_find(record);
|
|
329
365
|
const summary = next === null
|
|
330
366
|
? `${name}: every step done`
|
|
331
367
|
: !STEPS_WRITTEN.includes(next) ? `${name}: built through ${BUILD_STEPS[BUILD_STEPS.indexOf(next) - 1] ?? ''}; ${next} and after are not steps this session has yet`
|
|
@@ -346,7 +382,7 @@ async function account_askWhenMissing(context, record, through) {
|
|
|
346
382
|
const account = context.account;
|
|
347
383
|
if (account === undefined || account.present())
|
|
348
384
|
return null;
|
|
349
|
-
const next =
|
|
385
|
+
const next = stepNext_find(record);
|
|
350
386
|
const needs = next !== null && BUILD_STEPS.indexOf(next) <= BUILD_STEPS.indexOf('cluster')
|
|
351
387
|
&& (through === undefined || BUILD_STEPS.indexOf(through) >= BUILD_STEPS.indexOf('cluster'));
|
|
352
388
|
if (!needs)
|
|
@@ -388,13 +424,23 @@ export async function domainAdopt_run(context, args) {
|
|
|
388
424
|
if (kept === null) {
|
|
389
425
|
adoption_keep(context.store, checkout);
|
|
390
426
|
lines.push(`${chalk.bold(name)} ${name}.${checkout.record.baseDomain} adopted from ${from}`);
|
|
391
|
-
lines.push(` kept here: its ids (${Object.keys(checkout.record.ids).join(', ')}), its spec, its settings, its secrets (${checkout.secrets.map((secret) => secret.name).join(', ') || 'none'}) in ${context.store.
|
|
427
|
+
lines.push(` kept here: its ids (${Object.keys(checkout.record.ids).join(', ')}), its spec, its settings, its secrets (${checkout.secrets.map((secret) => secret.name).join(', ') || 'none'}) in ${context.store.folder_derive(name)}`);
|
|
392
428
|
}
|
|
393
429
|
else if (kept.adopted === undefined) {
|
|
394
430
|
return envelope_error('', undefined, `domain adopt: ${name}: a domain of that name was built here\n`);
|
|
395
431
|
}
|
|
396
|
-
else
|
|
397
|
-
|
|
432
|
+
else {
|
|
433
|
+
// An adopted domain catches up with steps the checkout shows done that this session had no name for when it was adopted.
|
|
434
|
+
const caught = Object.keys(checkout.record.steps).filter((step) => kept.steps[step] === undefined);
|
|
435
|
+
if (caught.length > 0) {
|
|
436
|
+
context.store.record_update(name, (current) => {
|
|
437
|
+
for (const step of caught)
|
|
438
|
+
current.steps[step] = checkout.record.steps[step];
|
|
439
|
+
});
|
|
440
|
+
lines.push(`${chalk.bold(name)}: caught up from ${from}: ${caught.join(', ')}`);
|
|
441
|
+
}
|
|
442
|
+
if (kept.ids['stackRef'] !== undefined)
|
|
443
|
+
return envelope_ok(`${[...lines, `${name}: already adopted; its stack is ${kept.ids['stackRef']}`].join('\n')}\n`);
|
|
398
444
|
}
|
|
399
445
|
if (!tasks_granted()) {
|
|
400
446
|
lines.push(chalk.gray(` its stack and Terraform state go to Resource Manager with the tasks tier: domain adopt ${name} --from ${from} again, under stratus --host-control tasks`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export interface CapacityCommandContext {
|
|
|
15
15
|
* @param spec - The spec's text.
|
|
16
16
|
* @returns The family.
|
|
17
17
|
*/
|
|
18
|
-
export declare function
|
|
18
|
+
export declare function specFamily_parse(spec: string | null): string | null;
|
|
19
19
|
/**
|
|
20
20
|
* The capacity rows for families in a region.
|
|
21
21
|
*
|
|
@@ -18,7 +18,7 @@ import { envelope_error, envelope_ok, STRATUS_CAPACITY_MODEL_KIND } from '@fnnds
|
|
|
18
18
|
* @param spec - The spec's text.
|
|
19
19
|
* @returns The family.
|
|
20
20
|
*/
|
|
21
|
-
export function
|
|
21
|
+
export function specFamily_parse(spec) {
|
|
22
22
|
const match = spec?.match(/^family:\s*([A-Za-z0-9.]+)/m) ?? null;
|
|
23
23
|
return match?.[1] ?? null;
|
|
24
24
|
}
|
|
@@ -70,7 +70,7 @@ export async function capacity_run(context, args) {
|
|
|
70
70
|
return envelope_error('', undefined, 'capacity: not connected\n');
|
|
71
71
|
const families = args.length > 0
|
|
72
72
|
? [...args]
|
|
73
|
-
: [...new Set(context.domains.domains_read().map((domain) =>
|
|
73
|
+
: [...new Set(context.domains.domains_read().map((domain) => specFamily_parse(domain.spec)).filter((family) => family !== null))];
|
|
74
74
|
if (families.length === 0)
|
|
75
75
|
return envelope_error('', undefined, 'capacity: name a shape family (capacity E5); no domain\'s spec names one\n');
|
|
76
76
|
const rows = await capacityRows_read(context.driver, region, families);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capacity.js","sourceRoot":"","sources":["../../src/commands/capacity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,2BAA2B,EAA8D,MAAM,cAAc,CAAC;AAcpJ;;;;;GAKG;AACH,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"capacity.js","sourceRoot":"","sources":["../../src/commands/capacity.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/size.js
CHANGED
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
* against in the session's region, read and never written (docs/stratus.adoc,
|
|
4
4
|
* D13, SIZE): each availability domain's free cores and memory for the
|
|
5
5
|
* family, the family's flexible shape and price, what storage and load
|
|
6
|
-
* balancing cost,
|
|
6
|
+
* balancing cost, the spec a new domain starts from, and the DNS zones its
|
|
7
|
+
* names may live under (the tenancy's only one is the default).
|
|
7
8
|
*
|
|
8
9
|
* The answer carries the `stratus.domain.size` model, so a surface redraws
|
|
9
10
|
* fit and cost as its levers move without a line per move; what it shows is
|
|
@@ -16,7 +17,7 @@ import { envelope_error, envelope_ok, STRATUS_DOMAIN_SIZE_MODEL_KIND } from '@fn
|
|
|
16
17
|
import { capacityRows_read } from './capacity.js';
|
|
17
18
|
import { familyShape_find } from '../domain/sizing.js';
|
|
18
19
|
import { SPEC_DEFAULT } from '../domain/spec.js';
|
|
19
|
-
import { options_read, spec_line } from './build.js';
|
|
20
|
+
import { baseDomain_default, dnsZones_read, options_read, spec_line } from './build.js';
|
|
20
21
|
/**
|
|
21
22
|
* What a limit leaves free in a zone, by a word in its name (`core`, `memory`).
|
|
22
23
|
*
|
|
@@ -25,7 +26,7 @@ import { options_read, spec_line } from './build.js';
|
|
|
25
26
|
* @param word - The word.
|
|
26
27
|
* @returns What is free, or null when the cloud does not say.
|
|
27
28
|
*/
|
|
28
|
-
function
|
|
29
|
+
function free_find(rows, zone, word) {
|
|
29
30
|
return rows.find((row) => row.zone === zone && row.limit.includes(word))?.available ?? null;
|
|
30
31
|
}
|
|
31
32
|
/**
|
|
@@ -49,11 +50,12 @@ export async function domainSize_run(context, args) {
|
|
|
49
50
|
const shape = familyShape_find(shapes, family);
|
|
50
51
|
if (shape === undefined)
|
|
51
52
|
return envelope_error('', undefined, `domain size: ${family}: no such family in ${region} (${[...new Set(shapes.map((each) => each.family))].sort().join(', ')})\n`);
|
|
52
|
-
const [zones, prices, services, rows] = await Promise.all([
|
|
53
|
+
const [zones, prices, services, rows, dnsZones] = await Promise.all([
|
|
53
54
|
context.driver.zones_list(region),
|
|
54
55
|
context.driver.prices_list(),
|
|
55
56
|
context.driver.servicePrices_get(),
|
|
56
57
|
capacityRows_read(context.driver, region, [family]),
|
|
58
|
+
dnsZones_read(context, region),
|
|
57
59
|
]);
|
|
58
60
|
const price = prices.find((entry) => entry.shape === shape.name);
|
|
59
61
|
const model = {
|
|
@@ -63,17 +65,19 @@ export async function domainSize_run(context, args) {
|
|
|
63
65
|
vcpuPerCore: shape.vcpuPerCore,
|
|
64
66
|
cores: shape.flexible ? { ...shape.cores } : null,
|
|
65
67
|
memoryGib: shape.flexible ? { ...shape.memoryGib } : null,
|
|
66
|
-
zones: zones.map((zone) => ({ zone: zone.name, coresFree:
|
|
68
|
+
zones: zones.map((zone) => ({ zone: zone.name, coresFree: free_find(rows, zone.name, 'core'), memoryFree: free_find(rows, zone.name, 'memory') })),
|
|
67
69
|
price: price === undefined ? null : { vcpuHour: price.vcpuHour, gibHour: price.gibHour, currency: price.currency },
|
|
68
70
|
services: services === null ? null : { volumeGibMonth: services.volumeGibMonth, vpuGibMonth: services.vpuGibMonth, balancerHour: services.balancerHour, balancerMbpsHour: services.balancerMbpsHour },
|
|
69
71
|
start: { ...SPEC_DEFAULT, family: shape.family },
|
|
70
|
-
baseDomain: context
|
|
72
|
+
baseDomain: baseDomain_default(context, dnsZones),
|
|
73
|
+
dnsZones,
|
|
71
74
|
};
|
|
72
75
|
const free = (value) => value === null ? '?' : String(value);
|
|
73
76
|
const lines = [
|
|
74
77
|
`${chalk.bold(shape.family)} ${shape.name} in ${region}${price === undefined ? chalk.gray(' not in the price list') : ` ${price.currency} ${price.vcpuHour} a vCPU-hour, ${price.gibHour} a GiB-hour`}`,
|
|
75
78
|
...model.zones.map((zone) => ` ${zone.zone.padEnd(24)} ${free(zone.coresFree)} cores, ${free(zone.memoryFree)} GiB free`),
|
|
76
79
|
chalk.gray(`starts from: ${spec_line(model.start)}`),
|
|
80
|
+
model.baseDomain !== null ? chalk.gray(`names under: ${model.baseDomain}`) : chalk.yellow(`names under: none chosen; domain new --base-domain names one (${dnsZones.join(', ') || 'the tenancy holds no DNS zone'})`),
|
|
77
81
|
];
|
|
78
82
|
return envelope_ok(`${lines.join('\n')}\n`, { kind: STRATUS_DOMAIN_SIZE_MODEL_KIND, data: model });
|
|
79
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../src/commands/size.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"size.js","sourceRoot":"","sources":["../../src/commands/size.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/verify.js
CHANGED
|
@@ -13,9 +13,8 @@ import { envelope_error, envelope_ok } from '@fnndsc/menu';
|
|
|
13
13
|
import { commandCancellation_enable, commandCancellation_signalGet, surface_get } from '@fnndsc/brasa/core';
|
|
14
14
|
import { kubeconfig_read } from '../cluster/kube.js';
|
|
15
15
|
import { httpsStatus_get, kubeApi_make } from '../cluster/kubeHttp.js';
|
|
16
|
-
import { VERIFY_FILE } from '../domain/readout.js';
|
|
17
16
|
import { familyShape_find } from '../domain/sizing.js';
|
|
18
|
-
import { verify_run } from '../domain/verify.js';
|
|
17
|
+
import { verify_run, verifyChecks_keep } from '../domain/verify.js';
|
|
19
18
|
/** The resolver `verify` asks, as `harbor-oci` did: one outside the tenancy. */
|
|
20
19
|
export const PUBLIC_RESOLVER = '8.8.8.8';
|
|
21
20
|
/**
|
|
@@ -85,18 +84,9 @@ export async function domainVerify_run(context, reach, args) {
|
|
|
85
84
|
pollMs: reach.pollMs,
|
|
86
85
|
...(commandCancellation_signalGet() !== undefined ? { signal: commandCancellation_signalGet() } : {}),
|
|
87
86
|
});
|
|
88
|
-
const
|
|
89
|
-
const
|
|
90
|
-
const failed = ran.length - passed;
|
|
91
|
-
const skipped = checks.length - ran.length;
|
|
92
|
-
const summary = `${passed} of ${checks.length} pass${failed > 0 ? `, ${failed} fail` : ''}${skipped > 0 ? `, ${skipped} not run (needs the tasks tier)` : ''}`;
|
|
93
|
-
const at = new Date().toISOString();
|
|
94
|
-
context.store.record_update(name, (current) => {
|
|
95
|
-
current.steps['verify'] = { state: failed > 0 ? 'failed' : 'done', ended: at, note: summary };
|
|
96
|
-
});
|
|
97
|
-
const verified = { at, checks: checks.map((check) => ({ name: check.name, ok: check.ok, detail: check.detail, how: check.how })) };
|
|
98
|
-
context.store.file_write(name, VERIFY_FILE, `${JSON.stringify(verified, null, 2)}\n`);
|
|
87
|
+
const summary = verifyChecks_keep(context.store, name, checks);
|
|
88
|
+
const failed = checks.some((check) => check.ok === false);
|
|
99
89
|
const text = [`${chalk.bold(name)} ${name}.${record.baseDomain}`, ...checks.map(check_line), `verify: ${summary}`].join('\n');
|
|
100
|
-
return failed
|
|
90
|
+
return failed ? { ...envelope_error(`${text}\n`), renderedErr: '' } : envelope_ok(`${text}\n`);
|
|
101
91
|
}
|
|
102
92
|
//# sourceMappingURL=verify.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/commands/verify.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,QAAQ,IAAI,GAAG,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,WAAW,EAAwB,MAAM,cAAc,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC5G,OAAO,EAAE,eAAe,EAAgB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/commands/verify.ts"],"names":[],"mappings":"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"}
|
package/dist/domain/adopt.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { JobRun } from '@fnndsc/brasa/core';
|
|
|
2
2
|
import { type HarborDomain } from '../domains/harborOci.js';
|
|
3
3
|
import type { CloudBuilder } from '../cloud/builder.js';
|
|
4
4
|
import { type DomainSpec } from './spec.js';
|
|
5
|
-
import type { DomainRecord, DomainStore } from './state.js';
|
|
5
|
+
import type { DomainRecord, DomainStore, StepRecord } from './state.js';
|
|
6
6
|
/** What adoption reads from a checkout. */
|
|
7
7
|
export interface CheckoutRead {
|
|
8
8
|
readonly domain: HarborDomain;
|
|
@@ -35,6 +35,16 @@ export declare function variables_stringify(tfvars: Readonly<Record<string, unkn
|
|
|
35
35
|
* @param now - The clock.
|
|
36
36
|
* @returns What it read, or why it cannot be adopted.
|
|
37
37
|
*/
|
|
38
|
+
/**
|
|
39
|
+
* The ChRIS steps a checkout already did, from what `harbor-oci` left in its
|
|
40
|
+
* state: it keeps no record of them, but the test user's password is made by
|
|
41
|
+
* its seed (which needs the deploy), and its smoke journey's log ends with
|
|
42
|
+
* the verdict. Its `postinstall` was a placeholder, and OCI needs none.
|
|
43
|
+
*
|
|
44
|
+
* @param root - The checkout.
|
|
45
|
+
* @returns The steps it shows done.
|
|
46
|
+
*/
|
|
47
|
+
export declare function chrisSteps_read(root: string): Record<string, StepRecord>;
|
|
38
48
|
export declare function checkout_read(name: string, root: string, now: Date): CheckoutRead | {
|
|
39
49
|
error: string;
|
|
40
50
|
};
|
package/dist/domain/adopt.js
CHANGED
|
@@ -19,7 +19,8 @@ import { existsSync, readFileSync } from 'node:fs';
|
|
|
19
19
|
import { join } from 'node:path';
|
|
20
20
|
import { envFile_parse, harborDomain_read } from '../domains/harborOci.js';
|
|
21
21
|
import { specYaml_parse, SPEC_DEFAULT } from './spec.js';
|
|
22
|
-
import {
|
|
22
|
+
import { smokeVerdict_words } from '../cluster/chris.js';
|
|
23
|
+
import { MACHINE_STEPS } from './steps.js';
|
|
23
24
|
import { ADOPTED_COMPARTMENT } from './view.js';
|
|
24
25
|
/** The secrets a domain keeps from its checkout. */
|
|
25
26
|
const KEPT_SECRETS = ['kubeconfig', 'kubeadmin-password'];
|
|
@@ -43,6 +44,28 @@ export function variables_stringify(tfvars) {
|
|
|
43
44
|
* @param now - The clock.
|
|
44
45
|
* @returns What it read, or why it cannot be adopted.
|
|
45
46
|
*/
|
|
47
|
+
/**
|
|
48
|
+
* The ChRIS steps a checkout already did, from what `harbor-oci` left in its
|
|
49
|
+
* state: it keeps no record of them, but the test user's password is made by
|
|
50
|
+
* its seed (which needs the deploy), and its smoke journey's log ends with
|
|
51
|
+
* the verdict. Its `postinstall` was a placeholder, and OCI needs none.
|
|
52
|
+
*
|
|
53
|
+
* @param root - The checkout.
|
|
54
|
+
* @returns The steps it shows done.
|
|
55
|
+
*/
|
|
56
|
+
export function chrisSteps_read(root) {
|
|
57
|
+
const steps = { postinstall: { state: 'done', note: 'nothing to do after the install on this cloud' } };
|
|
58
|
+
if (!existsSync(join(root, 'state', 'auth', 'chris-test-user-password')))
|
|
59
|
+
return steps;
|
|
60
|
+
steps['chris-deploy'] = { state: 'done', note: 'done before adoption (harbor-oci: ChRIS seeded, so deployed)' };
|
|
61
|
+
steps['chris-seed'] = { state: 'done', note: 'done before adoption (harbor-oci: the test user\'s password is kept)' };
|
|
62
|
+
const smokeLog = join(root, 'state', 'smoke.log');
|
|
63
|
+
const last = existsSync(smokeLog) ? readFileSync(smokeLog, 'utf-8').trim().split('\n').pop() ?? '' : '';
|
|
64
|
+
const words = smokeVerdict_words(last);
|
|
65
|
+
if (words.startsWith('pass'))
|
|
66
|
+
steps['smoke'] = { state: 'done', note: `done before adoption (harbor-oci: ${words})` };
|
|
67
|
+
return steps;
|
|
68
|
+
}
|
|
46
69
|
export function checkout_read(name, root, now) {
|
|
47
70
|
if (!existsSync(join(root, 'config.env')))
|
|
48
71
|
return { error: `${root}: not a harbor-oci checkout (no config.env)` };
|
|
@@ -75,10 +98,11 @@ export function checkout_read(name, root, now) {
|
|
|
75
98
|
const steps = {};
|
|
76
99
|
for (const step of domain.steps) {
|
|
77
100
|
// The cluster runs, so every step through run happened, whatever the host kept to show it.
|
|
78
|
-
if (
|
|
101
|
+
if (MACHINE_STEPS.includes(step.name))
|
|
79
102
|
steps[step.name] = { state: 'done', note: `done before adoption (harbor-oci: ${step.state}, ${step.evidence})` };
|
|
80
103
|
}
|
|
81
104
|
steps['compartment'] = { ...ADOPTED_COMPARTMENT };
|
|
105
|
+
Object.assign(steps, chrisSteps_read(root));
|
|
82
106
|
const ids = {};
|
|
83
107
|
for (const [key, field] of [['clusterId', 'assistedClusterId'], ['infraEnvId', 'assistedInfraEnvId'], ['isoObject', 'isoObjectName']]) {
|
|
84
108
|
if (typeof harbor[field] === 'string')
|