k8ts 0.13.2 → 0.14.0

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

@@ -1,29 +1,26 @@
-import { ResourcesSpec, Rsc_Top, type Rsc_Ref } from "@k8ts/instruments";
-import { CDK } from "@k8ts/sample-interfaces";
-import { Prefix$ } from "../../../_type/prefix$";
-import { Access } from "../access-mode";
-import type { Pv_VolumeMode } from "../block-mode";
-import type { Pv, Pv_Ref } from "../volume";
-declare const StorageClassKind: import("@k8ts/instruments").Ident_Kind<"storage.k8s.io", "v1", "StorageClass">;
-declare const pvc_ResourcesSpec: ResourcesSpec<{
+import { K8sResource, Reqs, type ResourceRef, type Resource_Props_Top } from "@k8ts/instruments";
+import { K8S } from "@k8ts/sample-interfaces";
+import { storage } from "../../../gvks/storage";
+import { type PvAccessMode_Many } from "../access-mode";
+import type { Pv_Ref } from "../volume";
+import type { PvVolumeMode } from "../volume-mode";
+declare const pvcReqs: Reqs<{
     readonly storage: "M" | "G" | "T" | "K" | "Mi" | "Gi" | "Ki";
 }>;
-type Pvc_Resources = Prefix$<(typeof pvc_ResourcesSpec)["__INPUT__"]>;
-export interface Pvc_Props<Mode extends Pv_VolumeMode> extends Pvc_Resources {
-    $accessModes: Access;
+export interface Pvc_Props<Mode extends PvVolumeMode> extends Resource_Props_Top<K8S.KubePersistentVolumeClaimProps> {
+    $accessModes: PvAccessMode_Many;
     $mode?: Mode;
-    $storageClass?: Rsc_Ref<typeof StorageClassKind>;
-    $bind?: Pv_Ref<Mode>;
+    $storageClass?: ResourceRef<storage.v1.StorageClass._>;
+    $volume?: Pv_Ref<Mode>;
+    $resources: typeof pvcReqs.__INPUT__;
 }
-export declare class Pvc<Mode extends Pv_VolumeMode, Name extends string = string> extends Rsc_Top<Name, Pvc_Props<Mode>> {
-    name: Name;
-    get kind(): import("@k8ts/instruments").Ident_Kind<"", "v1", "PersistentVolumeClaim">;
+export declare class Pvc<Mode extends PvVolumeMode, Name extends string = string> extends K8sResource<Name, Pvc_Props<Mode>> {
+    get kind(): import("@k8ts/instruments").Gvk<"v1/PersistentVolumeClaim">;
     protected __needs__(): {
-        bind: Pv<Mode, string> | undefined;
-        storageClass: Rsc_Ref<import("@k8ts/instruments").Ident_Kind<"storage.k8s.io", "v1", "StorageClass">> | undefined;
+        bind: Pv_Ref<Mode> | undefined;
+        storageClass: ResourceRef<import("@k8ts/instruments").Gvk<"storage.k8s.io/v1/StorageClass">> | undefined;
     };
-    protected body(): CDK.KubePersistentVolumeClaimProps;
-    get bound(): Pv<Mode> | undefined;
+    protected __body__(): K8S.KubePersistentVolumeClaimProps;
 }
 export {};
 //# sourceMappingURL=pvc.d.ts.map

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,EAAE,aAAa,EAAE,OAAO,EAAQ,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAIhD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAE3C,QAAA,MAAM,gBAAgB,gFAA4B,CAAA;AAElD,QAAA,MAAM,iBAAiB;;EAErB,CAAA;AACF,KAAK,aAAa,GAAG,OAAO,CAAC,CAAC,OAAO,iBAAiB,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;AACrE,MAAM,WAAW,SAAS,CAAC,IAAI,SAAS,aAAa,CAAE,SAAQ,aAAa;IACxE,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,aAAa,CAAC,EAAE,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAA;IAChD,KAAK,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;CACvB;AAED,qBAAa,GAAG,CAAC,IAAI,SAAS,aAAa,EAAE,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,OAAO,CACtF,IAAI,EACJ,SAAS,CAAC,IAAI,CAAC,CAClB;IACW,IAAI,EAAE,IAAI,CAAA;IAClB,IAAI,IAAI,8EAEP;IAED,SAAS,CAAC,SAAS;;;;IAOnB,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,8BAA8B;IAuBpD,IAAI,KAAK,IACsB,EAAE,CAAC,IAAI,CAAC,GAAG,SAAS,CAClD;CACJ"}
+{"version":3,"file":"pvc.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,IAAI,EAEJ,KAAK,WAAW,EAChB,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAG7C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAqB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAElD,QAAA,MAAM,OAAO;;EAEX,CAAA;AACF,MAAM,WAAW,SAAS,CAAC,IAAI,SAAS,YAAY,CAChD,SAAQ,kBAAkB,CAAC,GAAG,CAAC,8BAA8B,CAAC;IAC9D,YAAY,EAAE,iBAAiB,CAAA;IAC/B,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACtD,OAAO,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;IACtB,UAAU,EAAE,OAAO,OAAO,CAAC,SAAS,CAAA;CACvC;AAED,qBAAa,GAAG,CAAC,IAAI,SAAS,YAAY,EAAE,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,WAAW,CACzF,IAAI,EACJ,SAAS,CAAC,IAAI,CAAC,CAClB;IACG,IAAI,IAAI,gEAEP;IAED,SAAS,CAAC,SAAS;;;;IAOnB,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,8BAA8B;CAqB3D"}

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

@@ -2,49 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pvc = void 0;
 const instruments_1 = require("@k8ts/instruments");
-const error_1 = require("../../../error");
-const default_1 = require("../../../kinds/default");
-const storage_1 = require("../../../kinds/storage");
+const lodash_1 = require("lodash");
+const default_1 = require("../../../gvks/default");
 const access_mode_1 = require("../access-mode");
-const StorageClassKind = storage_1.storage.v1.StorageClass._;
-const pvc_ResourcesSpec = instruments_1.ResourcesSpec.make({
-    storage: instruments_1.Unit.Data
+const pvcReqs = new instruments_1.Reqs({
+    storage: instruments_1.Units.Data
 });
-class Pvc extends instruments_1.Rsc_Top {
+class Pvc extends instruments_1.K8sResource {
     get kind() {
         return default_1.v1.PersistentVolumeClaim._;
     }
     __needs__() {
         const self = this;
         return {
-            bind: self.bound,
+            bind: self.props.$volume,
             storageClass: self.props.$storageClass
         };
     }
-    body() {
+    __body__() {
         const self = this;
-        const { $storage, $accessModes, $mode, $storageClass, $bind } = self.props;
-        const nAccessModes = access_mode_1.Access.pv_parseAccessMode($accessModes);
-        if (!$bind && !$storageClass) {
-            throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PVC that doesn't have a $bind must have a $storageClass.`);
-        }
+        const { $resources, $accessModes, $mode, $storageClass, $volume } = self.props;
+        const nAccessModes = (0, access_mode_1.parsePvAccessMode)($accessModes);
+        const spec = {
+            accessModes: nAccessModes,
+            volumeName: self.props.$volume?.ident.name,
+            volumeMode: $mode,
+            resources: pvcReqs
+                .parse({
+                storage: $resources.storage
+            })
+                .toObject(),
+            storageClassName: self.props.$storageClass?.ident.name ?? "standard"
+        };
+        const spec2 = (0, lodash_1.merge)(spec, self.props.$$manifest);
         return {
-            spec: {
-                accessModes: nAccessModes,
-                volumeName: self.props.$bind?.name,
-                volumeMode: $mode,
-                resources: pvc_ResourcesSpec
-                    .parse({
-                    storage: $storage
-                })
-                    .toObject(),
-                storageClassName: self.props.$storageClass?.name ?? "standard"
-            }
+            spec: spec2
         };
     }
-    get bound() {
-        return this.props.$bind;
-    }
 }
 exports.Pvc = Pvc;
 //# sourceMappingURL=pvc.js.map

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,mDAA8E;AAG9E,0CAA0C;AAC1C,oDAA2C;AAC3C,oDAAgD;AAChD,gDAAuC;AAIvC,MAAM,gBAAgB,GAAG,iBAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;AAElD,MAAM,iBAAiB,GAAG,2BAAa,CAAC,IAAI,CAAC;IACzC,OAAO,EAAE,kBAAI,CAAC,IAAI;CACrB,CAAC,CAAA;AASF,MAAa,GAA8D,SAAQ,qBAGlF;IAEG,IAAI,IAAI;QACJ,OAAO,YAAE,CAAC,qBAAqB,CAAC,CAAC,CAAA;IACrC,CAAC;IAES,SAAS;QACf,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;SACzC,CAAA;IACL,CAAC;IACS,IAAI;QACV,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC1E,MAAM,YAAY,GAAG,oBAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAA;QAC5D,IAAI,CAAC,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3B,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,4DAA4D,CAC9G,CAAA;QACL,CAAC;QACD,OAAO;YACH,IAAI,EAAE;gBACF,WAAW,EAAE,YAAY;gBACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI;gBAClC,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,iBAAiB;qBACvB,KAAK,CAAC;oBACH,OAAO,EAAE,QAAQ;iBACpB,CAAC;qBACD,QAAQ,EAAE;gBACf,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,IAAI,UAAU;aACjE;SACJ,CAAA;IACL,CAAC;IACD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,KAA6B,CAAA;IACnD,CAAC;CACJ;AA1CD,kBA0CC"}
+{"version":3,"file":"pvc.js","sourceRoot":"","sources":["../../../../src/resources/persistent/claim/pvc.ts"],"names":[],"mappings":";;;AAAA,mDAM0B;AAE1B,mCAA8B;AAC9B,mDAA0C;AAE1C,gDAA0E;AAI1E,MAAM,OAAO,GAAG,IAAI,kBAAI,CAAC;IACrB,OAAO,EAAE,mBAAK,CAAC,IAAI;CACtB,CAAC,CAAA;AAUF,MAAa,GAA6D,SAAQ,yBAGjF;IACG,IAAI,IAAI;QACJ,OAAO,YAAE,CAAC,qBAAqB,CAAC,CAAC,CAAA;IACrC,CAAC;IAES,SAAS;QACf,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;YACxB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;SACzC,CAAA;IACL,CAAC;IACS,QAAQ;QACd,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC9E,MAAM,YAAY,GAAG,IAAA,+BAAiB,EAAC,YAAY,CAAC,CAAA;QAEpD,MAAM,IAAI,GAAG;YACT,WAAW,EAAE,YAAY;YACzB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI;YAC1C,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,OAAO;iBACb,KAAK,CAAC;gBACH,OAAO,EAAE,UAAU,CAAC,OAAO;aAC9B,CAAC;iBACD,QAAQ,EAAE;YACf,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU;SAC/B,CAAA;QACzC,MAAM,KAAK,GAAG,IAAA,cAAK,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QAChD,OAAO;YACH,IAAI,EAAE,KAAK;SACd,CAAA;IACL,CAAC;CACJ;AApCD,kBAoCC"}

package/dist/resources/persistent/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./access-mode";
-export * from "./block-mode";
 export * from "./claim";
 export * from "./volume";
+export * from "./volume-mode";
 //# sourceMappingURL=index.d.ts.map

package/dist/resources/persistent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resources/persistent/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resources/persistent/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA"}

package/dist/resources/persistent/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./access-mode"), exports);
-__exportStar(require("./block-mode"), exports);
 __exportStar(require("./claim"), exports);
 __exportStar(require("./volume"), exports);
+__exportStar(require("./volume-mode"), exports);
 //# sourceMappingURL=index.js.map

package/dist/resources/persistent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resources/persistent/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,+CAA4B;AAC5B,0CAAuB;AACvB,2CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/resources/persistent/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,0CAAuB;AACvB,2CAAwB;AACxB,gDAA6B"}

package/dist/resources/persistent/volume/parse-backend.d.ts

@@ -6,7 +6,7 @@ export declare function parseBackend(backend?: Pv_Backend): {
 } | {
     hostPath: {
         path: string;
-        type: import("../../hostpath").HostPathType;
+        type: import("../../hostpath").HostPath_Type;
     };
     local?: undefined;
     nfs?: undefined;

package/dist/resources/persistent/volume/parse-backend.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBackend = parseBackend;
-const error_1 = require("../../../error");
+const errors_1 = require("../../errors");
 function parseBackend(backend) {
     switch (backend?.kind) {
         case undefined:
@@ -11,7 +11,7 @@ function parseBackend(backend) {
             return {
                 hostPath: {
                     path: backend.path,
-                    type: backend.hostpathType
+                    type: backend.type
                 }
             };
         case "Local":
@@ -28,7 +28,7 @@ function parseBackend(backend) {
                 }
             };
         default:
-            throw new error_1.MakeError(`Unknown backend kind!`, {
+            throw new errors_1.K8tsResourceError(`Unknown backend kind!`, {
                 backend
             });
     }

package/dist/resources/persistent/volume/parse-backend.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-backend.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/parse-backend.ts"],"names":[],"mappings":";;AAEA,oCA8BC;AAhCD,0CAA0C;AAE1C,SAAgB,YAAY,CAAC,OAAoB;IAC7C,QAAQ,OAAO,EAAE,IAAI,EAAE,CAAC;QACpB,KAAK,SAAS,CAAC;QACf,KAAK,IAAI;YACL,OAAO,EAAE,CAAA;QACb,KAAK,UAAU;YACX,OAAO;gBACH,QAAQ,EAAE;oBACN,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,YAAY;iBAC7B;aACJ,CAAA;QACL,KAAK,OAAO;YACR,OAAO;gBACH,KAAK,EAAE;oBACH,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB;aACJ,CAAA;QACL,KAAK,KAAK;YACN,OAAO;gBACH,GAAG,EAAE;oBACD,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB;aACJ,CAAA;QACL;YACI,MAAM,IAAI,iBAAS,CAAC,uBAAuB,EAAE;gBACzC,OAAO;aACV,CAAC,CAAA;IACV,CAAC;AACL,CAAC"}
+{"version":3,"file":"parse-backend.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/parse-backend.ts"],"names":[],"mappings":";;AAEA,oCA8BC;AAhCD,yCAAgD;AAEhD,SAAgB,YAAY,CAAC,OAAoB;IAC7C,QAAQ,OAAO,EAAE,IAAI,EAAE,CAAC;QACpB,KAAK,SAAS,CAAC;QACf,KAAK,IAAI;YACL,OAAO,EAAE,CAAA;QACb,KAAK,UAAU;YACX,OAAO;gBACH,QAAQ,EAAE;oBACN,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB;aACJ,CAAA;QACL,KAAK,OAAO;YACR,OAAO;gBACH,KAAK,EAAE;oBACH,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB;aACJ,CAAA;QACL,KAAK,KAAK;YACN,OAAO;gBACH,GAAG,EAAE;oBACD,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,IAAI,EAAE,OAAO,CAAC,IAAI;iBACrB;aACJ,CAAA;QACL;YACI,MAAM,IAAI,0BAAiB,CAAC,uBAAuB,EAAE;gBACjD,OAAO;aACV,CAAC,CAAA;IACV,CAAC;AACL,CAAC"}

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

@@ -1,47 +1,45 @@
-import { Rsc_Ref, Rsc_Top, type Unit } from "@k8ts/instruments";
-import { CDK } from "@k8ts/sample-interfaces";
-import { v1 } from "../../../kinds/default";
-import { storage } from "../../../kinds/storage";
-import type { HostPathType } from "../../hostpath";
-import { Access } from "../access-mode";
-import type { Pv_VolumeMode } from "../block-mode";
+import { K8sResource, ResourceRef, Units, type Resource_Props_Top } from "@k8ts/instruments";
+import { K8S } from "@k8ts/sample-interfaces";
+import { v1 } from "../../../gvks/default";
+import { storage } from "../../../gvks/storage";
+import type { HostPath_Type } from "../../hostpath";
+import { type PvAccessMode_Many } from "../access-mode";
+import type { PvVolumeMode } from "../volume-mode";
 export interface Pv_Backend_HostPath {
     kind: "HostPath";
-    hostpathType: HostPathType;
+    type: HostPath_Type;
     path: string;
 }
 export interface Pv_Backend_Local {
     kind: "Local";
     path: string;
 }
-export interface Pv_Backend_Nfs {
+export interface Pv_Backend_NFS {
     kind: "NFS";
     server: string;
     path: string;
 }
-export type Pv_Backend = Pv_Backend_HostPath | Pv_Backend_Local | Pv_Backend_Nfs;
-export interface Pv_Props_K8ts<Mode extends Pv_VolumeMode = Pv_VolumeMode> {
-    $accessModes: Access;
-    $storageClass?: Rsc_Ref<storage.v1.StorageClass._>;
+export type Pv_Backend = Pv_Backend_HostPath | Pv_Backend_Local | Pv_Backend_NFS;
+export interface Pv_Props<Mode extends PvVolumeMode = PvVolumeMode> extends Resource_Props_Top<K8S.PersistentVolumeSpec> {
+    $accessModes: PvAccessMode_Many;
+    $storageClass?: ResourceRef<storage.v1.StorageClass._>;
     $mode?: Mode;
-    reclaimPolicy?: Reclaim;
-    $capacity: Unit.Data;
+    $reclaimPolicy?: Pv_ReclaimMode;
+    $capacity: {
+        storage: Units.Data;
+    };
     $backend?: Pv_Backend;
-    mountOptions?: string[];
-    nodeAffinity?: CDK.VolumeNodeAffinity;
 }
-export type Reclaim = "Retain" | "Delete" | "Recycle";
-export type Pv_Ref<Mode extends Pv_VolumeMode = Pv_VolumeMode> = Rsc_Ref<v1.PersistentVolume._> & {
+export type Pv_ReclaimMode = "Retain" | "Delete" | "Recycle";
+export type Pv_Ref<Mode extends PvVolumeMode = PvVolumeMode> = ResourceRef<v1.PersistentVolume._> & {
     __MODE__: Mode;
 };
-export declare class Pv<Mode extends Pv_VolumeMode = "Filesystem", Name extends string = string> extends Rsc_Top<Name, Pv_Props_K8ts<Mode>> {
+export declare class Pv<Mode extends PvVolumeMode = "Filesystem", Name extends string = string> extends K8sResource<Name, Pv_Props<Mode>> {
     __MODE__: Mode;
-    get kind(): import("@k8ts/instruments").Ident_Kind<"", "v1", "PersistentVolume">;
+    get kind(): import("@k8ts/instruments").Gvk<"v1/PersistentVolume">;
     protected __needs__(): {
-        storageClass: Rsc_Ref<import("@k8ts/instruments").Ident_Kind<"storage.k8s.io", "v1", "StorageClass">> | undefined;
-    };
-    protected body(): {
-        spec: CDK.PersistentVolumeSpec;
+        storageClass: ResourceRef<import("@k8ts/instruments").Gvk<"storage.k8s.io/v1/StorageClass">> | undefined;
     };
+    protected __body__(): K8S.KubePersistentVolumeProps;
 }
 //# 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,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAKlD,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,UAAU,CAAA;IAChB,YAAY,EAAE,YAAY,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,UAAU,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,cAAc,CAAA;AAChF,MAAM,WAAW,aAAa,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa;IACrE,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IAClD,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,SAAS,EAAE,IAAI,CAAC,IAAI,CAAA;IACpB,QAAQ,CAAC,EAAE,UAAU,CAAA;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,YAAY,CAAC,EAAE,GAAG,CAAC,kBAAkB,CAAA;CACxC;AACD,MAAM,MAAM,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAA;AACrD,MAAM,MAAM,MAAM,CAAC,IAAI,SAAS,aAAa,GAAG,aAAa,IAAI,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAC9F,QAAQ,EAAE,IAAI,CAAA;CACjB,CAAA;AAED,qBAAa,EAAE,CACX,IAAI,SAAS,aAAa,GAAG,YAAY,EACzC,IAAI,SAAS,MAAM,GAAG,MAAM,CAC9B,SAAQ,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;IACxC,QAAQ,EAAG,IAAI,CAAA;IACf,IAAI,IAAI,yEAEP;IAED,SAAS,CAAC,SAAS;;;IAKnB,SAAS,CAAC,IAAI;;;CAqCjB"}
+{"version":3,"file":"pv.d.ts","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,WAAW,EACX,WAAW,EAEX,KAAK,EACL,KAAK,kBAAkB,EAC1B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAqB,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAKlD,MAAM,WAAW,mBAAmB;IAChC,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,aAAa,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,KAAK,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,UAAU,GAAG,mBAAmB,GAAG,gBAAgB,GAAG,cAAc,CAAA;AAChF,MAAM,WAAW,QAAQ,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,CAC9D,SAAQ,kBAAkB,CAAC,GAAG,CAAC,oBAAoB,CAAC;IACpD,YAAY,EAAE,iBAAiB,CAAA;IAC/B,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,IAAI,CAAA;IACZ,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,SAAS,EAAE;QACP,OAAO,EAAE,KAAK,CAAC,IAAI,CAAA;KACtB,CAAA;IACD,QAAQ,CAAC,EAAE,UAAU,CAAA;CACxB;AACD,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAA;AAC5D,MAAM,MAAM,MAAM,CAAC,IAAI,SAAS,YAAY,GAAG,YAAY,IACvD,WAAW,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG;IACjC,QAAQ,EAAE,IAAI,CAAA;CACjB,CAAA;AAEL,qBAAa,EAAE,CACX,IAAI,SAAS,YAAY,GAAG,YAAY,EACxC,IAAI,SAAS,MAAM,GAAG,MAAM,CAC9B,SAAQ,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,EAAG,IAAI,CAAA;IACf,IAAI,IAAI,2DAEP;IAED,SAAS,CAAC,SAAS;;;IAKnB,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,yBAAyB;CAgCtD"}

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

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Pv = void 0;
 const instruments_1 = require("@k8ts/instruments");
-const sample_interfaces_1 = require("@k8ts/sample-interfaces");
-const error_1 = require("../../../error");
-const default_1 = require("../../../kinds/default");
-const storage_1 = require("../../../kinds/storage");
+const lodash_1 = require("lodash");
+const default_1 = require("../../../gvks/default");
+const storage_1 = require("../../../gvks/storage");
+const errors_1 = require("../../errors");
 const access_mode_1 = require("../access-mode");
 const parse_backend_1 = require("./parse-backend");
 const StorageClassKind = storage_1.storage.v1.StorageClass._;
-class Pv extends instruments_1.Rsc_Top {
+class Pv extends instruments_1.K8sResource {
     __MODE__;
     get kind() {
         return default_1.v1.PersistentVolume._;
@@ -19,37 +19,31 @@ class Pv extends instruments_1.Rsc_Top {
             storageClass: this.props.$storageClass
         };
     }
-    body() {
+    __body__() {
         const self = this;
-        const pvProps = self.props;
-        const accessModes = access_mode_1.Access.pv_parseAccessMode(pvProps.$accessModes);
-        if (self.props.$backend?.kind === "Local") {
-            if (!pvProps.nodeAffinity) {
-                throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV with Local backend must have nodeAffinity.`);
-            }
-        }
+        const accessModes = (0, access_mode_1.parsePvAccessMode)(self.props.$accessModes);
+        // Make sure it parses correctly
+        instruments_1.Units.Data.parse(self.props.$capacity.storage);
         if (!self.props.$backend && !self.props.$storageClass) {
-            throw new error_1.MakeError(`While manifesting ${self.node.format("source")}, PV that doesn't have a $backend must have a $storageClass.`);
+            throw new errors_1.K8tsResourceError(`While manifesting ${self.__vertex__.format("source")}, PV that doesn't have a $backend must have a $storageClass.`);
         }
-        let base = {
+        let spec = {
             accessModes,
-            storageClassName: pvProps.$storageClass?.name ?? "standard",
-            capacity: pvProps.$capacity
-                ? {
-                    storage: sample_interfaces_1.CDK.Quantity.fromString(pvProps.$capacity)
-                }
-                : undefined,
-            volumeMode: pvProps.$mode ?? "Filesystem",
-            mountOptions: pvProps.mountOptions,
-            persistentVolumeReclaimPolicy: pvProps.reclaimPolicy ?? "Retain",
-            nodeAffinity: pvProps.nodeAffinity
+            storageClassName: self.props.$storageClass?.ident.name ?? "standard",
+            capacity: (0, instruments_1.toCdkQuantityRecord)(self.props.$capacity),
+            volumeMode: self.props.$mode ?? "Filesystem",
+            persistentVolumeReclaimPolicy: self.props.$reclaimPolicy ?? "Retain"
         };
-        base = {
-            ...base,
-            ...(0, parse_backend_1.parseBackend)(pvProps.$backend)
+        spec = {
+            ...spec,
+            ...(0, parse_backend_1.parseBackend)(self.props.$backend)
         };
+        spec = (0, lodash_1.merge)(spec, self.props.$$manifest);
+        if (!spec.nodeAffinity) {
+            throw new errors_1.K8tsResourceError(`While manifesting ${self.__vertex__.format("source")}, PV with Local backend must have nodeAffinity.`);
+        }
         return {
-            spec: base
+            spec
         };
     }
 }

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,mDAA+D;AAC/D,+DAA6C;AAC7C,0CAA0C;AAC1C,oDAA2C;AAC3C,oDAAgD;AAEhD,gDAAuC;AAEvC,mDAA8C;AAE9C,MAAM,gBAAgB,GAAG,iBAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;AAiClD,MAAa,EAGX,SAAQ,qBAAkC;IACxC,QAAQ,CAAO;IACf,IAAI,IAAI;QACJ,OAAO,YAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAChC,CAAC;IAES,SAAS;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;SACzC,CAAA;IACL,CAAC;IACS,IAAI;QACV,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAA;QAC1B,MAAM,WAAW,GAAG,oBAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACnE,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBACxB,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACnG,CAAA;YACL,CAAC;QACL,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YACpD,MAAM,IAAI,iBAAS,CACf,qBAAqB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,8DAA8D,CAChH,CAAA;QACL,CAAC;QACD,IAAI,IAAI,GAA6B;YACjC,WAAW;YACX,gBAAgB,EAAE,OAAO,CAAC,aAAa,EAAE,IAAI,IAAI,UAAU;YAC3D,QAAQ,EAAE,OAAO,CAAC,SAAS;gBACvB,CAAC,CAAC;oBACI,OAAO,EAAE,uBAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;iBACtD;gBACH,CAAC,CAAC,SAAS;YACf,UAAU,EAAE,OAAO,CAAC,KAAK,IAAI,YAAY;YACzC,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,6BAA6B,EAAE,OAAO,CAAC,aAAa,IAAI,QAAQ;YAChE,YAAY,EAAE,OAAO,CAAC,YAAY;SACrC,CAAA;QACD,IAAI,GAAG;YACH,GAAG,IAAI;YACP,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,QAAQ,CAAC;SACpC,CAAA;QACD,OAAO;YACH,IAAI,EAAE,IAAI;SACb,CAAA;IACL,CAAC;CACJ;AAnDD,gBAmDC"}
+{"version":3,"file":"pv.js","sourceRoot":"","sources":["../../../../src/resources/persistent/volume/pv.ts"],"names":[],"mappings":";;;AAAA,mDAM0B;AAE1B,mCAA8B;AAC9B,mDAA0C;AAC1C,mDAA+C;AAC/C,yCAAgD;AAEhD,gDAA0E;AAE1E,mDAA8C;AAE9C,MAAM,gBAAgB,GAAG,iBAAO,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;AAmClD,MAAa,EAGX,SAAQ,yBAAiC;IACvC,QAAQ,CAAO;IACf,IAAI,IAAI;QACJ,OAAO,YAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAChC,CAAC;IAES,SAAS;QACf,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;SACzC,CAAA;IACL,CAAC;IACS,QAAQ;QACd,MAAM,IAAI,GAAG,IAAI,CAAA;QACjB,MAAM,WAAW,GAAG,IAAA,+BAAiB,EAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC9D,gCAAgC;QAChC,mBAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAE9C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YACpD,MAAM,IAAI,0BAAiB,CACvB,qBAAqB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,8DAA8D,CACtH,CAAA;QACL,CAAC;QACD,IAAI,IAAI,GAA6B;YACjC,WAAW;YACX,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU;YACpE,QAAQ,EAAE,IAAA,iCAAmB,EAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YACnD,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,YAAY;YAC5C,6BAA6B,EAAE,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,QAAQ;SACvE,CAAA;QACD,IAAI,GAAG;YACH,GAAG,IAAI;YACP,GAAG,IAAA,4BAAY,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvC,CAAA;QACD,IAAI,GAAG,IAAA,cAAK,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACzC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,MAAM,IAAI,0BAAiB,CACvB,qBAAqB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAiD,CACzG,CAAA;QACL,CAAC;QACD,OAAO;YACH,IAAI;SACP,CAAA;IACL,CAAC;CACJ;AA9CD,gBA8CC"}

package/dist/resources/persistent/volume-mode.d.ts

@@ -0,0 +1,2 @@
+export type PvVolumeMode = "Block" | "Filesystem";
+//# sourceMappingURL=volume-mode.d.ts.map

package/dist/resources/persistent/volume-mode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"volume-mode.d.ts","sourceRoot":"","sources":["../../../src/resources/persistent/volume-mode.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,YAAY,CAAA"}

package/dist/resources/persistent/volume-mode.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=volume-mode.js.map

package/dist/resources/persistent/volume-mode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"volume-mode.js","sourceRoot":"","sources":["../../../src/resources/persistent/volume-mode.ts"],"names":[],"mappings":""}

package/dist/resources/rbac/cluster-role-binding.d.ts

@@ -1,17 +1,17 @@
-import { Rsc_Top } from "@k8ts/instruments";
-import { CDK } from "@k8ts/sample-interfaces";
-import type { ClusterRole } from "./cluster-role";
-import type { ServiceAccount } from "./service-account";
-export interface ClusterRoleBoding_Props {
-    $role: ClusterRole;
-    $subjects: ServiceAccount[];
+import { K8sResource, type Resource_Props_Top, type ResourceRef } from "@k8ts/instruments";
+import { K8S } from "@k8ts/sample-interfaces";
+import type { v1 } from "../../gvks";
+import { rbac } from "../../gvks/rbac";
+export interface ClusterRoleBoding_Props extends Resource_Props_Top<K8S.KubeClusterRoleBindingProps> {
+    $role: ResourceRef<rbac.v1.ClusterRole._>;
+    $subjects: ResourceRef<v1.ServiceAccount._>[];
 }
-export declare class ClusterRoleBinding<Name extends string = string> extends Rsc_Top<Name, ClusterRoleBoding_Props> {
-    get kind(): import("@k8ts/instruments").Ident_Kind<"rbac.authorization.k8s.io", "v1", "ClusterRoleBinding">;
+export declare class ClusterRoleBinding<Name extends string = string> extends K8sResource<Name, ClusterRoleBoding_Props> {
+    get kind(): import("@k8ts/instruments").Gvk<"rbac.authorization.k8s.io/v1/ClusterRoleBinding">;
     protected __needs__(): {
-        role: ClusterRole<string>;
-        subjects: ServiceAccount<string>[];
+        role: ResourceRef<import("@k8ts/instruments").Gvk<"rbac.authorization.k8s.io/v1/ClusterRole">>;
+        subjects: ResourceRef<import("@k8ts/instruments").Gvk<"v1/ServiceAccount">>[];
     };
-    protected body(): CDK.KubeClusterRoleBindingProps;
+    protected __body__(): K8S.KubeClusterRoleBindingProps;
 }
 //# sourceMappingURL=cluster-role-binding.d.ts.map

package/dist/resources/rbac/cluster-role-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-role-binding.d.ts","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,MAAM,WAAW,uBAAuB;IACpC,KAAK,EAAE,WAAW,CAAA;IAClB,SAAS,EAAE,cAAc,EAAE,CAAA;CAC9B;AAED,qBAAa,kBAAkB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,OAAO,CACzE,IAAI,EACJ,uBAAuB,CAC1B;IACG,IAAI,IAAI,oGAEP;IAED,SAAS,CAAC,SAAS;;;;IAMnB,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,2BAA2B;CAcpD"}
+{"version":3,"file":"cluster-role-binding.d.ts","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC1F,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,MAAM,WAAW,uBACb,SAAQ,kBAAkB,CAAC,GAAG,CAAC,2BAA2B,CAAC;IAC3D,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACzC,SAAS,EAAE,WAAW,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAA;CAChD;AAED,qBAAa,kBAAkB,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,WAAW,CAC7E,IAAI,EACJ,uBAAuB,CAC1B;IACG,IAAI,IAAI,uFAEP;IAED,SAAS,CAAC,SAAS;;;;IAMnB,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,2BAA2B;CAexD"}

package/dist/resources/rbac/cluster-role-binding.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClusterRoleBinding = void 0;
 const instruments_1 = require("@k8ts/instruments");
-const rbac_1 = require("../../kinds/rbac");
-class ClusterRoleBinding extends instruments_1.Rsc_Top {
+const lodash_1 = require("lodash");
+const rbac_1 = require("../../gvks/rbac");
+class ClusterRoleBinding extends instruments_1.K8sResource {
     get kind() {
         return rbac_1.rbac.v1.ClusterRoleBinding._;
     }
@@ -13,19 +14,20 @@ class ClusterRoleBinding extends instruments_1.Rsc_Top {
             subjects: this.props.$subjects
         };
     }
-    body() {
-        return {
+    __body__() {
+        const body = {
             roleRef: {
-                apiGroup: this.props.$role.kind.parent.parent.text,
-                kind: this.props.$role.kind.name,
-                name: this.props.$role.name
+                apiGroup: this.props.$role.kind.parent.parent.url,
+                kind: this.props.$role.kind.value,
+                name: this.props.$role.ident.name
             },
             subjects: this.props.$subjects.map(sa => ({
-                kind: sa.kind.name,
-                name: sa.name,
-                namespace: sa.namespace
+                kind: sa.kind.value,
+                name: sa.ident.name,
+                namespace: sa.ident.namespace
             }))
         };
+        return (0, lodash_1.merge)(body, this.props.$$manifest);
     }
 }
 exports.ClusterRoleBinding = ClusterRoleBinding;

package/dist/resources/rbac/cluster-role-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-role-binding.js","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role-binding.ts"],"names":[],"mappings":";;;AAAA,mDAA2C;AAE3C,2CAAuC;AASvC,MAAa,kBAAiD,SAAQ,qBAGrE;IACG,IAAI,IAAI;QACJ,OAAO,WAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACvC,CAAC;IAES,SAAS;QACf,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;SACjC,CAAA;IACL,CAAC;IACS,IAAI;QACV,OAAO;YACH,OAAO,EAAE;gBACL,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAO,CAAC,MAAO,CAAC,IAAI;gBACpD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI;gBAChC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI;aAC9B;YACD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACtC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI;gBAClB,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,SAAS,EAAE,EAAE,CAAC,SAAU;aAC3B,CAAC,CAAC;SACN,CAAA;IACL,CAAC;CACJ;AA5BD,gDA4BC"}
+{"version":3,"file":"cluster-role-binding.js","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role-binding.ts"],"names":[],"mappings":";;;AAAA,mDAA0F;AAE1F,mCAA8B;AAE9B,0CAAsC;AAQtC,MAAa,kBAAiD,SAAQ,yBAGrE;IACG,IAAI,IAAI;QACJ,OAAO,WAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;IACvC,CAAC;IAES,SAAS;QACf,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YACtB,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;SACjC,CAAA;IACL,CAAC;IACS,QAAQ;QACd,MAAM,IAAI,GAAG;YACT,OAAO,EAAE;gBACL,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAO,CAAC,MAAO,CAAC,GAAG;gBACnD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;gBACjC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI;aACpC;YACD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBACtC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK;gBACnB,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI;gBACnB,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,SAAU;aACjC,CAAC,CAAC;SACN,CAAA;QACD,OAAO,IAAA,cAAK,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAC7C,CAAC;CACJ;AA7BD,gDA6BC"}

package/dist/resources/rbac/cluster-role.d.ts

@@ -1,28 +1,11 @@
-import { Ident_Kind, Rsc_Top, type Ident_Group } from "@k8ts/instruments";
-import { CDK } from "@k8ts/sample-interfaces";
-export interface ClusterRole_Rule<Groups extends Ident_Group[] = Ident_Group[], Resources extends Ident_Kind<Groups[number]["name"], string, string>[] = Ident_Kind[]> {
-    resources: Resources;
-    verbs: Verbs[];
-}
-export type ClusterRole_RuleProducer<Rules extends ClusterRole_Rule> = (scope: ClusterRole_Scope) => Iterable<Rules>;
-declare class ClusterRole_Scope {
-    Rule<const R extends Ident_Kind[]>(...resources: R): {
-        verbs(...verbs: Verbs[]): {
-            resources: R;
-            verbs: Verbs[];
-        };
-    };
-}
-export interface ClusterRole_Props<Rules extends ClusterRole_Rule = ClusterRole_Rule> {
-    rules: ClusterRole_RuleProducer<Rules>;
-}
-export declare class ClusterRole<Name extends string = string> extends Rsc_Top<Name, ClusterRole_Props> {
-    get kind(): Ident_Kind<"rbac.authorization.k8s.io", "v1", "ClusterRole">;
+import { K8sResource } from "@k8ts/instruments";
+import { K8S } from "@k8ts/sample-interfaces";
+import { type ClusterRole_Props } from "./role-props";
+export declare class ClusterRole<Name extends string = string> extends K8sResource<Name, ClusterRole_Props> {
+    get kind(): import("@k8ts/instruments").Gvk<"rbac.authorization.k8s.io/v1/ClusterRole">;
     constructor(name: Name, props: ClusterRole_Props);
     private _fromObject;
-    protected body(): CDK.KubeClusterRoleProps;
+    protected __body__(): K8S.KubeClusterRoleProps;
 }
 export type Verbs = "get" | "list" | "watch" | "create" | "update" | "patch" | "delete" | "deletecollection";
-export type ApiGroup = "namespaces" | "pods" | "services" | "endpoints" | "persistentvolumeclaims" | "events" | "configmaps" | "secrets" | "httproutes" | "gateways" | "jobs" | "cronjobs" | "deployments" | "replicasets" | "statefulsets" | "daemonsets" | "podtemplates" | "clusterroles" | "roles" | "rolebindings" | "clusterrolebindings" | "serviceaccounts" | "nodes" | "persistentvolumes" | "storageclasses" | "volumeattachments" | "persistentvolumeclaims";
-export {};
 //# sourceMappingURL=cluster-role.d.ts.map

package/dist/resources/rbac/cluster-role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-role.d.ts","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAG7C,MAAM,WAAW,gBAAgB,CAC7B,MAAM,SAAS,WAAW,EAAE,GAAG,WAAW,EAAE,EAC5C,SAAS,SAAS,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,UAAU,EAAE;IAErF,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,EAAE,KAAK,EAAE,CAAA;CACjB;AACD,MAAM,MAAM,wBAAwB,CAAC,KAAK,SAAS,gBAAgB,IAAI,CACnE,KAAK,EAAE,iBAAiB,KACvB,QAAQ,CAAC,KAAK,CAAC,CAAA;AACpB,cAAM,iBAAiB;IACnB,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,UAAU,EAAE,EAAE,GAAG,SAAS,EAAE,CAAC;wBAE1B,KAAK,EAAE;;;;;CAQlC;AACD,MAAM,WAAW,iBAAiB,CAAC,KAAK,SAAS,gBAAgB,GAAG,gBAAgB;IAChF,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,CAAA;CACzC;AAED,qBAAa,WAAW,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAC3F,IAAI,IAAI,iEAEP;gBACW,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB;IAIhD,OAAO,CAAC,WAAW;IAOnB,SAAS,CAAC,IAAI,IAAI,GAAG,CAAC,oBAAoB;CAW7C;AAED,MAAM,MAAM,KAAK,GACX,KAAK,GACL,MAAM,GACN,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,kBAAkB,CAAA;AAExB,MAAM,MAAM,QAAQ,GACd,YAAY,GACZ,MAAM,GACN,UAAU,GACV,WAAW,GACX,wBAAwB,GACxB,QAAQ,GACR,YAAY,GACZ,SAAS,GACT,YAAY,GACZ,UAAU,GACV,MAAM,GACN,UAAU,GACV,aAAa,GACb,aAAa,GACb,cAAc,GACd,YAAY,GACZ,cAAc,GACd,cAAc,GACd,OAAO,GACP,cAAc,GACd,qBAAqB,GACrB,iBAAiB,GACjB,OAAO,GACP,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,wBAAwB,CAAA"}
+{"version":3,"file":"cluster-role.d.ts","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAI7C,OAAO,EAAE,KAAK,iBAAiB,EAA4C,MAAM,cAAc,CAAA;AAC/F,qBAAa,WAAW,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,WAAW,CACtE,IAAI,EACJ,iBAAiB,CACpB;IACG,IAAI,IAAI,gFAEP;gBACW,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,iBAAiB;IAIhD,OAAO,CAAC,WAAW;IAOnB,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,oBAAoB;CAYjD;AAED,MAAM,MAAM,KAAK,GACX,KAAK,GACL,MAAM,GACN,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,kBAAkB,CAAA"}

package/dist/resources/rbac/cluster-role.js

@@ -3,20 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClusterRole = void 0;
 const instruments_1 = require("@k8ts/instruments");
 const doddle_1 = require("doddle");
-const rbac_1 = require("../../kinds/rbac");
-class ClusterRole_Scope {
-    Rule(...resources) {
-        return {
-            verbs(...verbs) {
-                return {
-                    resources: resources,
-                    verbs: verbs
-                };
-            }
-        };
-    }
-}
-class ClusterRole extends instruments_1.Rsc_Top {
+const lodash_1 = require("lodash");
+const rbac_1 = require("../../gvks/rbac");
+const role_props_1 = require("./role-props");
+class ClusterRole extends instruments_1.K8sResource {
     get kind() {
         return rbac_1.rbac.v1.ClusterRole._;
     }
@@ -25,21 +15,22 @@ class ClusterRole extends instruments_1.Rsc_Top {
     }
     _fromObject(rule) {
         return {
-            apiGroups: Array.from(new Set(rule.resources.map(x => x.parent.parent.name))),
+            apiGroups: Array.from(new Set(rule.resources.map(x => x.parent.parent.value))),
             resources: rule.resources.map(r => r.plural),
             verbs: rule.verbs
         };
     }
-    body() {
-        const rules = (0, doddle_1.seq)(this.props.rules(new ClusterRole_Scope()))
+    __body__() {
+        const rules = (0, doddle_1.seq)(this.props.rules$(new role_props_1.ClusterRole_Scope()))
             .map(rule => {
             return this._fromObject(rule);
         })
             .toArray()
             .pull();
-        return {
+        const body = {
             rules: rules
         };
+        return (0, lodash_1.merge)(body, this.props.$$manifest);
     }
 }
 exports.ClusterRole = ClusterRole;

package/dist/resources/rbac/cluster-role.js.map

@@ -1 +1 @@
-{"version":3,"file":"cluster-role.js","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role.ts"],"names":[],"mappings":";;;AAAA,mDAAyE;AAEzE,mCAA4B;AAC5B,2CAAuC;AAWvC,MAAM,iBAAiB;IACnB,IAAI,CAA+B,GAAG,SAAY;QAC9C,OAAO;YACH,KAAK,CAAC,GAAG,KAAc;gBACnB,OAAO;oBACH,SAAS,EAAE,SAAS;oBACpB,KAAK,EAAE,KAAK;iBACf,CAAA;YACL,CAAC;SACJ,CAAA;IACL,CAAC;CACJ;AAKD,MAAa,WAA0C,SAAQ,qBAAgC;IAC3F,IAAI,IAAI;QACJ,OAAO,WAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAChC,CAAC;IACD,YAAY,IAAU,EAAE,KAAwB;QAC5C,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAEO,WAAW,CAAC,IAAsB;QACtC,OAAO;YACH,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7E,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAA;IACL,CAAC;IACS,IAAI;QACV,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;aACvD,GAAG,CAAC,IAAI,CAAC,EAAE;YACR,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAC;aACD,OAAO,EAAE;aACT,IAAI,EAAE,CAAA;QACX,OAAO;YACH,KAAK,EAAE,KAAK;SACf,CAAA;IACL,CAAC;CACJ;AA1BD,kCA0BC"}
+{"version":3,"file":"cluster-role.js","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAE/C,mCAA4B;AAC5B,mCAA8B;AAC9B,0CAAsC;AACtC,6CAA+F;AAC/F,MAAa,WAA0C,SAAQ,yBAG9D;IACG,IAAI,IAAI;QACJ,OAAO,WAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;IAChC,CAAC;IACD,YAAY,IAAU,EAAE,KAAwB;QAC5C,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtB,CAAC;IAEO,WAAW,CAAC,IAAsB;QACtC,OAAO;YACH,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9E,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAA;IACL,CAAC;IACS,QAAQ;QACd,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,8BAAiB,EAAE,CAAC,CAAC;aACxD,GAAG,CAAC,IAAI,CAAC,EAAE;YACR,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACjC,CAAC,CAAC;aACD,OAAO,EAAE;aACT,IAAI,EAAE,CAAA;QACX,MAAM,IAAI,GAAG;YACT,KAAK,EAAE,KAAK;SACf,CAAA;QACD,OAAO,IAAA,cAAK,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAC7C,CAAC;CACJ;AA9BD,kCA8BC"}