k8ts 0.11.2 → 0.11.3

package/dist/kinds/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/kinds/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,yBAAiB,OAAO,CAAC;IACd,MAAM,CAAC,8BAA+B,CAAA;IAC7C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;IACxB,UAAiB,OAAO,CAAC;QACd,MAAM,CAAC,2CAA+B,CAAA;QAC7C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;QACxB,UAAiB,WAAW,CAAC;YAClB,MAAM,CAAC,uDAAgC,CAAA;YAC9C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;SAC3B;QACD,UAAiB,UAAU,CAAC;YACjB,MAAM,CAAC,sDAA+B,CAAA;YAC7C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;SAC3B;KACJ;CACJ"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/kinds/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,yBAAiB,OAAO,CAAC;IACd,MAAM,CAAC,8BAA+B,CAAA;IAC7C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;IACxB,UAAiB,OAAO,CAAC;QACd,MAAM,CAAC,2CAA+B,CAAA;QAC7C,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;QACxB,UAAiB,WAAW,CAAC;YAClB,MAAM,CAAC,uDAAyC,CAAA;YACvD,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;SAC3B;QACD,UAAiB,UAAU,CAAC;YACjB,MAAM,CAAC,sDAAuC,CAAA;YACrD,KAAY,CAAC,GAAG,OAAO,CAAC,CAAA;SAC3B;KACJ;CACJ"}

package/dist/kinds/metrics.js

@@ -10,11 +10,11 @@ var metrics;
         v1beta1._ = metrics._.version("v1beta1");
         let NodeMetrics;
         (function (NodeMetrics) {
-            NodeMetrics._ = v1beta1._.kind("NodeMetrics");
+            NodeMetrics._ = v1beta1._.kind("NodeMetrics", "nodes");
         })(NodeMetrics = v1beta1.NodeMetrics || (v1beta1.NodeMetrics = {}));
         let PodMetrics;
         (function (PodMetrics) {
-            PodMetrics._ = v1beta1._.kind("PodMetrics");
+            PodMetrics._ = v1beta1._.kind("PodMetrics", "pods");
         })(PodMetrics = v1beta1.PodMetrics || (v1beta1.PodMetrics = {}));
     })(v1beta1 = metrics.v1beta1 || (metrics.v1beta1 = {}));
 })(metrics || (exports.metrics = metrics = {}));

package/dist/kinds/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/kinds/metrics.ts"],"names":[],"mappings":";;;AAAA,mDAAwC;AAExC,IAAiB,OAAO,CAevB;AAfD,WAAiB,OAAO;IACP,SAAC,GAAG,kBAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAE7C,IAAiB,OAAO,CAWvB;IAXD,WAAiB,OAAO;QACP,SAAC,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAE7C,IAAiB,WAAW,CAG3B;QAHD,WAAiB,WAAW;YACX,aAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAElD,CAAC,EAHgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAG3B;QACD,IAAiB,UAAU,CAG1B;QAHD,WAAiB,UAAU;YACV,YAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAEjD,CAAC,EAHgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAG1B;IACL,CAAC,EAXgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAWvB;AACL,CAAC,EAfgB,OAAO,uBAAP,OAAO,QAevB"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/kinds/metrics.ts"],"names":[],"mappings":";;;AAAA,mDAAwC;AAExC,IAAiB,OAAO,CAevB;AAfD,WAAiB,OAAO;IACP,SAAC,GAAG,kBAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAE7C,IAAiB,OAAO,CAWvB;IAXD,WAAiB,OAAO;QACP,SAAC,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAE7C,IAAiB,WAAW,CAG3B;QAHD,WAAiB,WAAW;YACX,aAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;QAE3D,CAAC,EAHgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAG3B;QACD,IAAiB,UAAU,CAG1B;QAHD,WAAiB,UAAU;YACV,YAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;QAEzD,CAAC,EAHgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAG1B;IACL,CAAC,EAXgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAWvB;AACL,CAAC,EAfgB,OAAO,uBAAP,OAAO,QAevB"}

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

