@cat-factory/cli 0.13.1 → 0.13.2
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/dist/k3s-handler.d.ts +12 -2
- package/dist/k3s-handler.d.ts.map +1 -1
- package/dist/k3s-handler.js +12 -2
- package/dist/k3s-handler.js.map +1 -1
- package/dist/k3s-ingress.d.ts +24 -5
- package/dist/k3s-ingress.d.ts.map +1 -1
- package/dist/k3s-ingress.js +24 -5
- package/dist/k3s-ingress.js.map +1 -1
- package/dist/k3s.js +4 -4
- package/dist/k3s.js.map +1 -1
- package/package.json +4 -4
package/dist/k3s-handler.d.ts
CHANGED
|
@@ -6,8 +6,18 @@ import { type ResolvedConnection } from './k3s-provision.js';
|
|
|
6
6
|
* `registerEnvironmentHandlerSchema`, so any drift from the contract fails a test).
|
|
7
7
|
*/
|
|
8
8
|
export declare const KUBERNETES_ENV_TOKEN_SECRET_KEY = "apiToken";
|
|
9
|
-
/**
|
|
10
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Default per-PR namespace name template written into the handler (rendered with the PR number).
|
|
11
|
+
*
|
|
12
|
+
* **The `pr` is load-bearing.** `cf-env-{{pullNumber}}` renders `cf-env-5`, and in front of
|
|
13
|
+
* `INGRESS_HOST_TEMPLATE` that composes `cf-env-5.127.0.0.1.nip.io`, which nip.io answers
|
|
14
|
+
* with **5.127.0.0**: these resolvers take the leftmost four-octet run in a name and read `-` as
|
|
15
|
+
* a separator, so the pull-request number becomes the first octet of an address on somebody
|
|
16
|
+
* else's network. Every pull number ends in a digit, so this was wrong on every provision and
|
|
17
|
+
* invisible until a run reached a step that actually opened the environment URL. Rendering `pr5`
|
|
18
|
+
* ends the label with a letter, which is not an octet, so the name carries one address again.
|
|
19
|
+
*/
|
|
20
|
+
export declare const DEFAULT_NAMESPACE_TEMPLATE = "cf-env-pr{{pullNumber}}";
|
|
11
21
|
/**
|
|
12
22
|
* The `RegisterEnvironmentHandlerInput` shape for the `local-k3s` engine, mirrored structurally
|
|
13
23
|
* here so the CLI stays free of a backend/contract runtime dependency. `k3s-handler.test.ts`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s-handler.d.ts","sourceRoot":"","sources":["../src/k3s-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,aAAa,CAAA;AAEzD
|
|
1
|
+
{"version":3,"file":"k3s-handler.d.ts","sourceRoot":"","sources":["../src/k3s-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,+BAA+B,aAAa,CAAA;AAEzD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,0BAA0B,4BAA4B,CAAA;AAEnE;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,YAAY,CAAA;IAC3B,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;QACnB,UAAU,EAAE;YACV,KAAK,EAAE,MAAM,CAAA;YACb,YAAY,EAAE,MAAM,CAAA;YACpB,qBAAqB,EAAE,IAAI,CAAA;YAC3B,iBAAiB,EAAE,MAAM,CAAA;YACzB,GAAG,EAAE;gBAAE,MAAM,EAAE,iBAAiB,CAAC;gBAAC,YAAY,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,CAAA;SACxF,CAAA;KACF,CAAA;IACD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,qGAAqG;AACrG,wBAAgB,YAAY,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAEnE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,GAAG,IAAI,CA0BtF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAgB3F"}
|
package/dist/k3s-handler.js
CHANGED
|
@@ -7,8 +7,18 @@ import {} from './k3s-provision.js';
|
|
|
7
7
|
* `registerEnvironmentHandlerSchema`, so any drift from the contract fails a test).
|
|
8
8
|
*/
|
|
9
9
|
export const KUBERNETES_ENV_TOKEN_SECRET_KEY = 'apiToken';
|
|
10
|
-
/**
|
|
11
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Default per-PR namespace name template written into the handler (rendered with the PR number).
|
|
12
|
+
*
|
|
13
|
+
* **The `pr` is load-bearing.** `cf-env-{{pullNumber}}` renders `cf-env-5`, and in front of
|
|
14
|
+
* `INGRESS_HOST_TEMPLATE` that composes `cf-env-5.127.0.0.1.nip.io`, which nip.io answers
|
|
15
|
+
* with **5.127.0.0**: these resolvers take the leftmost four-octet run in a name and read `-` as
|
|
16
|
+
* a separator, so the pull-request number becomes the first octet of an address on somebody
|
|
17
|
+
* else's network. Every pull number ends in a digit, so this was wrong on every provision and
|
|
18
|
+
* invisible until a run reached a step that actually opened the environment URL. Rendering `pr5`
|
|
19
|
+
* ends the label with a letter, which is not an octet, so the name carries one address again.
|
|
20
|
+
*/
|
|
21
|
+
export const DEFAULT_NAMESPACE_TEMPLATE = 'cf-env-pr{{pullNumber}}';
|
|
12
22
|
/** Human label for the auto-provisioned connection (names the created cluster when there is one). */
|
|
13
23
|
export function handlerLabel(connection) {
|
|
14
24
|
return connection.clusterName ? `Local k3s (${connection.clusterName})` : 'Local k3s';
|
package/dist/k3s-handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s-handler.js","sourceRoot":"","sources":["../src/k3s-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAA2B,MAAM,oBAAoB,CAAA;AAE5D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,UAAU,CAAA;AAEzD
|
|
1
|
+
{"version":3,"file":"k3s-handler.js","sourceRoot":"","sources":["../src/k3s-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAA2B,MAAM,oBAAoB,CAAA;AAE5D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,UAAU,CAAA;AAEzD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,yBAAyB,CAAA;AA2BnE,qGAAqG;AACrG,MAAM,UAAU,YAAY,CAAC,UAA8B;IACzD,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,CAAA;AACvF,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,eAAe,CAAC,UAA8B;IAC5D,MAAM,YAAY,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC5D,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,IAAI,CAAA;IACtC,MAAM,IAAI,GAAG,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC/C,OAAO;QACL,aAAa,EAAE,YAAY;QAC3B,MAAM,EAAE;YACN,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE;gBACV,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC;gBAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,qBAAqB,EAAE,IAAI;gBAC3B,iBAAiB,EAAE,0BAA0B;gBAC7C,GAAG,EAAE;oBACH,MAAM,EAAE,iBAAiB;oBACzB,YAAY;oBACZ,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;oBAClC,uFAAuF;oBACvF,sFAAsF;oBACtF,qFAAqF;oBACrF,MAAM,EAAE,MAAM;iBACf;aACF;SACF;QACD,OAAO,EAAE,EAAE,CAAC,+BAA+B,CAAC,EAAE,UAAU,CAAC,QAAQ,EAAE;KACpE,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,gBAAgB,CAAC,UAAkB,EAAE,UAA8B;IACjF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAC/B,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;IACrC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAA;IAC7C,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,YAAY,CAAC,CAAA;IACnD,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,CAAA;IAC3C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAA;QACvC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,YAAY,CAAC,CAAA;QAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS;YAAE,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,UAAU,CAAC,qBAAqB;QAAE,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAA;IAC9E,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;AACvB,CAAC"}
|
package/dist/k3s-ingress.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { type Command, type HostShell, type ShellResult } from './host-shell.js'
|
|
|
7
7
|
* 2. a HOST PORT published into it, because every local distribution runs the cluster inside
|
|
8
8
|
* Docker and forwards only the ports it was asked for at create time.
|
|
9
9
|
*
|
|
10
|
-
* Both were previously assumed. `cat-factory k3s` printed
|
|
10
|
+
* Both were previously assumed. `cat-factory k3s` printed its nip.io host template as wired
|
|
11
11
|
* on every path, including a reused cluster it had never looked at, and the failure landed at the
|
|
12
12
|
* `tester` step against a URL that answered nothing: environment readiness is WORKLOAD readiness,
|
|
13
13
|
* so provisioning still reported success.
|
|
@@ -23,9 +23,20 @@ import { type Command, type HostShell, type ShellResult } from './host-shell.js'
|
|
|
23
23
|
*/
|
|
24
24
|
export declare const DEFAULT_INGRESS_PORT = 80;
|
|
25
25
|
/**
|
|
26
|
-
* The host the
|
|
27
|
-
*
|
|
28
|
-
*
|
|
26
|
+
* The host the port probe connects to.
|
|
27
|
+
*
|
|
28
|
+
* Loopback directly, rather than a sample hostname, which keeps this probe answering the PORT
|
|
29
|
+
* question alone. That is still the right split, but the reason written here used to be that
|
|
30
|
+
* `nip.io` maps `<anything>.127.0.0.1.nip.io` to loopback, and **that is false**: these resolvers
|
|
31
|
+
* answer from the LEFTMOST four-octet run in a name and read `-` and `.` alike, so a prefix
|
|
32
|
+
* ending in a separator plus digits resolves somewhere else entirely
|
|
33
|
+
* (`cf-env-api-5.127.0.0.1.nip.io` is `5.127.0.0`). Resolving a sample here would therefore prove
|
|
34
|
+
* nothing about the template a workspace actually configures, since the sample and the real
|
|
35
|
+
* namespace differ in exactly the part that decides it.
|
|
36
|
+
*
|
|
37
|
+
* That half belongs to `describeWildcardDnsShift` in `@cat-factory/contracts`, which grades the
|
|
38
|
+
* rendered host and which the environment provider refuses a provision on. See
|
|
39
|
+
* `backend/docs/local-k3s-environments.md`.
|
|
29
40
|
*/
|
|
30
41
|
export declare const INGRESS_PROBE_HOST = "127.0.0.1";
|
|
31
42
|
/**
|
|
@@ -33,8 +44,16 @@ export declare const INGRESS_PROBE_HOST = "127.0.0.1";
|
|
|
33
44
|
* is also the Ingress `spec.rules[].host` a service's manifests declare, and Kubernetes rejects a
|
|
34
45
|
* `host` carrying a port. A non-default host port travels as the URL source's own `port` field
|
|
35
46
|
* instead (see {@link ingressUrlPort}).
|
|
47
|
+
*
|
|
48
|
+
* **`{{namespace}}`, never `{{branch}}`**, which is what this used to write. A branch is
|
|
49
|
+
* `cat-factory/<taskId>`: the `/` ends the host and turns everything after it into a PATH, so the
|
|
50
|
+
* URL `http://cat-factory/task_….127.0.0.1.nip.io` names the bare host `cat-factory` and reaches
|
|
51
|
+
* nothing, while an Ingress declaring that `host` is refused by the apiserver outright. The
|
|
52
|
+
* namespace is the one per-PR value the platform has already sanitized to a single RFC1123 label,
|
|
53
|
+
* and it composes cleanly with {@link DEFAULT_NAMESPACE_TEMPLATE}, whose rendered `pr<n>` keeps
|
|
54
|
+
* the name carrying exactly one address (see `backend/docs/local-k3s-environments.md`).
|
|
36
55
|
*/
|
|
37
|
-
export declare const INGRESS_HOST_TEMPLATE = "{{
|
|
56
|
+
export declare const INGRESS_HOST_TEMPLATE = "{{namespace}}.127.0.0.1.nip.io";
|
|
38
57
|
/** The container port an ingress controller serves plain HTTP on (Traefik `web`, nginx `http`). */
|
|
39
58
|
export declare const INGRESS_CONTAINER_HTTP_PORT = 80;
|
|
40
59
|
/** What a TCP connect attempt established. `unknown` is NOT `closed`: see {@link classifyIngress}. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s-ingress.d.ts","sourceRoot":"","sources":["../src/k3s-ingress.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,SAAS,EAEd,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAA;AAExB;;;;;;;;;;;;GAYG;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAA;AAEtC
|
|
1
|
+
{"version":3,"file":"k3s-ingress.d.ts","sourceRoot":"","sources":["../src/k3s-ingress.ts"],"names":[],"mappings":"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"}
|
package/dist/k3s-ingress.js
CHANGED
|
@@ -8,7 +8,7 @@ import { COMMAND_NOT_FOUND, COMMAND_TIMED_OUT, runCommand, } from './host-shell.
|
|
|
8
8
|
* 2. a HOST PORT published into it, because every local distribution runs the cluster inside
|
|
9
9
|
* Docker and forwards only the ports it was asked for at create time.
|
|
10
10
|
*
|
|
11
|
-
* Both were previously assumed. `cat-factory k3s` printed
|
|
11
|
+
* Both were previously assumed. `cat-factory k3s` printed its nip.io host template as wired
|
|
12
12
|
* on every path, including a reused cluster it had never looked at, and the failure landed at the
|
|
13
13
|
* `tester` step against a URL that answered nothing: environment readiness is WORKLOAD readiness,
|
|
14
14
|
* so provisioning still reported success.
|
|
@@ -24,9 +24,20 @@ import { COMMAND_NOT_FOUND, COMMAND_TIMED_OUT, runCommand, } from './host-shell.
|
|
|
24
24
|
*/
|
|
25
25
|
export const DEFAULT_INGRESS_PORT = 80;
|
|
26
26
|
/**
|
|
27
|
-
* The host the
|
|
28
|
-
*
|
|
29
|
-
*
|
|
27
|
+
* The host the port probe connects to.
|
|
28
|
+
*
|
|
29
|
+
* Loopback directly, rather than a sample hostname, which keeps this probe answering the PORT
|
|
30
|
+
* question alone. That is still the right split, but the reason written here used to be that
|
|
31
|
+
* `nip.io` maps `<anything>.127.0.0.1.nip.io` to loopback, and **that is false**: these resolvers
|
|
32
|
+
* answer from the LEFTMOST four-octet run in a name and read `-` and `.` alike, so a prefix
|
|
33
|
+
* ending in a separator plus digits resolves somewhere else entirely
|
|
34
|
+
* (`cf-env-api-5.127.0.0.1.nip.io` is `5.127.0.0`). Resolving a sample here would therefore prove
|
|
35
|
+
* nothing about the template a workspace actually configures, since the sample and the real
|
|
36
|
+
* namespace differ in exactly the part that decides it.
|
|
37
|
+
*
|
|
38
|
+
* That half belongs to `describeWildcardDnsShift` in `@cat-factory/contracts`, which grades the
|
|
39
|
+
* rendered host and which the environment provider refuses a provision on. See
|
|
40
|
+
* `backend/docs/local-k3s-environments.md`.
|
|
30
41
|
*/
|
|
31
42
|
export const INGRESS_PROBE_HOST = '127.0.0.1';
|
|
32
43
|
/**
|
|
@@ -34,8 +45,16 @@ export const INGRESS_PROBE_HOST = '127.0.0.1';
|
|
|
34
45
|
* is also the Ingress `spec.rules[].host` a service's manifests declare, and Kubernetes rejects a
|
|
35
46
|
* `host` carrying a port. A non-default host port travels as the URL source's own `port` field
|
|
36
47
|
* instead (see {@link ingressUrlPort}).
|
|
48
|
+
*
|
|
49
|
+
* **`{{namespace}}`, never `{{branch}}`**, which is what this used to write. A branch is
|
|
50
|
+
* `cat-factory/<taskId>`: the `/` ends the host and turns everything after it into a PATH, so the
|
|
51
|
+
* URL `http://cat-factory/task_….127.0.0.1.nip.io` names the bare host `cat-factory` and reaches
|
|
52
|
+
* nothing, while an Ingress declaring that `host` is refused by the apiserver outright. The
|
|
53
|
+
* namespace is the one per-PR value the platform has already sanitized to a single RFC1123 label,
|
|
54
|
+
* and it composes cleanly with {@link DEFAULT_NAMESPACE_TEMPLATE}, whose rendered `pr<n>` keeps
|
|
55
|
+
* the name carrying exactly one address (see `backend/docs/local-k3s-environments.md`).
|
|
37
56
|
*/
|
|
38
|
-
export const INGRESS_HOST_TEMPLATE = '{{
|
|
57
|
+
export const INGRESS_HOST_TEMPLATE = '{{namespace}}.127.0.0.1.nip.io';
|
|
39
58
|
/** The container port an ingress controller serves plain HTTP on (Traefik `web`, nginx `http`). */
|
|
40
59
|
export const INGRESS_CONTAINER_HTTP_PORT = 80;
|
|
41
60
|
// ---------------------------------------------------------------------------
|
package/dist/k3s-ingress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s-ingress.js","sourceRoot":"","sources":["../src/k3s-ingress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAGjB,UAAU,GAEX,MAAM,iBAAiB,CAAA;AAExB;;;;;;;;;;;;GAYG;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAA;AAEtC
|
|
1
|
+
{"version":3,"file":"k3s-ingress.js","sourceRoot":"","sources":["../src/k3s-ingress.ts"],"names":[],"mappings":"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"}
|
package/dist/k3s.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OPTION_DEFAULTS } from './args.js';
|
|
2
|
-
import { buildK3sSetupUrl } from './k3s-handler.js';
|
|
2
|
+
import { buildK3sSetupUrl, DEFAULT_NAMESPACE_TEMPLATE } from './k3s-handler.js';
|
|
3
3
|
import { createNodeShell, renderCommandLine } from './host-shell.js';
|
|
4
4
|
import { createConsoleIo } from './io.js';
|
|
5
5
|
import { createNodeTcpProbe, ingressHostTemplate, ingressRemedies, ingressUrlPort, } from './k3s-ingress.js';
|
|
@@ -225,8 +225,8 @@ function printInstallGuidance(state, io, platform, clusterName, ingressPort) {
|
|
|
225
225
|
/**
|
|
226
226
|
* The environment-URL half of the summary, rendered from the PROBE rather than from a fixed
|
|
227
227
|
* script. This is the line the whole change turns on: it used to state "Ingress host template" +
|
|
228
|
-
*
|
|
229
|
-
*
|
|
228
|
+
* a fixed nip.io template unconditionally, including on a reused cluster the command had never
|
|
229
|
+
* looked at, and an operator who typed it got an environment whose URL answered nothing.
|
|
230
230
|
*
|
|
231
231
|
* Three outcomes, three different things to say, per the degrade-loudly rule: verified working,
|
|
232
232
|
* verified missing (with the fix), and could-not-tell (which is NOT the same as missing, and must
|
|
@@ -330,7 +330,7 @@ function printConnectionSummary(connection, io) {
|
|
|
330
330
|
'Open Settings → Infrastructure → Kubernetes → Local k3s and enter:',
|
|
331
331
|
` • API server URL: ${connection.apiServerUrl}`,
|
|
332
332
|
` • Skip TLS verification: yes (local self-signed cert)`,
|
|
333
|
-
` • Namespace template:
|
|
333
|
+
` • Namespace template: ${DEFAULT_NAMESPACE_TEMPLATE}`,
|
|
334
334
|
...renderUrlSourceLines(connection),
|
|
335
335
|
'',
|
|
336
336
|
'Then paste this ServiceAccount token into the "ServiceAccount token" field and click Test → Save:',
|
package/dist/k3s.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k3s.js","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,eAAe,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"k3s.js","sourceRoot":"","sources":["../src/k3s.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/cli",
|
|
3
|
-
"version": "0.13.
|
|
3
|
+
"version": "0.13.2",
|
|
4
4
|
"description": "Bootstrap CLI for the Agent Architecture Board: scaffold a local-mode deployment (Node/local backend + frontend SPA) on your own machine — generates the crypto secrets, populates and gitignores the .env files, and mints a GitHub/GitLab personal access token by opening the browser at the right pre-scoped URL.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"bootstrap",
|
|
@@ -37,12 +37,12 @@
|
|
|
37
37
|
"@clack/prompts": "^1.7.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
+
"@cat-factory/contracts": "0.327.0",
|
|
41
|
+
"@cat-factory/kernel": "0.318.0",
|
|
40
42
|
"@types/node": "^26.2.0",
|
|
41
43
|
"typescript": "7.0.2",
|
|
42
44
|
"valibot": "^1.4.2",
|
|
43
|
-
"vitest": "^4.1.11"
|
|
44
|
-
"@cat-factory/contracts": "0.323.1",
|
|
45
|
-
"@cat-factory/kernel": "0.314.1"
|
|
45
|
+
"vitest": "^4.1.11"
|
|
46
46
|
},
|
|
47
47
|
"scripts": {
|
|
48
48
|
"build": "tsc -b tsconfig.build.json",
|