k8ts 0.4.18 → 0.4.20

package/dist/resources/deployment/deployment.js

@@ -39,16 +39,15 @@ const instruments_1 = require("@k8ts/instruments");
 const metadata_1 = require("@k8ts/metadata");
 const lodash_1 = require("lodash");
 const _imports_1 = require("../../_imports");
-const api_versions_1 = require("../../api-versions");
 const kind_map_1 = require("../../kind-map");
+const kinds_1 = require("../../kinds");
 const equiv_cdk8s_1 = require("../../node/equiv-cdk8s");
 const manifest_resource_1 = require("../../node/manifest-resource");
 const pod_template_1 = require("../pod/pod-template");
 var Deployment;
 (function (Deployment_1) {
-    const ident = api_versions_1.apps_v1.kind("Deployment");
     let Deployment = (() => {
-        let _classDecorators = [(0, kind_map_1.k8ts)(ident), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubeDeployment), (0, instruments_1.relations)({
+        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.apps_.v1_.Deployment), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubeDeployment), (0, instruments_1.relations)({
                 kids: s => [s.template]
             }), (0, instruments_1.manifest)({
                 async body(self) {
@@ -80,7 +79,8 @@ var Deployment;
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
-            kind = ident;
+            __PORTS__;
+            kind = kinds_1.api.apps_.v1_.Deployment;
             template;
             constructor(origin, meta, props) {
                 super(origin, meta, props);

package/dist/resources/deployment/deployment.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAA+D;AAC/D,6CAAkD;AAClD,mCAA6B;AAC7B,6CAAoC;AACpC,qDAA4C;AAC5C,6CAAqC;AACrC,wDAAoD;AACpD,oEAA+D;AAC/D,sDAAiD;AAGjD,IAAiB,UAAU,CA+C1B;AA/CD,WAAiB,YAAU;IAMvB,MAAM,KAAK,GAAG,sBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAuB3B,UAAU;gCAtBtB,IAAA,eAAI,EAAC,KAAK,CAAC,EACX,IAAA,yBAAW,EAAC,cAAG,CAAC,cAAc,CAAC,EAC/B,IAAA,uBAAS,EAAC;gBACP,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC1B,CAAC,EACD,IAAA,sBAAQ,EAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI;oBACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAA;oBAClD,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;oBAC3D,OAAO;wBACH,IAAI,EAAE;4BACF,GAAG,IAAA,aAAI,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC;4BAC/B,QAAQ,EAAE;gCACN,WAAW,EAAE;oCACT,GAAG,EAAE,IAAI,CAAC,IAAI;iCACjB;6BACJ;4BACD,QAAQ,EAAE,YAAY;yBACzB;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BAC6D,oCAAgB;8BAAxB,SAAQ,WAA8B;;;;gBAA7F,6KAiBC;;;gBAjBY,uDAAU;;YACnB,IAAI,GAAG,KAAK,CAAA;YACZ,QAAQ,CAAoB;YAC5B,YAAY,MAAc,EAAE,IAAwB,EAAE,KAAmB;gBACrE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAW,CAAC,WAAW,CACvC,MAAM,EACN,eAAI,CAAC,IAAI,CAAC;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI,CAAC,IAAI;iBACpB,CAAC,EACF,KAAK,CAAC,QAAQ,CACjB,CAAA;YACL,CAAC;YACD,IAAI,KAAK;gBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;YAC9B,CAAC;;;;IAhBQ,uBAAU,aAiBtB,CAAA;AACL,CAAC,EA/CgB,UAAU,0BAAV,UAAU,QA+C1B"}
+{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../src/resources/deployment/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAwE;AACxE,6CAAkD;AAClD,mCAA6B;AAC7B,6CAAoC;AACpC,6CAAqC;AACrC,uCAAiC;AACjC,wDAAoD;AACpD,oEAA+D;AAC/D,sDAAiD;AAGjD,IAAiB,UAAU,CAkD1B;AAlDD,WAAiB,YAAU;QA8BV,UAAU;gCAtBtB,IAAA,eAAI,EAAC,WAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,EAC9B,IAAA,yBAAW,EAAC,cAAG,CAAC,cAAc,CAAC,EAC/B,IAAA,uBAAS,EAAC;gBACP,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;aAC1B,CAAC,EACD,IAAA,sBAAQ,EAAC;gBACN,KAAK,CAAC,IAAI,CAAC,IAAI;oBACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAA;oBAClD,MAAM,YAAY,GAAG,IAAA,aAAI,EAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAA;oBAC3D,OAAO;wBACH,IAAI,EAAE;4BACF,GAAG,IAAA,aAAI,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC;4BAC/B,QAAQ,EAAE;gCACN,WAAW,EAAE;oCACT,GAAG,EAAE,IAAI,CAAC,IAAI;iCACjB;6BACJ;4BACD,QAAQ,EAAE,YAAY;yBACzB;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BAC6D,oCAAgB;8BAAxB,SAAQ,WAA8B;;;;gBAA7F,6KAmBC;;;gBAnBY,uDAAU;;YACnB,SAAS,CAAQ;YACjB,IAAI,GAAG,WAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAA;YAC/B,QAAQ,CAAoB;YAE5B,YAAY,MAAc,EAAE,IAAwB,EAAE,KAAmB;gBACrE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,0BAAW,CAAC,WAAW,CACvC,MAAM,EACN,eAAI,CAAC,IAAI,CAAC;oBACN,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI,CAAC,IAAI;iBACpB,CAAC,EACF,KAAK,CAAC,QAAQ,CACjB,CAAA;YACL,CAAC;YACD,IAAI,KAAK;gBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;YAC9B,CAAC;;;;IAlBQ,uBAAU,aAmBtB,CAAA;AACL,CAAC,EAlDgB,UAAU,0BAAV,UAAU,QAkD1B"}

package/dist/resources/http-route/http-route.d.ts

@@ -1,17 +1,16 @@
 import type { External } from "../../external";
+import { api } from "../../kinds";
 import { ManifestResource } from "../../node";
 import type { Service } from "../service";
 export type HttpRoute<Ports extends string> = HttpRoute.HttpRoute<Ports>;
 export declare namespace HttpRoute {
-    const gwKind: import("@k8ts/instruments").Kind.Kind<"Gateway", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"gateway.networking.k8s.io">>>;
-    export interface Props<Ports extends string> {
-        gateway: External<typeof gwKind>;
+    interface Props<Ports extends string> {
+        gateway: External<api.gateway_.v1_.Gateway>;
         hostname: string;
         backend: Service.Port<Ports>;
     }
-    export class HttpRoute<Ports extends string> extends ManifestResource<Props<Ports>> {
+    class HttpRoute<Ports extends string> extends ManifestResource<Props<Ports>> {
         kind: import("@k8ts/instruments").Kind.Kind<"HTTPRoute", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"gateway.networking.k8s.io">>>;
     }
-    export {};
 }
 //# sourceMappingURL=http-route.d.ts.map

package/dist/resources/http-route/http-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-route.d.ts","sourceRoot":"","sources":["../../../src/resources/http-route/http-route.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AAExE,yBAAiB,SAAS,CAAC;IACvB,MAAM,MAAM,uKAA6B,CAAA;IACzC,MAAM,WAAW,KAAK,CAAC,KAAK,SAAS,MAAM;QACvC,OAAO,EAAE,QAAQ,CAAC,OAAO,MAAM,CAAC,CAAA;QAChC,QAAQ,EAAE,MAAM,CAAA;QAChB,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC/B;IA0BD,MAAM,OAAO,SAAS,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,0KAA+B;KACtC;;CACJ"}
+{"version":3,"file":"http-route.d.ts","sourceRoot":"","sources":["../../../src/resources/http-route/http-route.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AAExE,yBAAiB,SAAS,CAAC;IACvB,UAAiB,KAAK,CAAC,KAAK,SAAS,MAAM;QACvC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC3C,QAAQ,EAAE,MAAM,CAAA;QAChB,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KAC/B;IAED,MAuBa,SAAS,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/E,IAAI,0KAA6B;KACpC;CACJ"}

package/dist/resources/http-route/http-route.js

@@ -37,16 +37,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpRoute = void 0;
 const instruments_1 = require("@k8ts/instruments");
 const _imports_1 = require("../../_imports");
-const api_versions_1 = require("../../api-versions");
 const kind_map_1 = require("../../kind-map");
+const kinds_1 = require("../../kinds");
 const node_1 = require("../../node");
 const equiv_cdk8s_1 = require("../../node/equiv-cdk8s");
 var HttpRoute;
 (function (HttpRoute_1) {
-    const gwKind = api_versions_1.gateway_v1.kind("Gateway");
-    const kind = api_versions_1.gateway_v1.kind("HTTPRoute");
     let HttpRoute = (() => {
-        let _classDecorators = [(0, kind_map_1.k8ts)(kind), (0, instruments_1.relations)({
+        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.gateway_.v1_.HttpRoute), (0, instruments_1.relations)({
                 needs: self => ({
                     gateway: self.props.gateway,
                     service: self.props.backend.service
@@ -79,7 +77,7 @@ var HttpRoute;
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
-            kind = api_versions_1.gateway_v1.kind("HTTPRoute");
+            kind = kinds_1.api.gateway_.v1_.HttpRoute;
         };
         return HttpRoute = _classThis;
     })();

package/dist/resources/http-route/http-route.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-route.js","sourceRoot":"","sources":["../../../src/resources/http-route/http-route.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAuD;AACvD,6CAAoC;AACpC,qDAA+C;AAE/C,6CAAqC;AACrC,qCAA6C;AAC7C,wDAAoD;AAKpD,IAAiB,SAAS,CAmCzB;AAnCD,WAAiB,WAAS;IACtB,MAAM,MAAM,GAAG,yBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAOzC,MAAM,IAAI,GAAG,yBAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAwB5B,SAAS;gCAvBrB,IAAA,eAAI,EAAC,IAAI,CAAC,EACV,IAAA,uBAAS,EAAC;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBACZ,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oBAC3B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO;iBACtC,CAAC;aACL,CAAC,EACD,IAAA,yBAAW,EAAC,cAAG,CAAC,SAAS,CAAC,EAC1B,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,OAAO;wBACH,IAAI,EAAE;4BACF,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;4BACtC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAChC,KAAK,EAAE;gCACH;oCACI,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;iCAC1C;6BACJ;yBACJ;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BACmD,uBAAgB;6BAAxB,SAAQ,WAA8B;;;;gBAAnF,6KAEC;;;gBAFY,uDAAS;;YAClB,IAAI,GAAG,yBAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;;;;IAD1B,qBAAS,YAErB,CAAA;AACL,CAAC,EAnCgB,SAAS,yBAAT,SAAS,QAmCzB"}
+{"version":3,"file":"http-route.js","sourceRoot":"","sources":["../../../src/resources/http-route/http-route.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAuD;AACvD,6CAAoC;AAEpC,6CAAqC;AACrC,uCAAiC;AACjC,qCAA6C;AAC7C,wDAAoD;AAKpD,IAAiB,SAAS,CAiCzB;AAjCD,WAAiB,WAAS;QA8BT,SAAS;gCAvBrB,IAAA,eAAI,EAAC,WAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAChC,IAAA,uBAAS,EAAC;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBACZ,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oBAC3B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO;iBACtC,CAAC;aACL,CAAC,EACD,IAAA,yBAAW,EAAC,cAAG,CAAC,SAAS,CAAC,EAC1B,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,OAAO;wBACH,IAAI,EAAE;4BACF,UAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;4BACtC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;4BAChC,KAAK,EAAE;gCACH;oCACI,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;iCAC1C;6BACJ;yBACJ;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BACmD,uBAAgB;6BAAxB,SAAQ,WAA8B;;;;gBAAnF,6KAEC;;;gBAFY,uDAAS;;YAClB,IAAI,GAAG,WAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAA;;;;IADxB,qBAAS,YAErB,CAAA;AACL,CAAC,EAjCgB,SAAS,yBAAT,SAAS,QAiCzB"}

package/dist/resources/namespace/namespace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/resources/namespace/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAKlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;AAC3C,yBAAiB,SAAS,CAAC;IACvB,UAAiB,KAAK;KAAG;IAEzB,MAUa,SAAU,SAAQ,gBAAgB,CAAC,KAAK,CAAC;QACzC,IAAI,iJAAQ;oBACT,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,WAAW,EAAE,KAAK,CAAC,EAAE,KAAK;KAGtE;CACJ"}
+{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/resources/namespace/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAKlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;AAC3C,yBAAiB,SAAS,CAAC;IACvB,UAAiB,KAAK;KAAG;IACzB,MAUa,SAAU,SAAQ,gBAAgB,CAAC,KAAK,CAAC;QACzC,IAAI,iJAAoB;oBACrB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,WAAW,EAAE,KAAK,CAAC,EAAE,KAAK;KAGtE;CACJ"}

package/dist/resources/namespace/namespace.js

@@ -37,15 +37,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Namespace = void 0;
 const instruments_1 = require("@k8ts/instruments");
 const _imports_1 = require("../../_imports");
-const api_versions_1 = require("../../api-versions");
 const kind_map_1 = require("../../kind-map");
+const kinds_1 = require("../../kinds");
 const equiv_cdk8s_1 = require("../../node/equiv-cdk8s");
 const manifest_resource_1 = require("../../node/manifest-resource");
 var Namespace;
 (function (Namespace_1) {
-    const ident = api_versions_1.v1.kind("Namespace");
     let Namespace = (() => {
-        let _classDecorators = [(0, kind_map_1.k8ts)(ident), (0, instruments_1.relations)("none"), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubeNamespace), (0, instruments_1.manifest)({
+        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.v1_.Namespace), (0, instruments_1.relations)("none"), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubeNamespace), (0, instruments_1.manifest)({
                 body(self) {
                     return {
                         spec: {}
@@ -65,7 +64,7 @@ var Namespace;
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
-            kind = ident;
+            kind = kinds_1.api.v1_.Namespace;
             constructor(origin, meta, props) {
                 super(origin, meta.toMutable(), props ?? {});
             }

package/dist/resources/namespace/namespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/resources/namespace/namespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoE;AAEpE,6CAAoC;AACpC,qDAAuC;AACvC,6CAAqC;AACrC,wDAAoD;AACpD,oEAA+D;AAE/D,IAAiB,SAAS,CAmBzB;AAnBD,WAAiB,WAAS;IAEtB,MAAM,KAAK,GAAG,iBAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAWrB,SAAS;gCAVrB,IAAA,eAAI,EAAC,KAAK,CAAC,EACX,IAAA,uBAAS,EAAC,MAAM,CAAC,EACjB,IAAA,yBAAW,EAAC,cAAG,CAAC,aAAa,CAAC,EAC9B,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,OAAO;wBACH,IAAI,EAAE,EAAE;qBACX,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BAC6B,oCAAgB;6BAAxB,SAAQ,WAAuB;;;;gBAAtD,6KAKC;;;gBALY,uDAAS;;YACT,IAAI,GAAG,KAAK,CAAA;YACrB,YAAY,MAAc,EAAE,IAAwB,EAAE,KAAa;gBAC/D,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,CAAA;YAChD,CAAC;;;;IAJQ,qBAAS,YAKrB,CAAA;AACL,CAAC,EAnBgB,SAAS,yBAAT,SAAS,QAmBzB"}
+{"version":3,"file":"namespace.js","sourceRoot":"","sources":["../../../src/resources/namespace/namespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoE;AAEpE,6CAAoC;AACpC,6CAAqC;AACrC,uCAAiC;AACjC,wDAAoD;AACpD,oEAA+D;AAE/D,IAAiB,SAAS,CAkBzB;AAlBD,WAAiB,WAAS;QAYT,SAAS;gCAVrB,IAAA,eAAI,EAAC,WAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EACvB,IAAA,uBAAS,EAAC,MAAM,CAAC,EACjB,IAAA,yBAAW,EAAC,cAAG,CAAC,aAAa,CAAC,EAC9B,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,OAAO;wBACH,IAAI,EAAE,EAAE;qBACX,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BAC6B,oCAAgB;6BAAxB,SAAQ,WAAuB;;;;gBAAtD,6KAKC;;;gBALY,uDAAS;;YACT,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,SAAS,CAAA;YACjC,YAAY,MAAc,EAAE,IAAwB,EAAE,KAAa;gBAC/D,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,CAAA;YAChD,CAAC;;;;IAJQ,qBAAS,YAKrB,CAAA;AACL,CAAC,EAlBgB,SAAS,yBAAT,SAAS,QAkBzB"}

package/dist/resources/persistent/claim/pvc.d.ts

@@ -6,17 +6,18 @@ import { Pv } from "../volume";
 export type Pvc<T extends DataMode = DataMode> = Pvc.Pvc<T>;
 export declare namespace Pvc {
     const pvc_ResourcesSpec: ResourcesSpec<{
-        readonly storage: "G" | "K" | "M" | "T" | "Mi" | "Gi" | "Ki";
+        readonly storage: "M" | "G" | "T" | "K" | "Mi" | "Gi" | "Ki";
     }>;
     type PvcResourceSpec = typeof pvc_ResourcesSpec;
     type PvcResources = PvcResourceSpec["__INPUT__"];
     export interface Props<Mode extends DataMode> extends PvcResources {
         accessModes: Access;
         mode?: Mode;
-        bind: Pv<Mode>;
+        bind: Pv.AbsPv<Mode>;
     }
     export class Pvc<Mode extends DataMode = DataMode> extends ManifestResource<Props<Mode>> {
         kind: import("@k8ts/instruments").Kind.Kind<"PersistentVolumeClaim", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>;
+        get bound(): Pv<Mode>;
     }
     export {};
 }

package/dist/resources/persistent/claim/pvc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pvc.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAQ,MAAM,mBAAmB,CAAA;AAI5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AAE9B,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC3D,yBAAiB,GAAG,CAAC;IACjB,MAAM,iBAAiB;;MAErB,CAAA;IACF,KAAK,eAAe,GAAG,OAAO,iBAAiB,CAAA;IAC/C,KAAK,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;IAChD,MAAM,WAAW,KAAK,CAAC,IAAI,SAAS,QAAQ,CAAE,SAAQ,YAAY;QAC9D,WAAW,EAAE,MAAM,CAAA;QACnB,IAAI,CAAC,EAAE,IAAI,CAAA;QACX,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;KACjB;IA6BD,MAAM,OAAO,GAAG,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,6JAAQ;KACf;;CACJ"}
+{"version":3,"file":"pvc.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,aAAa,EAAQ,MAAM,mBAAmB,CAAA;AAI5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AAE9B,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC3D,yBAAiB,GAAG,CAAC;IACjB,MAAM,iBAAiB;;MAErB,CAAA;IACF,KAAK,eAAe,GAAG,OAAO,iBAAiB,CAAA;IAC/C,KAAK,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;IAChD,MAAM,WAAW,KAAK,CAAC,IAAI,SAAS,QAAQ,CAAE,SAAQ,YAAY;QAC9D,WAAW,EAAE,MAAM,CAAA;QACnB,IAAI,CAAC,EAAE,IAAI,CAAA;QACX,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;KACvB;IA4BD,MAAM,OAAO,GAAG,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,6JAAgC;QAEpC,IAAI,KAAK,IACqB,EAAE,CAAC,IAAI,CAAC,CACrC;KACJ;;CACJ"}

package/dist/resources/persistent/claim/pvc.js

@@ -37,8 +37,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pvc = void 0;
 const instruments_1 = require("@k8ts/instruments");
 const _imports_1 = require("../../../_imports");
-const api_versions_1 = require("../../../api-versions");
 const kind_map_1 = require("../../../kind-map");
+const kinds_1 = require("../../../kinds");
 const node_1 = require("../../../node");
 const equiv_cdk8s_1 = require("../../../node/equiv-cdk8s");
 const access_mode_1 = require("../access-mode");
@@ -47,11 +47,10 @@ var Pvc;
     const pvc_ResourcesSpec = instruments_1.ResourcesSpec.make({
         storage: instruments_1.Unit.Data
     });
-    const ident = api_versions_1.v1.kind("PersistentVolumeClaim");
     let Pvc = (() => {
-        let _classDecorators = [(0, kind_map_1.k8ts)(ident), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubePersistentVolumeClaim), (0, instruments_1.relations)({
+        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.v1_.PersistentVolumeClaim), (0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubePersistentVolumeClaim), (0, instruments_1.relations)({
                 needs: self => ({
-                    bind: self.props.bind
+                    bind: self.bound
                 })
             }), (0, instruments_1.manifest)({
                 body(self) {
@@ -85,7 +84,10 @@ var Pvc;
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
-            kind = ident;
+            kind = kinds_1.api.v1_.PersistentVolumeClaim;
+            get bound() {
+                return this.props.bind;
+            }
         };
         return Pvc = _classThis;
     })();

package/dist/resources/persistent/claim/pvc.js.map

@@ -1 +1 @@
-{"version":3,"file":"pvc.js","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAA4E;AAC5E,gDAAuC;AACvC,wDAA0C;AAC1C,gDAAwC;AACxC,wCAAgD;AAChD,2DAAuD;AACvD,gDAAuC;AAKvC,IAAiB,GAAG,CA0CnB;AA1CD,WAAiB,KAAG;IAChB,MAAM,iBAAiB,GAAG,2BAAa,CAAC,IAAI,CAAC;QACzC,OAAO,EAAE,kBAAI,CAAC,IAAI;KACrB,CAAC,CAAA;IASF,MAAM,KAAK,GAAG,iBAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QA2BjC,GAAG;gCA1Bf,IAAA,eAAI,EAAC,KAAK,CAAC,EACX,IAAA,yBAAW,EAAC,cAAG,CAAC,yBAAyB,CAAC,EAC1C,IAAA,uBAAS,EAAC;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBACZ,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;iBACxB,CAAC;aACL,CAAC,EACD,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;oBACjD,MAAM,YAAY,GAAG,oBAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;oBAC9C,OAAO;wBACH,IAAI,EAAE;4BACF,WAAW,EAAE,YAAY;4BACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAK,CAAC,IAAI;4BACjC,UAAU,EAAE,IAAI;4BAChB,SAAS,EAAE,iBAAiB;iCACvB,KAAK,CAAC;gCACH,OAAO;6BACV,CAAC;iCACD,QAAQ,EAAE;4BACf,gBAAgB,EAAE,UAAU;yBAC/B;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BACyD,uBAAgB;uBAAxB,SAAQ,WAA6B;;;;gBAAxF,6KAEC;;;gBAFY,uDAAG;;YACZ,IAAI,GAAG,KAAK,CAAA;;;;IADH,SAAG,MAEf,CAAA;AACL,CAAC,EA1CgB,GAAG,mBAAH,GAAG,QA0CnB"}
+{"version":3,"file":"pvc.js","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAA4E;AAC5E,gDAAuC;AACvC,gDAAwC;AACxC,0CAAoC;AACpC,wCAAgD;AAChD,2DAAuD;AACvD,gDAAuC;AAKvC,IAAiB,GAAG,CA6CnB;AA7CD,WAAiB,KAAG;IAChB,MAAM,iBAAiB,GAAG,2BAAa,CAAC,IAAI,CAAC;QACzC,OAAO,EAAE,kBAAI,CAAC,IAAI;KACrB,CAAC,CAAA;QAmCW,GAAG;gCA1Bf,IAAA,eAAI,EAAC,WAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,EACnC,IAAA,yBAAW,EAAC,cAAG,CAAC,yBAAyB,CAAC,EAC1C,IAAA,uBAAS,EAAC;gBACP,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;oBACZ,IAAI,EAAE,IAAI,CAAC,KAAK;iBACnB,CAAC;aACL,CAAC,EACD,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;oBACjD,MAAM,YAAY,GAAG,oBAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;oBAC9C,OAAO;wBACH,IAAI,EAAE;4BACF,WAAW,EAAE,YAAY;4BACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAK,CAAC,IAAI;4BACjC,UAAU,EAAE,IAAI;4BAChB,SAAS,EAAE,iBAAiB;iCACvB,KAAK,CAAC;gCACH,OAAO;6BACV,CAAC;iCACD,QAAQ,EAAE;4BACf,gBAAgB,EAAE,UAAU;yBAC/B;qBACJ,CAAA;gBACL,CAAC;aACJ,CAAC;;;;0BACyD,uBAAgB;uBAAxB,SAAQ,WAA6B;;;;gBAAxF,6KAMC;;;gBANY,uDAAG;;YACZ,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,qBAAqB,CAAA;YAEpC,IAAI,KAAK;gBACL,OAAO,IAAI,CAAC,KAAK,CAAC,IAAgB,CAAA;YACtC,CAAC;;;;IALQ,SAAG,MAMf,CAAA;AACL,CAAC,EA7CgB,GAAG,mBAAH,GAAG,QA6CnB"}

package/dist/resources/persistent/volume/pv.d.ts

@@ -1,5 +1,6 @@
-import { type Unit } from "@k8ts/instruments";
+import { Refable, type Unit } from "@k8ts/instruments";
 import { CDK } from "../../../_imports";
+import { api } from "../../../kinds";
 import { ManifestResource } from "../../../node/manifest-resource";
 import { Access } from "../access-mode";
 import type { DataMode } from "../block-mode";
@@ -7,7 +8,7 @@ import { Backend as Backend_ } from "./backend";
 export type Pv<T extends DataMode = DataMode> = Pv.Pv<T>;
 export declare namespace Pv {
     export import Backend = Backend_;
-    export interface Props<Mode extends DataMode = DataMode> {
+    interface Props<Mode extends DataMode = DataMode> {
         accessModes: Access;
         storageClassName?: string;
         mode?: Mode;
@@ -16,11 +17,13 @@ export declare namespace Pv {
         backend: Backend;
         nodeAffinity?: CDK.VolumeNodeAffinity;
     }
-    export type Reclaim = "Retain" | "Delete" | "Recycle";
-    const ident: import("@k8ts/instruments").Kind.Kind<"PersistentVolume", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>;
-    export class Pv<Mode extends DataMode = DataMode> extends ManifestResource<Props<Mode>> {
-        readonly kind: typeof ident;
+    type Reclaim = "Retain" | "Delete" | "Recycle";
+    type AbsPv<Mode extends DataMode = DataMode> = Refable<api.v1_.PersistentVolume> & {
+        __MODE__: Mode;
+    };
+    class Pv<Mode extends DataMode = DataMode> extends ManifestResource<Props<Mode>> {
+        __MODE__: Mode;
+        readonly kind: import("@k8ts/instruments").Kind.Kind<"PersistentVolume", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>;
     }
-    export {};
 }
 //# sourceMappingURL=pv.d.ts.map

package/dist/resources/persistent/volume/pv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pv.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAKvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAA;AAG/C,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACxD,yBAAiB,EAAE,CAAC;IAChB,MAAM,QAAQ,OAAO,GAAG,QAAQ,CAAA;IAChC,MAAM,WAAW,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ;QACnD,WAAW,EAAE,MAAM,CAAA;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;QACzB,IAAI,CAAC,EAAE,IAAI,CAAA;QACX,aAAa,CAAC,EAAE,OAAO,CAAA;QACvB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAA;QACnB,OAAO,EAAE,OAAO,CAAA;QAChB,YAAY,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAA;KACxC;IACD,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAA;IAErD,MAAM,KAAK,uJAA8B,CAAA;IAqCzC,MAAM,OAAO,EAAE,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnF,SAAiB,IAAI,EAAE,OAAO,KAAK,CAAA;KACtC;;CACJ"}
+{"version":3,"file":"pv.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC3E,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAA;AAG/C,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACxD,yBAAiB,EAAE,CAAC;IAChB,MAAM,QAAQ,OAAO,GAAG,QAAQ,CAAA;IAChC,UAAiB,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ;QACnD,WAAW,EAAE,MAAM,CAAA;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;QACzB,IAAI,CAAC,EAAE,IAAI,CAAA;QACX,aAAa,CAAC,EAAE,OAAO,CAAA;QACvB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAA;QACnB,OAAO,EAAE,OAAO,CAAA;QAChB,YAAY,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAA;KACxC;IACD,KAAY,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAA;IACrD,KAAY,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG;QACtF,QAAQ,EAAE,IAAI,CAAA;KACjB,CAAA;IACD,MAmCa,EAAE,CAAC,IAAI,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnF,QAAQ,EAAG,IAAI,CAAA;QACf,QAAQ,CAAC,IAAI,wJAA2B;KAC3C;CACJ"}

package/dist/resources/persistent/volume/pv.js

@@ -37,16 +37,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pv = void 0;
 const instruments_1 = require("@k8ts/instruments");
 const _imports_1 = require("../../../_imports");
-const api_versions_1 = require("../../../api-versions");
 const error_1 = require("../../../error");
 const kind_map_1 = require("../../../kind-map");
+const kinds_1 = require("../../../kinds");
 const equiv_cdk8s_1 = require("../../../node/equiv-cdk8s");
 const manifest_resource_1 = require("../../../node/manifest-resource");
 const access_mode_1 = require("../access-mode");
 const parse_backend_1 = require("./parse-backend");
 var Pv;
 (function (Pv_1) {
-    const ident = api_versions_1.v1.kind("PersistentVolume");
     let Pv = (() => {
         let _classDecorators = [(0, equiv_cdk8s_1.equiv_cdk8s)(_imports_1.CDK.KubePersistentVolume), (0, instruments_1.manifest)({
                 body(self) {
@@ -77,7 +76,7 @@ var Pv;
                         spec: base
                     };
                 }
-            }), (0, kind_map_1.k8ts)(ident), (0, instruments_1.relations)("none")];
+            }), (0, kind_map_1.k8ts)(kinds_1.api.v1_.PersistentVolume), (0, instruments_1.relations)("none")];
         let _classDescriptor;
         let _classExtraInitializers = [];
         let _classThis;
@@ -91,6 +90,8 @@ var Pv;
                 if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
                 __runInitializers(_classThis, _classExtraInitializers);
             }
+            __MODE__;
+            kind = kinds_1.api.v1_.PersistentVolume;
         };
         return Pv = _classThis;
     })();

package/dist/resources/persistent/volume/pv.js.map

@@ -1 +1 @@
-{"version":3,"file":"pv.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAkE;AAClE,gDAAuC;AACvC,wDAA0C;AAC1C,0CAA0C;AAC1C,gDAAwC;AACxC,2DAAuD;AACvD,uEAAkE;AAClE,gDAAuC;AAGvC,mDAA8C;AAG9C,IAAiB,EAAE,CAqDlB;AArDD,WAAiB,IAAE;IAaf,MAAM,KAAK,GAAG,iBAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAqC5B,EAAE;gCAnCd,IAAA,yBAAW,EAAC,cAAG,CAAC,oBAAoB,CAAC,EACrC,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;oBAC1B,MAAM,WAAW,GAAG,oBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;oBACrD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACtC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;4BACxB,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACnG,CAAA;wBACL,CAAC;oBACL,CAAC;oBACD,IAAI,IAAI,GAA6B;wBACjC,WAAW;wBACX,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,UAAU;wBACxD,QAAQ,EAAE,OAAO,CAAC,QAAQ;4BACtB,CAAC,CAAC;gCACI,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC;6BACrD;4BACH,CAAC,CAAC,SAAS;wBACf,UAAU,EAAE,OAAO,CAAC,IAAI,IAAI,YAAY;wBACxC,6BAA6B,EAAE,OAAO,CAAC,aAAa,IAAI,QAAQ;wBAChE,YAAY,EAAE,OAAO,CAAC,YAAY;qBACrC,CAAA;oBACD,IAAI,GAAG;wBACH,GAAG,IAAI;wBACP,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,OAAO,CAAC;qBACnC,CAAA;oBACD,OAAO;wBACH,IAAI,EAAE,IAAI;qBACb,CAAA;gBACL,CAAC;aACJ,CAAC,EACD,IAAA,eAAI,EAAC,KAAK,CAAC,EACX,IAAA,uBAAS,EAAC,MAAM,CAAC;;;;0BACwC,oCAAgB;sBAAxB,SAAQ,WAA6B;;;;gBAAvF,6KAEC;;;gBAFY,uDAAE;;;;;IAAF,OAAE,KAEd,CAAA;AACL,CAAC,EArDgB,EAAE,kBAAF,EAAE,QAqDlB"}
+{"version":3,"file":"pv.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAA2E;AAC3E,gDAAuC;AACvC,0CAA0C;AAC1C,gDAAwC;AACxC,0CAAoC;AACpC,2DAAuD;AACvD,uEAAkE;AAClE,gDAAuC;AAGvC,mDAA8C;AAG9C,IAAiB,EAAE,CAsDlB;AAtDD,WAAiB,IAAE;QAkDF,EAAE;gCAnCd,IAAA,yBAAW,EAAC,cAAG,CAAC,oBAAoB,CAAC,EACrC,IAAA,sBAAQ,EAAC;gBACN,IAAI,CAAC,IAAI;oBACL,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;oBAC1B,MAAM,WAAW,GAAG,oBAAM,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;oBACrD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBACtC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;4BACxB,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACnG,CAAA;wBACL,CAAC;oBACL,CAAC;oBACD,IAAI,IAAI,GAA6B;wBACjC,WAAW;wBACX,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,IAAI,UAAU;wBACxD,QAAQ,EAAE,OAAO,CAAC,QAAQ;4BACtB,CAAC,CAAC;gCACI,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC;6BACrD;4BACH,CAAC,CAAC,SAAS;wBACf,UAAU,EAAE,OAAO,CAAC,IAAI,IAAI,YAAY;wBACxC,6BAA6B,EAAE,OAAO,CAAC,aAAa,IAAI,QAAQ;wBAChE,YAAY,EAAE,OAAO,CAAC,YAAY;qBACrC,CAAA;oBACD,IAAI,GAAG;wBACH,GAAG,IAAI;wBACP,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,OAAO,CAAC;qBACnC,CAAA;oBACD,OAAO;wBACH,IAAI,EAAE,IAAI;qBACb,CAAA;gBACL,CAAC;aACJ,CAAC,EACD,IAAA,eAAI,EAAC,WAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAC9B,IAAA,uBAAS,EAAC,MAAM,CAAC;;;;0BACwC,oCAAgB;sBAAxB,SAAQ,WAA6B;;;;gBAAvF,6KAGC;;;gBAHY,uDAAE;;YACX,QAAQ,CAAO;YACN,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,gBAAgB,CAAA;;;;IAF/B,OAAE,KAGd,CAAA;AACL,CAAC,EAtDgB,EAAE,kBAAF,EAAE,QAsDlB"}

package/dist/resources/pod/container/container.d.ts

@@ -1,20 +1,22 @@
-import { PortSet, ResourcesSpec, type CmdBuilder, type InputEnvMapping, type InputPortSetRecord, type TaggedImage } from "@k8ts/instruments";
+import { Kinded, PortSet, ResourcesSpec, type CmdBuilder, type InputEnvMapping, type InputPortSetRecord, type TaggedImage } from "@k8ts/instruments";
 import type { CDK } from "../../../_imports";
+import { api } from "../../../kinds";
 import type { ManifestResource } from "../../../node";
 import { SubResource } from "../../../node/sub-resource";
 import { Mount as Mount_ } from "./mounts";
-export type Container<Ports extends string> = Container.Container<Ports>;
+export type Container<Ports extends string = string> = Container.Container<Ports>;
 export declare namespace Container {
     export import Mount = Mount_;
     const container_ResourcesSpec: ResourcesSpec<{
         readonly cpu: "m";
-        readonly memory: "G" | "K" | "M" | "T" | "Mi" | "Gi" | "Ki";
+        readonly memory: "M" | "G" | "T" | "K" | "Mi" | "Gi" | "Ki";
     }>;
     type Resources = (typeof container_ResourcesSpec)["__INPUT__"];
+    type SomeMount = Kinded<api.v1_.Pod_.DeviceMount | api.v1_.Pod_.VolumeMount>;
     export type Mounts = {
-        [key: string]: Mount.ContainerDeviceMount | Mount.ContainerVolumeMount;
+        [key: string]: SomeMount;
     };
-    export interface Props<Ports extends string = never> {
+    export interface K8tsProps<Ports extends string = never> {
         image: TaggedImage;
         ports?: InputPortSetRecord<Ports>;
         command?: CmdBuilder;
@@ -23,18 +25,20 @@ export declare namespace Container {
         securityContext?: CDK.SecurityContext;
         resources?: Resources;
     }
-    export class Container<Ports extends string> extends SubResource<Props<Ports>> {
+    export type Props<Ports extends string = never> = K8tsProps<Ports> & Omit<CDK.Container, keyof K8tsProps | "name">;
+    export class Container<Ports extends string = string> extends SubResource<Props<Ports>> {
         readonly subtype: "init" | "main";
-        readonly props: Props<Ports>;
-        get kind(): import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<string, import("@k8ts/instruments").Kind.Version<string, import("@k8ts/instruments").Kind.Group<string>>>>;
+        readonly props: K8tsProps<Ports>;
+        __PORTS__: Ports;
+        readonly kind: import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>;
         get mounts(): {
-            mount: Mount.ContainerDeviceMount | Mount.ContainerVolumeMount;
+            mount: Mount.ContainerVolumeMount | Mount.ContainerDeviceMount;
             path: string;
         }[];
-        get volumes(): (import("..").Device.PodDevice | import("..").Volume.PodVolume<import("..").Volume.Backend>)[];
+        get volumes(): (import("..").Device.PodDevice | import("..").Volume)[];
         get ports(): PortSet<Ports>;
         submanifest(): CDK.Container;
-        constructor(parent: ManifestResource, name: string, subtype: "init" | "main", props: Props<Ports>);
+        constructor(parent: ManifestResource, name: string, subtype: "init" | "main", props: K8tsProps<Ports>);
         private _groupedMounts;
         private _resources;
     }

package/dist/resources/pod/container/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,OAAO,EAEP,aAAa,EAEb,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAK5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,KAAK,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAC1C,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AACxE,yBAAiB,SAAS,CAAC;IACvB,MAAM,QAAQ,KAAK,GAAG,MAAM,CAAA;IAC5B,MAAM,uBAAuB;;;MAG3B,CAAA;IAEF,KAAK,SAAS,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,WAAW,CAAC,CAAA;IAC9D,MAAM,MAAM,MAAM,GAAG;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB,CAAA;KACzE,CAAA;IACD,MAAM,WAAW,KAAK,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK;QAC/C,KAAK,EAAE,WAAW,CAAA;QAClB,KAAK,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACjC,OAAO,CAAC,EAAE,UAAU,CAAA;QACpB,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,GAAG,CAAC,EAAE,eAAe,CAAA;QACrB,eAAe,CAAC,EAAE,GAAG,CAAC,eAAe,CAAA;QACrC,SAAS,CAAC,EAAE,SAAS,CAAA;KACxB;IAUD,MAAM,OAAO,SAAS,CAAC,KAAK,SAAS,MAAM,CAAE,SAAQ,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QA+CtE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;iBACf,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;QA/CzC,IAAI,IAAI,2MAEP;QAED,IAAI,MAAM;;kBAOwB,MAAM;YAMvC;QAED,IAAI,OAAO,mGAKV;QACD,IAAI,KAAK,mBAER;QACD,WAAW,IAAI,GAAG,CAAC,SAAS;oBAgBxB,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACH,OAAO,EAAE,MAAM,GAAG,MAAM,EACf,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;QAKzC,OAAO,CAAC,cAAc;QActB,OAAO,CAAC,UAAU;KAUrB;IAED,MAAM,UAAU,IAAI,CAAC,KAAK,SAAS,MAAM,EACrC,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,oBAGtB;;CACJ"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,MAAM,EACN,OAAO,EAEP,aAAa,EAEb,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACnB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAM5C,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,KAAK,IAAI,MAAM,EAAE,MAAM,UAAU,CAAA;AAC1C,MAAM,MAAM,SAAS,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;AACjF,yBAAiB,SAAS,CAAC;IACvB,MAAM,QAAQ,KAAK,GAAG,MAAM,CAAA;IAC5B,MAAM,uBAAuB;;;MAG3B,CAAA;IAEF,KAAK,SAAS,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,WAAW,CAAC,CAAA;IAC9D,KAAK,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC5E,MAAM,MAAM,MAAM,GAAG;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,CAAA;IACD,MAAM,WAAW,SAAS,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK;QACnD,KAAK,EAAE,WAAW,CAAA;QAClB,KAAK,CAAC,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAA;QACjC,OAAO,CAAC,EAAE,UAAU,CAAA;QACpB,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,GAAG,CAAC,EAAE,eAAe,CAAA;QACrB,eAAe,CAAC,EAAE,GAAG,CAAC,eAAe,CAAA;QACrC,SAAS,CAAC,EAAE,SAAS,CAAA;KACxB;IACD,MAAM,MAAM,KAAK,CAAC,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,SAAS,CAAC,KAAK,CAAC,GAC9D,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAA;IAYjD,MAAM,OAAO,SAAS,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QA8C/E,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;iBACf,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;QA9C7C,SAAS,EAAG,KAAK,CAAA;QACjB,QAAQ,CAAC,IAAI,kMAAyB;QAEtC,IAAI,MAAM;mBAM0B,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB;kBACzD,MAAM;YAMvC;QAED,IAAI,OAAO,4DAKV;QACD,IAAI,KAAK,mBAER;QACD,WAAW,IAAI,GAAG,CAAC,SAAS;oBAgBxB,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACH,OAAO,EAAE,MAAM,GAAG,MAAM,EACf,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;QAK7C,OAAO,CAAC,cAAc;QAetB,OAAO,CAAC,UAAU;KAUrB;IAED,MAAM,UAAU,IAAI,CAAC,KAAK,SAAS,MAAM,EACrC,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,oBAGtB;;CACJ"}

package/dist/resources/pod/container/container.js

@@ -40,6 +40,8 @@ const immutable_1 = require("immutable");
 const adapters_1 = require("../../utils/adapters");
 const doddle_1 = require("doddle");
 const lodash_1 = require("lodash");
+const kind_map_1 = require("../../../kind-map");
+const kinds_1 = require("../../../kinds");
 const sub_resource_1 = require("../../../node/sub-resource");
 const mounts_1 = require("./mounts");
 var Container;
@@ -50,10 +52,10 @@ var Container;
         memory: instruments_1.Unit.Data
     });
     let Container = (() => {
-        let _classDecorators = [(0, instruments_1.relations)({
+        let _classDecorators = [(0, kind_map_1.k8ts)(kinds_1.api.v1_.Pod_.Container), (0, instruments_1.relations)({
                 needs: self => {
                     const a = self.mounts;
-                    return (0, lodash_1.mapValues)((0, lodash_1.mapKeys)(a, x => x.path), x => x.mount.parent);
+                    return (0, lodash_1.mapValues)((0, lodash_1.mapKeys)(a, x => x.path), x => x.mount.volume);
                 }
             })];
         let _classDescriptor;
@@ -71,16 +73,15 @@ var Container;
             }
             subtype;
             props;
-            get kind() {
-                return this.parent.kind.subkind("Container");
-            }
+            __PORTS__;
+            kind = kinds_1.api.v1_.Pod_.Container;
             get mounts() {
                 return (0, immutable_1.Map)(this.props.mounts ?? {})
                     .mapEntries(([path, mount]) => {
                     return [
                         mount,
                         {
-                            mount,
+                            mount: mount,
                             path: path
                         }
                     ];
@@ -89,7 +90,7 @@ var Container;
                     .toArray();
             }
             get volumes() {
-                return (0, doddle_1.seq)(this.mounts.map(x => x.mount.parent))
+                return (0, doddle_1.seq)(this.mounts.map(x => x.mount.volume))
                     .uniq()
                     .toArray()
                     .pull();
@@ -122,7 +123,8 @@ var Container;
                     volumeMounts: [],
                     volumeDevices: []
                 };
-                for (const [path, mount] of Object.entries(this.props.mounts ?? {})) {
+                for (const mnt of this.mounts) {
+                    const { mount, path } = mnt;
                     if (mount instanceof Container_1.Mount.ContainerDeviceMount) {
                         x.volumeDevices.push(mount.submanifest(path));
                     }

package/dist/resources/pod/container/container.js.map

@@ -1 +1 @@
-{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/container.ts"],"names":[],"mappings":"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"}

package/dist/resources/pod/container/mounts.d.ts

@@ -1,25 +1,30 @@
 import type { CDK } from "../../../_imports";
+import { Volume } from "../volume";
 import type { Device } from "../volume/devices";
-import type { Volume } from "../volume/volumes";
 export type Mount = Mount.ContainerVolumeMount | Mount.ContainerDeviceMount;
 export declare namespace Mount {
     type Path_Rooted = `/${string}`;
     export type Path = `${"" | "." | ".."}${Path_Rooted}`;
-    export interface Options {
+    export interface Props {
         readOnly?: boolean;
         subPath?: string;
+        volume: Volume;
     }
     export class ContainerVolumeMount {
-        readonly parent: Volume.PodVolume;
-        readonly props: Options;
-        get kind(): import("@k8ts/instruments").Kind.SubKind<"ContainerVolumeMount", import("@k8ts/instruments").Kind.Kind<string, import("@k8ts/instruments").Kind.Version<string, import("@k8ts/instruments").Kind.Group<string>>>>;
-        constructor(parent: Volume.PodVolume, props: Options);
+        readonly props: Props;
+        readonly kind: import("@k8ts/instruments").Kind.SubKind<"VolumeMount", import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>>;
+        constructor(props: Props);
+        get volume(): Volume;
         submanifest(mountPath: string): CDK.VolumeMount;
     }
+    export interface DeviceMountProps {
+        device: Device;
+    }
     export class ContainerDeviceMount {
-        readonly parent: Device.PodDevice;
-        get kind(): import("@k8ts/instruments").Kind.SubKind<"ContainerDeviceMount", import("@k8ts/instruments").Kind.Kind<string, import("@k8ts/instruments").Kind.Version<string, import("@k8ts/instruments").Kind.Group<string>>>>;
-        constructor(parent: Device.PodDevice);
+        readonly props: DeviceMountProps;
+        kind: import("@k8ts/instruments").Kind.SubKind<"DeviceMount", import("@k8ts/instruments").Kind.SubKind<"Container", import("@k8ts/instruments").Kind.Kind<"Pod", import("@k8ts/instruments").Kind.Version<"v1", import("@k8ts/instruments").Kind.Group<"">>>>>;
+        get volume(): Device.PodDevice;
+        constructor(props: DeviceMountProps);
         submanifest(devicePath: string): CDK.VolumeDevice;
     }
     export {};

package/dist/resources/pod/container/mounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mounts.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,MAAM,MAAM,KAAK,GAAG,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB,CAAA;AAC3E,yBAAiB,KAAK,CAAC;IACnB,KAAK,WAAW,GAAG,IAAI,MAAM,EAAE,CAAA;IAC/B,MAAM,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,WAAW,EAAE,CAAA;IAErD,MAAM,WAAW,OAAO;QACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;KACnB;IACD,MAAM,OAAO,oBAAoB;QAKzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS;QACjC,QAAQ,CAAC,KAAK,EAAE,OAAO;QAL3B,IAAI,IAAI,sNAEP;oBAEY,MAAM,EAAE,MAAM,CAAC,SAAS,EACxB,KAAK,EAAE,OAAO;QAG3B,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;KAQlD;IAED,MAAM,OAAO,oBAAoB;QAIjB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS;QAH7C,IAAI,IAAI,sNAEP;oBACoB,MAAM,EAAE,MAAM,CAAC,SAAS;QAE7C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,YAAY;KAMpD;;CACJ"}
+{"version":3,"file":"mounts.d.ts","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,MAAM,MAAM,KAAK,GAAG,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB,CAAA;AAC3E,yBAAiB,KAAK,CAAC;IACnB,KAAK,WAAW,GAAG,IAAI,MAAM,EAAE,CAAA;IAC/B,MAAM,MAAM,IAAI,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,GAAG,WAAW,EAAE,CAAA;IAErD,MAAM,WAAW,KAAK;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;QAClB,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,MAAM,EAAE,MAAM,CAAA;KACjB;IACD,MAAM,OAAO,oBAAoB;QAGjB,QAAQ,CAAC,KAAK,EAAE,KAAK;QAFjC,QAAQ,CAAC,IAAI,2PAA2B;oBAEnB,KAAK,EAAE,KAAK;QAEjC,IAAI,MAAM,WAET;QACD,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;KAQlD;IAED,MAAM,WAAW,gBAAgB;QAC7B,MAAM,EAAE,MAAM,CAAA;KACjB;IAED,MAAM,OAAO,oBAAoB;QAKjB,QAAQ,CAAC,KAAK,EAAE,gBAAgB;QAJ5C,IAAI,2PAA2B;QAC/B,IAAI,MAAM,qBAET;oBACoB,KAAK,EAAE,gBAAgB;QAC5C,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,YAAY;KAMpD;;CACJ"}

package/dist/resources/pod/container/mounts.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mount = void 0;
+const kinds_1 = require("../../../kinds");
 var Mount;
 (function (Mount) {
     class ContainerVolumeMount {
-        parent;
         props;
-        get kind() {
-            return this.parent.kind.parent.subkind("ContainerVolumeMount");
-        }
-        constructor(parent, props) {
-            this.parent = parent;
+        kind = kinds_1.api.v1_.Pod_.VolumeMount;
+        constructor(props) {
             this.props = props;
         }
+        get volume() {
+            return this.props.volume;
+        }
         submanifest(mountPath) {
             return {
-                name: this.parent.name,
+                name: this.props.volume.name,
                 mountPath: mountPath,
                 readOnly: this.props.readOnly,
                 subPath: this.props.subPath
@@ -24,17 +24,18 @@ var Mount;
     }
     Mount.ContainerVolumeMount = ContainerVolumeMount;
     class ContainerDeviceMount {
-        parent;
-        get kind() {
-            return this.parent.kind.parent.subkind("ContainerDeviceMount");
+        props;
+        kind = kinds_1.api.v1_.Pod_.DeviceMount;
+        get volume() {
+            return this.props.device;
         }
-        constructor(parent) {
-            this.parent = parent;
+        constructor(props) {
+            this.props = props;
         }
         submanifest(devicePath) {
             return {
                 devicePath: devicePath,
-                name: this.parent.name
+                name: this.props.device.name
             };
         }
     }

package/dist/resources/pod/container/mounts.js.map

@@ -1 +1 @@
-{"version":3,"file":"mounts.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":";;;AAIA,IAAiB,KAAK,CAwCrB;AAxCD,WAAiB,KAAK;IAQlB,MAAa,oBAAoB;QAKhB;QACA;QALb,IAAI,IAAI;YACJ,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QAClE,CAAC;QACD,YACa,MAAwB,EACxB,KAAc;YADd,WAAM,GAAN,MAAM,CAAkB;YACxB,UAAK,GAAL,KAAK,CAAS;QACxB,CAAC;QAEJ,WAAW,CAAC,SAAiB;YACzB,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC7B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;aAC9B,CAAA;QACL,CAAC;KACJ;IAjBY,0BAAoB,uBAiBhC,CAAA;IAED,MAAa,oBAAoB;QAIR;QAHrB,IAAI,IAAI;YACJ,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QAClE,CAAC;QACD,YAAqB,MAAwB;YAAxB,WAAM,GAAN,MAAM,CAAkB;QAAG,CAAC;QAEjD,WAAW,CAAC,UAAkB;YAC1B,OAAO;gBACH,UAAU,EAAE,UAAU;gBACtB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACzB,CAAA;QACL,CAAC;KACJ;IAZY,0BAAoB,uBAYhC,CAAA;AACL,CAAC,EAxCgB,KAAK,qBAAL,KAAK,QAwCrB"}
+{"version":3,"file":"mounts.js","sourceRoot":"","sources":["../../../../src/resources/pod/container/mounts.ts"],"names":[],"mappings":";;;AACA,0CAAoC;AAIpC,IAAiB,KAAK,CA4CrB;AA5CD,WAAiB,KAAK;IASlB,MAAa,oBAAoB;QAGR;QAFZ,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAA;QAExC,YAAqB,KAAY;YAAZ,UAAK,GAAL,KAAK,CAAO;QAAG,CAAC;QAErC,IAAI,MAAM;YACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAA;QAC5B,CAAC;QACD,WAAW,CAAC,SAAiB;YACzB,OAAO;gBACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;gBAC5B,SAAS,EAAE,SAAS;gBACpB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAC7B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;aAC9B,CAAA;QACL,CAAC;KACJ;IAhBY,0BAAoB,uBAgBhC,CAAA;IAMD,MAAa,oBAAoB;QAKR;QAJrB,IAAI,GAAG,WAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAA;QAC/B,IAAI,MAAM;YACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAA;QAC5B,CAAC;QACD,YAAqB,KAAuB;YAAvB,UAAK,GAAL,KAAK,CAAkB;QAAG,CAAC;QAChD,WAAW,CAAC,UAAkB;YAC1B,OAAO;gBACH,UAAU,EAAE,UAAU;gBACtB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;aAC/B,CAAA;QACL,CAAC;KACJ;IAZY,0BAAoB,uBAYhC,CAAA;AACL,CAAC,EA5CgB,KAAK,qBAAL,KAAK,QA4CrB"}