@@ -16,7 +16,7 @@ class ClusterRoleBinding extends instruments_1.Resource_Top {
     body() {
         return {
             roleRef: {
-                apiGroup: this.props.$role.kind.parent.text,
+                apiGroup: this.props.$role.kind.parent.parent.text,
                 kind: this.props.$role.kind.name,
                 name: this.props.$role.name
             },

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,mDAAgD;AAEhD,2CAAuC;AASvC,MAAa,kBAAiD,SAAQ,0BAGrE;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,IAAI;gBAC5C,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,mDAAgD;AAEhD,2CAAuC;AASvC,MAAa,kBAAiD,SAAQ,0BAGrE;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"}

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

@@ -25,7 +25,7 @@ class ClusterRole extends instruments_1.Resource_Top {
     }
     _fromObject(rule) {
         return {
-            apiGroups: rule.resources.map(x => x.parent.parent.name),
+            apiGroups: Array.from(new Set(rule.resources.map(x => x.parent.parent.name))),
             resources: rule.resources.map(r => r.plural),
             verbs: rule.verbs
         };

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,mDAAsD;AAEtD,mCAA4B;AAC5B,2CAAuC;AAWvC,MAAM,iBAAiB;IACnB,IAAI,CAAyB,GAAG,SAAY;QACxC,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,0BAG9D;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,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YACxD,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;AA7BD,kCA6BC"}
+{"version":3,"file":"cluster-role.js","sourceRoot":"","sources":["../../../src/resources/rbac/cluster-role.ts"],"names":[],"mappings":";;;AAAA,mDAAsD;AAEtD,mCAA4B;AAC5B,2CAAuC;AAWvC,MAAM,iBAAiB;IACnB,IAAI,CAAyB,GAAG,SAAY;QACxC,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,0BAG9D;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,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;AA7BD,kCA6BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k8ts",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Powerful framework for building Kubernetes manifests in TypeScript.",
   "keywords": [
     "k8ts",
@@ -62,7 +62,7 @@
     "test": "tsx --tsconfig ./example/tsconfig.json ./example/run.ts"
   },
   "dependencies": {
-    "@k8ts/sample-interfaces": "^0.4.1",
+    "@k8ts/sample-interfaces": "^0.4.2",
     "chalk": "4.1.2",
     "dayjs": "^1.11.13",
     "doddle": "^7.2.0",
@@ -77,8 +77,8 @@
     "what-are-you": "^0.2.0"
   },
   "devDependencies": {
-    "@k8ts/instruments": "^0.9.1",
-    "@k8ts/metadata": "^0.7.1",
+    "@k8ts/instruments": "^0.9.2",
+    "@k8ts/metadata": "^0.7.2",
     "@types/chalk": "^2.2.4",
     "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4",
@@ -95,8 +95,8 @@
     "yamprint": "^0.8.4"
   },
   "peerDependencies": {
-    "@k8ts/instruments": "^0.9.1",
-    "@k8ts/metadata": "^0.7.1"
+    "@k8ts/instruments": "^0.9.2",
+    "@k8ts/metadata": "^0.7.2"
   },
   "engines": {
     "node": ">=16.0.0"

package/src/kinds/metrics.ts

@@ -7,11 +7,11 @@ export namespace metrics {
         export const _ = metrics._.version("v1beta1")
         export type _ = typeof _
         export namespace NodeMetrics {
-            export const _ = v1beta1._.kind("NodeMetrics")
+            export const _ = v1beta1._.kind("NodeMetrics", "nodes")
             export type _ = typeof _
         }
         export namespace PodMetrics {
-            export const _ = v1beta1._.kind("PodMetrics")
+            export const _ = v1beta1._.kind("PodMetrics", "pods")
             export type _ = typeof _
         }
     }

package/src/resources/rbac/cluster-role-binding.ts

@@ -26,7 +26,7 @@ export class ClusterRoleBinding<Name extends string = string> extends Resource_T
     protected body(): CDK.KubeClusterRoleBindingProps {
         return {
             roleRef: {
-                apiGroup: this.props.$role.kind.parent!.text,
+                apiGroup: this.props.$role.kind.parent!.parent!.text,
                 kind: this.props.$role.kind.name,
                 name: this.props.$role.name
             },

package/src/resources/rbac/cluster-role.ts

@@ -41,7 +41,7 @@ export class ClusterRole<Name extends string = string> extends Resource_Top<
 
     private _fromObject(rule: ClusterRole_Rule) {
         return {
-            apiGroups: rule.resources.map(x => x.parent.parent.name),
+            apiGroups: Array.from(new Set(rule.resources.map(x => x.parent.parent.name))),
             resources: rule.resources.map(r => r.plural),
             verbs: rule.verbs
         }