k8ts 0.11.4 → 0.11.5
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/resources/deployment/deployment.d.ts +2 -2
- package/dist/resources/deployment/deployment.d.ts.map +1 -1
- package/dist/resources/deployment/deployment.js +96 -51
- package/dist/resources/deployment/deployment.js.map +1 -1
- package/dist/runner/exporter/loader.d.ts.map +1 -1
- package/dist/runner/exporter/loader.js +2 -2
- package/dist/runner/exporter/loader.js.map +1 -1
- package/package.json +6 -6
- package/src/resources/deployment/deployment.ts +8 -6
- package/src/runner/exporter/loader.ts +3 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Ref2_Of, Resource_Top, type Resource_Entity } from "@k8ts/instruments";
|
|
2
2
|
import { CDK } from "@k8ts/sample-interfaces";
|
|
3
3
|
import { apps } from "../../kinds/apps";
|
|
4
|
-
import { type Pod_Props } from "../pod";
|
|
4
|
+
import { Pod_Template, type Pod_Props } from "../pod";
|
|
5
5
|
export interface Deployment_Strategy_RollingUpdate extends CDK.RollingUpdateDeployment {
|
|
6
6
|
type: "RollingUpdate";
|
|
7
7
|
}
|
|
@@ -24,7 +24,7 @@ export declare class Deployment<Name extends string, Ports extends string = stri
|
|
|
24
24
|
protected __kids__(): Resource_Entity[];
|
|
25
25
|
protected body(): CDK.KubeDeploymentProps;
|
|
26
26
|
private get _strategy();
|
|
27
|
-
|
|
27
|
+
get template(): Pod_Template<Ports>;
|
|
28
28
|
get ports(): import("doddle").Doddle<import("@k8ts/instruments").PortSet<Ports>>;
|
|
29
29
|
}
|
|
30
30
|
//# sourceMappingURL=deployment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EACP,YAAY,EACZ,KAAK,eAAe,EACvB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAI7C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EACP,YAAY,EACZ,KAAK,eAAe,EACvB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAI7C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,MAAM,QAAQ,CAAA;AAErD,MAAM,WAAW,iCAAkC,SAAQ,GAAG,CAAC,uBAAuB;IAClF,IAAI,EAAE,eAAe,CAAA;CACxB;AACD,MAAM,WAAW,4BAA4B;IACzC,IAAI,EAAE,UAAU,CAAA;CACnB;AACD,MAAM,MAAM,mBAAmB,GAAG,iCAAiC,GAAG,4BAA4B,CAAA;AAClG,MAAM,MAAM,yBAAyB,GAAG,IAAI,CACxC,GAAG,CAAC,cAAc,EAClB,UAAU,GAAG,UAAU,GAAG,UAAU,CACvC,CAAA;AAED,MAAM,MAAM,gBAAgB,CAAC,KAAK,SAAS,MAAM,IAAI,yBAAyB,GAAG;IAC7E,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,CAAA;IAC3B,SAAS,CAAC,EAAE,mBAAmB,CAAA;CAClC,CAAA;AACD,MAAM,MAAM,cAAc,CAAC,KAAK,SAAS,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG;IAC/E,SAAS,EAAE,KAAK,CAAA;CACnB,CAAA;AAED,qBAAa,UAAU,CAAC,IAAI,SAAS,MAAM,EAAE,KAAK,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,YAAY,CAC5F,IAAI,EACJ,gBAAgB,CAAC,KAAK,CAAC,CAC1B;;IACG,SAAS,EAAG,KAAK,CAAA;IACjB,IAAI,IAAI,sEAEP;IAYD,SAAS,CAAC,QAAQ,IAAI,eAAe,EAAE;IAGvC,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,mBAAmB;IAiBzC,OAAO,KAAK,SAAS,GAepB;IAED,IACI,QAAQ,wBAIX;IAED,IAAI,KAAK,wEAER;CACJ"}
|
|
@@ -1,4 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
3
|
+
var useValue = arguments.length > 2;
|
|
4
|
+
for (var i = 0; i < initializers.length; i++) {
|
|
5
|
+
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
|
|
6
|
+
}
|
|
7
|
+
return useValue ? value : void 0;
|
|
8
|
+
};
|
|
9
|
+
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
|
|
10
|
+
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
|
|
11
|
+
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
12
|
+
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
13
|
+
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
14
|
+
var _, done = false;
|
|
15
|
+
for (var i = decorators.length - 1; i >= 0; i--) {
|
|
16
|
+
var context = {};
|
|
17
|
+
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
|
|
18
|
+
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
|
|
19
|
+
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
|
|
20
|
+
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
|
|
21
|
+
if (kind === "accessor") {
|
|
22
|
+
if (result === void 0) continue;
|
|
23
|
+
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
|
|
24
|
+
if (_ = accept(result.get)) descriptor.get = _;
|
|
25
|
+
if (_ = accept(result.set)) descriptor.set = _;
|
|
26
|
+
if (_ = accept(result.init)) initializers.unshift(_);
|
|
27
|
+
}
|
|
28
|
+
else if (_ = accept(result)) {
|
|
29
|
+
if (kind === "field") initializers.unshift(_);
|
|
30
|
+
else descriptor[key] = _;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
34
|
+
done = true;
|
|
35
|
+
};
|
|
2
36
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
37
|
exports.Deployment = void 0;
|
|
4
38
|
const instruments_1 = require("@k8ts/instruments");
|
|
@@ -7,62 +41,73 @@ const lodash_1 = require("lodash");
|
|
|
7
41
|
const error_1 = require("../../error");
|
|
8
42
|
const apps_1 = require("../../kinds/apps");
|
|
9
43
|
const pod_1 = require("../pod");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
44
|
+
let Deployment = (() => {
|
|
45
|
+
let _classSuper = instruments_1.Resource_Top;
|
|
46
|
+
let _instanceExtraInitializers = [];
|
|
47
|
+
let _get_template_decorators;
|
|
48
|
+
return class Deployment extends _classSuper {
|
|
49
|
+
static {
|
|
50
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
51
|
+
_get_template_decorators = [doddle_1.doddlify];
|
|
52
|
+
__esDecorate(this, null, _get_template_decorators, { kind: "getter", name: "template", static: false, private: false, access: { has: obj => "template" in obj, get: obj => obj.template }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
53
|
+
if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
19
54
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
return [this._template.pull()];
|
|
24
|
-
}
|
|
25
|
-
body() {
|
|
26
|
-
const self = this;
|
|
27
|
-
const template = self._template.pull()["__submanifest__"]();
|
|
28
|
-
const noKindFields = (0, lodash_1.omit)(template, ["kind", "apiVersion"]);
|
|
29
|
-
return {
|
|
30
|
-
spec: {
|
|
31
|
-
...(0, lodash_1.omitBy)(self.props, (x, k) => k.startsWith("$")),
|
|
32
|
-
selector: {
|
|
33
|
-
matchLabels: {
|
|
34
|
-
app: self.name
|
|
35
|
-
}
|
|
36
|
-
},
|
|
37
|
-
template: noKindFields,
|
|
38
|
-
strategy: self._strategy
|
|
39
|
-
}
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
get _strategy() {
|
|
43
|
-
const strat = this.props.$strategy;
|
|
44
|
-
if (!strat) {
|
|
45
|
-
return undefined;
|
|
55
|
+
__PORTS__ = __runInitializers(this, _instanceExtraInitializers);
|
|
56
|
+
get kind() {
|
|
57
|
+
return apps_1.apps.v1.Deployment._;
|
|
46
58
|
}
|
|
47
|
-
|
|
48
|
-
|
|
59
|
+
#_ = (() => {
|
|
60
|
+
const origin = instruments_1.OriginContextTracker.current;
|
|
61
|
+
if (!origin) {
|
|
62
|
+
throw new error_1.MakeError(`Deployment ${this.name} must be created within an OriginEntity context`);
|
|
63
|
+
}
|
|
64
|
+
this.props.$template.$POD = origin["__binder__"]().bind(this.props.$template.$POD);
|
|
65
|
+
})();
|
|
66
|
+
__kids__() {
|
|
67
|
+
return [this.template];
|
|
49
68
|
}
|
|
50
|
-
|
|
69
|
+
body() {
|
|
70
|
+
const self = this;
|
|
71
|
+
const template = self.template["__submanifest__"]();
|
|
72
|
+
const noKindFields = (0, lodash_1.omit)(template, ["kind", "apiVersion"]);
|
|
51
73
|
return {
|
|
52
|
-
|
|
53
|
-
|
|
74
|
+
spec: {
|
|
75
|
+
...(0, lodash_1.omitBy)(self.props, (x, k) => k.startsWith("$")),
|
|
76
|
+
selector: {
|
|
77
|
+
matchLabels: {
|
|
78
|
+
app: self.name
|
|
79
|
+
}
|
|
80
|
+
},
|
|
81
|
+
template: noKindFields,
|
|
82
|
+
strategy: self._strategy
|
|
83
|
+
}
|
|
54
84
|
};
|
|
55
85
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
86
|
+
get _strategy() {
|
|
87
|
+
const strat = this.props.$strategy;
|
|
88
|
+
if (!strat) {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
if (strat.type === "Recreate") {
|
|
92
|
+
return strat;
|
|
93
|
+
}
|
|
94
|
+
if (strat.type === "RollingUpdate") {
|
|
95
|
+
return {
|
|
96
|
+
type: "RollingUpdate",
|
|
97
|
+
rollingUpdate: (0, lodash_1.omit)(strat, "type")
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
throw new error_1.MakeError(`Invalid strategy type: ${strat}`);
|
|
101
|
+
}
|
|
102
|
+
get template() {
|
|
103
|
+
const podTemplate = new pod_1.Pod_Template(this, this.name, this.props.$template);
|
|
104
|
+
podTemplate.meta.add("%app", this.name);
|
|
105
|
+
return podTemplate;
|
|
106
|
+
}
|
|
107
|
+
get ports() {
|
|
108
|
+
return this.template.ports;
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
})();
|
|
67
112
|
exports.Deployment = Deployment;
|
|
68
113
|
//# sourceMappingURL=deployment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAK0B;AAE1B,mCAAiC;AACjC,mCAAqC;AACrC,uCAAuC;AACvC,2CAAuC;AACvC,gCAAqD;IAsBxC,UAAU;sBAA6D,0BAAY;;;iBAAnF,UAA+D,SAAQ,WAGnF;;;wCAqDI,iBAAQ;YACT,+KAAI,QAAQ,6DAIX;;;QAzDD,SAAS,GAJA,mDAAU,CAIF;QACjB,IAAI,IAAI;YACJ,OAAO,WAAI,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAA;QAC/B,CAAC;QAED,EAAE,GAAG,CAAC,GAAG,EAAE;YACP,MAAM,MAAM,GAAG,kCAAoB,CAAC,OAAO,CAAA;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,MAAM,IAAI,iBAAS,CACf,cAAc,IAAI,CAAC,IAAI,iDAAiD,CAC3E,CAAA;YACL,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QACtF,CAAC,CAAC,EAAE,CAAA;QAEM,QAAQ;YACd,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC1B,CAAC;QACS,IAAI;YACV,MAAM,IAAI,GAAG,IAAI,CAAA;YACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAA;YACnD,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;YAC3D,OAAO;gBACH,IAAI,EAAE;oBACF,GAAG,IAAA,eAAM,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBAClD,QAAQ,EAAE;wBACN,WAAW,EAAE;4BACT,GAAG,EAAE,IAAI,CAAC,IAAI;yBACjB;qBACJ;oBACD,QAAQ,EAAE,YAAY;oBACtB,QAAQ,EAAE,IAAI,CAAC,SAAS;iBAC3B;aACJ,CAAA;QACL,CAAC;QACD,IAAY,SAAS;YACjB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;YAClC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,OAAO,SAAS,CAAA;YACpB,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC5B,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACjC,OAAO;oBACH,IAAI,EAAE,eAAe;oBACrB,aAAa,EAAE,IAAA,aAAI,EAAC,KAAK,EAAE,MAAM,CAAC;iBACrC,CAAA;YACL,CAAC;YACD,MAAM,IAAI,iBAAS,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAA;QAC1D,CAAC;QAGD,IAAI,QAAQ;YACR,MAAM,WAAW,GAAG,IAAI,kBAAY,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;YAC3E,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;YACvC,OAAO,WAAW,CAAA;QACtB,CAAC;QAED,IAAI,KAAK;YACL,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;QAC9B,CAAC;;;AAjEQ,gCAAU"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/runner/exporter/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAgC,MAAM,mBAAmB,CAAA;AAC3F,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,qBAAa,cAAe,SAAQ,QAAQ,CAAC,yBAAyB,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,qBAAqB;IAI5D,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/runner/exporter/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAgC,MAAM,mBAAmB,CAAA;AAC3F,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,qBAAa,cAAe,SAAQ,QAAQ,CAAC,yBAAyB,CAAC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,qBAAqB;IAI5D,OAAO,CAAC,WAAW;IAsBb,IAAI,CAAC,KAAK,EAAE,UAAU;CAkD/B;AACD,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,aAAa,CAAA;CAC1B;AAED,MAAM,WAAW,yBAAyB;IACtC,IAAI,EAAE,mBAAmB,CAAA;CAC5B;AAED,MAAM,WAAW,qBAAqB;CAAG"}
|
|
@@ -28,8 +28,6 @@ class ResourceLoader extends emittery_1.default {
|
|
|
28
28
|
throw new error_1.MakeError(`Invalid resource name ${resource.name}. Must match ${nameRegexp}`);
|
|
29
29
|
}
|
|
30
30
|
names.set(name, resource);
|
|
31
|
-
const resourceOriginMetas = resource.origin.inheritedMeta;
|
|
32
|
-
resource.meta.add(resourceOriginMetas);
|
|
33
31
|
}
|
|
34
32
|
}
|
|
35
33
|
async load(input) {
|
|
@@ -54,6 +52,8 @@ class ResourceLoader extends emittery_1.default {
|
|
|
54
52
|
resource: res
|
|
55
53
|
};
|
|
56
54
|
await this.emit("load", event);
|
|
55
|
+
const resourceOriginMetas = res.origin.inheritedMeta;
|
|
56
|
+
res.meta.add(resourceOriginMetas);
|
|
57
57
|
origin.entity["__emit__"]("resource/loaded", {
|
|
58
58
|
origin: origin.entity,
|
|
59
59
|
resource: res.entity
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/runner/exporter/loader.ts"],"names":[],"mappings":";;;;;;AAAA,mDAA2F;AAC3F,wDAA+B;AAC/B,uCAAuC;AACvC,MAAa,cAAe,SAAQ,kBAAmC;IACtC;IAA7B,YAA6B,QAA+B;QACxD,KAAK,EAAE,CAAA;QADkB,aAAQ,GAAR,QAAQ,CAAuB;IAE5D,CAAC;IAEO,WAAW,CAAC,SAA0B;QAC1C,IAAI,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAA;QAC5C,MAAM,UAAU,GAAG,6BAA6B,CAAA;QAChD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC;iBAC/D,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,GAAG,CAAC,CAAA;YACd,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAChC,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,IAAI,iBAAS,CACf,kCAAkC,IAAI,eAAe,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CACtH,CAAA;YACL,CAAC;YACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAI,iBAAS,CACf,yBAAyB,QAAQ,CAAC,IAAI,gBAAgB,UAAU,EAAE,CACrE,CAAA;YACL,CAAC;YACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/runner/exporter/loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "k8ts",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.5",
|
|
4
4
|
"description": "Powerful framework for building Kubernetes manifests in TypeScript.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"k8ts",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"test": "tsx --tsconfig ./example/tsconfig.json ./example/run.ts"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@k8ts/sample-interfaces": "^0.4.
|
|
65
|
+
"@k8ts/sample-interfaces": "^0.4.4",
|
|
66
66
|
"chalk": "4.1.2",
|
|
67
67
|
"dayjs": "^1.11.13",
|
|
68
68
|
"doddle": "^7.2.0",
|
|
@@ -77,8 +77,8 @@
|
|
|
77
77
|
"what-are-you": "^0.2.0"
|
|
78
78
|
},
|
|
79
79
|
"devDependencies": {
|
|
80
|
-
"@k8ts/instruments": "^0.9.
|
|
81
|
-
"@k8ts/metadata": "^0.7.
|
|
80
|
+
"@k8ts/instruments": "^0.9.4",
|
|
81
|
+
"@k8ts/metadata": "^0.7.4",
|
|
82
82
|
"@types/chalk": "^2.2.4",
|
|
83
83
|
"@types/jest": "^29.5.12",
|
|
84
84
|
"@types/js-yaml": "^4",
|
|
@@ -95,8 +95,8 @@
|
|
|
95
95
|
"yamprint": "^0.8.4"
|
|
96
96
|
},
|
|
97
97
|
"peerDependencies": {
|
|
98
|
-
"@k8ts/instruments": "^0.9.
|
|
99
|
-
"@k8ts/metadata": "^0.7.
|
|
98
|
+
"@k8ts/instruments": "^0.9.4",
|
|
99
|
+
"@k8ts/metadata": "^0.7.4"
|
|
100
100
|
},
|
|
101
101
|
"engines": {
|
|
102
102
|
"node": ">=16.0.0"
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
type Resource_Entity
|
|
6
6
|
} from "@k8ts/instruments"
|
|
7
7
|
import { CDK } from "@k8ts/sample-interfaces"
|
|
8
|
-
import {
|
|
8
|
+
import { doddlify } from "doddle"
|
|
9
9
|
import { omit, omitBy } from "lodash"
|
|
10
10
|
import { MakeError } from "../../error"
|
|
11
11
|
import { apps } from "../../kinds/apps"
|
|
@@ -51,11 +51,11 @@ export class Deployment<Name extends string, Ports extends string = string> exte
|
|
|
51
51
|
})()
|
|
52
52
|
|
|
53
53
|
protected __kids__(): Resource_Entity[] {
|
|
54
|
-
return [this.
|
|
54
|
+
return [this.template]
|
|
55
55
|
}
|
|
56
56
|
protected body(): CDK.KubeDeploymentProps {
|
|
57
57
|
const self = this
|
|
58
|
-
const template = self.
|
|
58
|
+
const template = self.template["__submanifest__"]()
|
|
59
59
|
const noKindFields = omit(template, ["kind", "apiVersion"])
|
|
60
60
|
return {
|
|
61
61
|
spec: {
|
|
@@ -86,13 +86,15 @@ export class Deployment<Name extends string, Ports extends string = string> exte
|
|
|
86
86
|
}
|
|
87
87
|
throw new MakeError(`Invalid strategy type: ${strat}`)
|
|
88
88
|
}
|
|
89
|
-
|
|
89
|
+
|
|
90
|
+
@doddlify
|
|
91
|
+
get template() {
|
|
90
92
|
const podTemplate = new Pod_Template(this, this.name, this.props.$template)
|
|
91
93
|
podTemplate.meta.add("%app", this.name)
|
|
92
94
|
return podTemplate
|
|
93
|
-
}
|
|
95
|
+
}
|
|
94
96
|
|
|
95
97
|
get ports() {
|
|
96
|
-
return this.
|
|
98
|
+
return this.template.ports
|
|
97
99
|
}
|
|
98
100
|
}
|
|
@@ -25,9 +25,6 @@ export class ResourceLoader extends Emittery<ResourceLoaderEventsTable> {
|
|
|
25
25
|
)
|
|
26
26
|
}
|
|
27
27
|
names.set(name, resource)
|
|
28
|
-
const resourceOriginMetas = resource.origin.inheritedMeta
|
|
29
|
-
|
|
30
|
-
resource.meta!.add(resourceOriginMetas)
|
|
31
28
|
}
|
|
32
29
|
}
|
|
33
30
|
|
|
@@ -56,6 +53,9 @@ export class ResourceLoader extends Emittery<ResourceLoaderEventsTable> {
|
|
|
56
53
|
} as const
|
|
57
54
|
|
|
58
55
|
await this.emit("load", event)
|
|
56
|
+
const resourceOriginMetas = res.origin.inheritedMeta
|
|
57
|
+
|
|
58
|
+
res.meta!.add(resourceOriginMetas)
|
|
59
59
|
origin.entity["__emit__"]("resource/loaded", {
|
|
60
60
|
origin: origin.entity,
|
|
61
61
|
resource: res.entity as Resource_Top
|