kubernetes-fluent-client 1.8.3 → 1.9.0

package/dist/fluent/index.test.js

@@ -55,8 +55,7 @@ const generateFakePodManagedFields = (manager) => {
         mockedKubeExec.mockClear();
     });
     (0, globals_1.it)("should create a resource", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        const result = await kube.Create(fakeResource);
+        const result = await (0, _1.K8s)(upstream_1.Pod).Create(fakeResource);
         (0, globals_1.expect)(result).toEqual(fakeResource);
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             name: "fake",
@@ -64,8 +63,7 @@ const generateFakePodManagedFields = (manager) => {
         }), "POST", fakeResource);
     });
     (0, globals_1.it)("should delete a resource", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        await kube.Delete(fakeResource);
+        await (0, _1.K8s)(upstream_1.Pod).Delete(fakeResource);
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             name: "fake",
             namespace: "default",
@@ -75,14 +73,12 @@ const generateFakePodManagedFields = (manager) => {
         const patchOperations = [
             { op: "replace", path: "/metadata/name", value: "new-fake" },
         ];
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        const result = await kube.Patch(patchOperations);
+        const result = await (0, _1.K8s)(upstream_1.Pod).Patch(patchOperations);
         (0, globals_1.expect)(result).toEqual(fakeResource);
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, {}, "PATCH", patchOperations);
     });
     (0, globals_1.it)("should filter with WithField", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod).WithField("metadata.name", "fake");
-        await kube.Get();
+        await (0, _1.K8s)(upstream_1.Pod).WithField("metadata.name", "fake").Get();
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             fields: {
                 "metadata.name": "fake",
@@ -90,8 +86,7 @@ const generateFakePodManagedFields = (manager) => {
         }), "GET");
     });
     (0, globals_1.it)("should filter with WithLabel", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod).WithLabel("app", "fakeApp");
-        await kube.Get();
+        await (0, _1.K8s)(upstream_1.Pod).WithLabel("app", "fakeApp").Get();
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             labels: {
                 app: "fakeApp",
@@ -99,45 +94,37 @@ const generateFakePodManagedFields = (manager) => {
         }), "GET");
     });
     (0, globals_1.it)("should use InNamespace", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod).InNamespace("fakeNamespace");
-        await kube.Get();
+        await (0, _1.K8s)(upstream_1.Pod).InNamespace("fakeNamespace").Get();
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             namespace: "fakeNamespace",
         }), "GET");
     });
     (0, globals_1.it)("should throw an error if namespace is already specified", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod, { namespace: "default" });
-        (0, globals_1.expect)(() => kube.InNamespace("fakeNamespace")).toThrow("Namespace already specified: default");
+        (0, globals_1.expect)(() => (0, _1.K8s)(upstream_1.Pod, { namespace: "default" }).InNamespace("fakeNamespace")).toThrow("Namespace already specified: default");
     });
     (0, globals_1.it)("should handle Delete when the resource doesn't exist", async () => {
         mockedKubeExec.mockRejectedValueOnce({ status: 404 }); // Not Found on first call
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        await (0, globals_1.expect)(kube.Delete("fakeResource")).resolves.toBeUndefined();
+        await (0, globals_1.expect)((0, _1.K8s)(upstream_1.Pod).Delete("fakeResource")).resolves.toBeUndefined();
     });
     (0, globals_1.it)("should handle Get", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        const result = await kube.Get("fakeResource");
+        const result = await (0, _1.K8s)(upstream_1.Pod).Get("fakeResource");
         (0, globals_1.expect)(result).toEqual(fakeResource);
         (0, globals_1.expect)(mockedKubeExec).toHaveBeenCalledWith(upstream_1.Pod, globals_1.expect.objectContaining({
             name: "fakeResource",
         }), "GET");
     });
     (0, globals_1.it)("should thrown an error if Get is called with a name and filters are already specified a name", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod, { name: "fake" });
-        await (0, globals_1.expect)(kube.Get("fakeResource")).rejects.toThrow("Name already specified: fake");
+        await (0, globals_1.expect)((0, _1.K8s)(upstream_1.Pod, { name: "fake" }).Get("fakeResource")).rejects.toThrow("Name already specified: fake");
     });
     (0, globals_1.it)("should throw an error if no patch operations provided", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        await (0, globals_1.expect)(kube.Patch([])).rejects.toThrow("No operations specified");
+        await (0, globals_1.expect)((0, _1.K8s)(upstream_1.Pod).Patch([])).rejects.toThrow("No operations specified");
     });
     (0, globals_1.it)("should allow Apply of deep partials", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        const result = await kube.Apply({ metadata: { name: "fake" }, spec: { priority: 3 } });
+        const result = await (0, _1.K8s)(upstream_1.Pod).Apply({ metadata: { name: "fake" }, spec: { priority: 3 } });
         (0, globals_1.expect)(result).toEqual(fakeResource);
     });
     (0, globals_1.it)("should allow force apply to resolve FieldManagerConflict", async () => {
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        const result = await kube.Apply({
+        const result = await (0, _1.K8s)(upstream_1.Pod).Apply({
             metadata: { name: "fake", managedFields: generateFakePodManagedFields("kubectl") },
             spec: { priority: 3 },
         }, { force: true });
@@ -145,7 +132,6 @@ const generateFakePodManagedFields = (manager) => {
     });
     (0, globals_1.it)("should throw an error if a Delete failed for a reason other than Not Found", async () => {
         mockedKubeExec.mockRejectedValueOnce({ status: 500 }); // Internal Server Error on first call
-        const kube = (0, _1.K8s)(upstream_1.Pod);
-        await (0, globals_1.expect)(kube.Delete("fakeResource")).rejects.toEqual(globals_1.expect.objectContaining({ status: 500 }));
+        await (0, globals_1.expect)((0, _1.K8s)(upstream_1.Pod).Delete("fakeResource")).rejects.toEqual(globals_1.expect.objectContaining({ status: 500 }));
     });
 });

package/dist/fluent/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/fluent/types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC;;GAEG;AACH,oBAAY,UAAU;IACpB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,OAAO,YAAY;CACpB;AAED,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AAE3F,MAAM,WAAW,OAAO;IACtB,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,gBAAgB,IAAI;IACpD,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,gBAAgB,IAAI;IAC3D;;;;OAIG;IACH,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAEpB;;;;OAIG;IACH,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;;;OAMG;IACH,KAAK,EAAE,CACL,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,KAAK,IAAI,EACjD,QAAQ,CAAC,EAAE,QAAQ,KAChB,OAAO,CAAC,eAAe,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,gBAAgB,IAAI;IAC7D;;;;;;OAMG;IACH,KAAK,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAErE;;;;;OAKG;IACH,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpC;;;;;;;OAOG;IACH,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,gBAAgB,IAAI,kBAAkB,CAAC,CAAC,CAAC,GAAG;IAC/E;;;;;;;;;;;;;;;;;;OAkBG;IACH,SAAS,EAAE,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC;IAE5E;;;;;;;;;;;;;;;;;OAiBG;IACH,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,gBAAgB,IAAI,cAAc,CAAC,CAAC,CAAC,GACjE,oBAAoB,CAAC,CAAC,CAAC,GAAG;IACxB;;;;;OAKG;IACH,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC;CACvD,CAAC;AAEJ,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAC9F,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,UAAU,KACd,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAG1B,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GACvC,CAAC,SAAS,MAAM,GAAG,MAAM,GACvB,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,EAAE,GACpC,KAAK,GACP,KAAK,CAAC;AAEV,MAAM,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC7D,KAAK,GACL,CAAC,SAAS,MAAM,GACd;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CACpF,CAAC,MAAM,CAAC,CAAC,GACV,EAAE,CAAC"}

package/dist/helpers.d.ts

@@ -1,3 +1,4 @@
+import { Cluster } from "@kubernetes/client-node";
 /**
  * Get an environment variable (Node, Deno or Bun), or throw an error if it's not set.
  *
@@ -15,4 +16,11 @@
  * @throws An error if the environment variable is not set.
  */
 export declare function fromEnv(name: string): string;
+/**
+ * Wait for the Kubernetes cluster to be ready.
+ *
+ * @param seconds The number of seconds to wait for the cluster to be ready.
+ * @returns The current cluster.
+ */
+export declare function waitForCluster(seconds?: number): Promise<Cluster>;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAqB5C"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAc,MAAM,yBAAyB,CAAC;AAkB9D;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAqB5C;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,SAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAenE"}

package/dist/helpers.js

@@ -2,7 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromEnv = void 0;
+exports.waitForCluster = exports.fromEnv = void 0;
+const client_node_1 = require("@kubernetes/client-node");
+/**
+ *  Sleep for a number of seconds.
+ *
+ * @param seconds The number of seconds to sleep.
+ * @returns A promise that resolves after the specified number of seconds.
+ */
+function sleep(seconds) {
+    return new Promise(resolve => setTimeout(resolve, seconds * 1000));
+}
 /**
  * Get an environment variable (Node, Deno or Bun), or throw an error if it's not set.
  *
@@ -39,3 +49,25 @@ function fromEnv(name) {
     return envValue;
 }
 exports.fromEnv = fromEnv;
+/**
+ * Wait for the Kubernetes cluster to be ready.
+ *
+ * @param seconds The number of seconds to wait for the cluster to be ready.
+ * @returns The current cluster.
+ */
+async function waitForCluster(seconds = 30) {
+    const kubeConfig = new client_node_1.KubeConfig();
+    kubeConfig.loadFromDefault();
+    const cluster = kubeConfig.getCurrentCluster();
+    if (!cluster) {
+        await sleep(1);
+        if (seconds > 0) {
+            return await waitForCluster(seconds - 1);
+        }
+        else {
+            throw new Error("Cluster not ready");
+        }
+    }
+    return cluster;
+}
+exports.waitForCluster = waitForCluster;

package/dist/helpers.test.js

@@ -14,3 +14,9 @@ const helpers_1 = require("./helpers");
         delete process.env.MY_ENV_VAR;
     });
 });
+(0, globals_1.describe)("Cluster Wait Function", () => {
+    (0, globals_1.it)("should resolve if the cluster is already ready", async () => {
+        const cluster = await (0, helpers_1.waitForCluster)(5);
+        (0, globals_1.expect)(cluster).toEqual({ server: "http://jest-test:8080" });
+    });
+});

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import "./patch";
 import * as kind from "./upstream";
 /** kind is a collection of K8s types to be used within a K8s call: `K8s(kind.Secret).Apply({})`. */
 export { kind };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAEnC,oGAAoG;AACpG,OAAO,EAAE,IAAI,EAAE,CAAC;AAGhB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,cAAc,SAAS,CAAC;AAExB,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,SAAS,CAAC;AAGjB,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AAEnC,oGAAoG;AACpG,OAAO,EAAE,IAAI,EAAE,CAAC;AAGhB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,WAAW,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAG/D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAG/B,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,cAAc,SAAS,CAAC;AAExB,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -29,6 +29,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromEnv = exports.K8sClientNode = exports.GenericKind = exports.modelToGroupVersionKind = exports.RegisterKind = exports.K8s = exports.fetchStatus = exports.fetch = exports.kind = void 0;
+require("./patch");
 // Export kinds as a single object
 const kind = __importStar(require("./upstream"));
 exports.kind = kind;

package/dist/kinds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kinds.d.ts","sourceRoot":"","sources":["../src/kinds.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAokBzD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAErE;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,YAAY,oBAAoB,gBAAgB,SAUnF,CAAC"}
+{"version":3,"file":"kinds.d.ts","sourceRoot":"","sources":["../src/kinds.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAqkBzD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAErE;AAED;;;;;GAKG;AACH,eAAO,MAAM,YAAY,UAAW,YAAY,oBAAoB,gBAAgB,SAUnF,CAAC"}

package/dist/kinds.js

@@ -473,6 +473,7 @@ const gvkMap = {
         kind: "NetworkPolicy",
         version: "v1",
         group: "networking.k8s.io",
+        plural: "networkpolicies",
     },
     /**
      * Represents a K8s RuntimeClass resource.

package/dist/kinds.test.js

@@ -52,7 +52,12 @@ const testCases = [
     { name: index_1.kind.Ingress, expected: { group: "networking.k8s.io", version: "v1", kind: "Ingress" } },
     {
         name: index_1.kind.NetworkPolicy,
-        expected: { group: "networking.k8s.io", version: "v1", kind: "NetworkPolicy" },
+        expected: {
+            group: "networking.k8s.io",
+            version: "v1",
+            kind: "NetworkPolicy",
+            plural: "networkpolicies",
+        },
     },
     { name: index_1.kind.Node, expected: { group: "", version: "v1", kind: "Node" } },
     { name: index_1.kind.PersistentVolume, expected: { group: "", version: "v1", kind: "PersistentVolume" } },

package/dist/patch.d.ts

@@ -0,0 +1,7 @@
+import { V1NetworkPolicyPeer } from "@kubernetes/client-node";
+declare module "@kubernetes/client-node" {
+    interface V1NetworkPolicyIngressRule {
+        from?: Array<V1NetworkPolicyPeer>;
+    }
+}
+//# sourceMappingURL=patch.d.ts.map

package/dist/patch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"patch.d.ts","sourceRoot":"","sources":["../src/patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,QAAQ,yBAAyB,CAAC;IACvC,UAAU,0BAA0B;QAClC,IAAI,CAAC,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC;KAEnC;CACF"}

package/dist/patch.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "1.8.3",
+  "version": "1.9.0",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -40,29 +40,26 @@
     "fast-json-patch": "3.1.1",
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
-    "quicktype-core": "github:defenseunicorns/temp-quicktype-fork#main",
-    "type-fest": "4.7.1",
+    "quicktype-core": "23.0.80",
+    "type-fest": "4.8.2",
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "18.4.0",
-    "@commitlint/config-conventional": "18.4.0",
+    "@commitlint/cli": "18.4.3",
+    "@commitlint/config-conventional": "18.4.3",
     "@jest/globals": "29.7.0",
     "@types/byline": "4.2.36",
-    "@types/readable-stream": "4.0.5",
-    "@types/yargs": "17.0.31",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
+    "@types/readable-stream": "4.0.9",
+    "@types/yargs": "17.0.32",
+    "@typescript-eslint/eslint-plugin": "6.13.1",
+    "@typescript-eslint/parser": "6.13.1",
     "eslint-plugin-jsdoc": "46.9.0",
     "jest": "29.7.0",
-    "nock": "13.3.8",
-    "prettier": "3.0.3",
-    "semantic-release": "22.0.7",
+    "nock": "13.4.0",
+    "prettier": "3.1.0",
+    "semantic-release": "22.0.8",
     "ts-jest": "29.1.1",
-    "typescript": "5.2.2"
-  },
-  "overrides": {
-    "browser-or-node": "github:defenseunicorns/browser-or-node#master"
+    "typescript": "5.3.2"
   },
   "release": {
     "branches": [

package/src/fluent/index.test.ts

@@ -60,8 +60,7 @@ describe("Kube", () => {
   });
 
   it("should create a resource", async () => {
-    const kube = K8s(Pod);
-    const result = await kube.Create(fakeResource);
+    const result = await K8s(Pod).Create(fakeResource);
 
     expect(result).toEqual(fakeResource);
     expect(mockedKubeExec).toHaveBeenCalledWith(
@@ -76,8 +75,7 @@ describe("Kube", () => {
   });
 
   it("should delete a resource", async () => {
-    const kube = K8s(Pod);
-    await kube.Delete(fakeResource);
+    await K8s(Pod).Delete(fakeResource);
 
     expect(mockedKubeExec).toHaveBeenCalledWith(
       Pod,
@@ -94,16 +92,15 @@ describe("Kube", () => {
       { op: "replace", path: "/metadata/name", value: "new-fake" },
     ];
 
-    const kube = K8s(Pod);
-    const result = await kube.Patch(patchOperations);
+    const result = await K8s(Pod).Patch(patchOperations);
 
     expect(result).toEqual(fakeResource);
     expect(mockedKubeExec).toHaveBeenCalledWith(Pod, {}, "PATCH", patchOperations);
   });
 
   it("should filter with WithField", async () => {
-    const kube = K8s(Pod).WithField("metadata.name", "fake");
-    await kube.Get();
+    await K8s(Pod).WithField("metadata.name", "fake").Get();
+
     expect(mockedKubeExec).toHaveBeenCalledWith(
       Pod,
       expect.objectContaining({
@@ -116,8 +113,8 @@ describe("Kube", () => {
   });
 
   it("should filter with WithLabel", async () => {
-    const kube = K8s(Pod).WithLabel("app", "fakeApp");
-    await kube.Get();
+    await K8s(Pod).WithLabel("app", "fakeApp").Get();
+
     expect(mockedKubeExec).toHaveBeenCalledWith(
       Pod,
       expect.objectContaining({
@@ -130,8 +127,8 @@ describe("Kube", () => {
   });
 
   it("should use InNamespace", async () => {
-    const kube = K8s(Pod).InNamespace("fakeNamespace");
-    await kube.Get();
+    await K8s(Pod).InNamespace("fakeNamespace").Get();
+
     expect(mockedKubeExec).toHaveBeenCalledWith(
       Pod,
       expect.objectContaining({
@@ -142,19 +139,18 @@ describe("Kube", () => {
   });
 
   it("should throw an error if namespace is already specified", async () => {
-    const kube = K8s(Pod, { namespace: "default" });
-    expect(() => kube.InNamespace("fakeNamespace")).toThrow("Namespace already specified: default");
+    expect(() => K8s(Pod, { namespace: "default" }).InNamespace("fakeNamespace")).toThrow(
+      "Namespace already specified: default",
+    );
   });
 
   it("should handle Delete when the resource doesn't exist", async () => {
     mockedKubeExec.mockRejectedValueOnce({ status: 404 }); // Not Found on first call
-    const kube = K8s(Pod);
-    await expect(kube.Delete("fakeResource")).resolves.toBeUndefined();
+    await expect(K8s(Pod).Delete("fakeResource")).resolves.toBeUndefined();
   });
 
   it("should handle Get", async () => {
-    const kube = K8s(Pod);
-    const result = await kube.Get("fakeResource");
+    const result = await K8s(Pod).Get("fakeResource");
 
     expect(result).toEqual(fakeResource);
     expect(mockedKubeExec).toHaveBeenCalledWith(
@@ -167,24 +163,22 @@ describe("Kube", () => {
   });
 
   it("should thrown an error if Get is called with a name and filters are already specified a name", async () => {
-    const kube = K8s(Pod, { name: "fake" });
-    await expect(kube.Get("fakeResource")).rejects.toThrow("Name already specified: fake");
+    await expect(K8s(Pod, { name: "fake" }).Get("fakeResource")).rejects.toThrow(
+      "Name already specified: fake",
+    );
   });
 
   it("should throw an error if no patch operations provided", async () => {
-    const kube = K8s(Pod);
-    await expect(kube.Patch([])).rejects.toThrow("No operations specified");
+    await expect(K8s(Pod).Patch([])).rejects.toThrow("No operations specified");
   });
 
   it("should allow Apply of deep partials", async () => {
-    const kube = K8s(Pod);
-    const result = await kube.Apply({ metadata: { name: "fake" }, spec: { priority: 3 } });
+    const result = await K8s(Pod).Apply({ metadata: { name: "fake" }, spec: { priority: 3 } });
     expect(result).toEqual(fakeResource);
   });
 
   it("should allow force apply to resolve FieldManagerConflict", async () => {
-    const kube = K8s(Pod);
-    const result = await kube.Apply(
+    const result = await K8s(Pod).Apply(
       {
         metadata: { name: "fake", managedFields: generateFakePodManagedFields("kubectl") },
         spec: { priority: 3 },
@@ -196,8 +190,7 @@ describe("Kube", () => {
 
   it("should throw an error if a Delete failed for a reason other than Not Found", async () => {
     mockedKubeExec.mockRejectedValueOnce({ status: 500 }); // Internal Server Error on first call
-    const kube = K8s(Pod);
-    await expect(kube.Delete("fakeResource")).rejects.toEqual(
+    await expect(K8s(Pod).Delete("fakeResource")).rejects.toEqual(
       expect.objectContaining({ status: 500 }),
     );
   });

package/src/fluent/types.ts

@@ -167,5 +167,7 @@ type Join<K, P> = K extends string | number
 export type Paths<T, D extends number = 10> = [D] extends [never]
   ? never
   : T extends object
-  ? { [K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K]>> : never }[keyof T]
-  : "";
+    ? {
+        [K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K]>> : never;
+      }[keyof T]
+    : "";

package/src/helpers.test.ts

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 
-import { describe, expect, test } from "@jest/globals";
+import { describe, expect, it, test } from "@jest/globals";
 
-import { fromEnv } from "./helpers";
+import { fromEnv, waitForCluster } from "./helpers";
 
 describe("helpers", () => {
   test("fromEnv for NodeJS", () => {
@@ -16,3 +16,10 @@ describe("helpers", () => {
     delete process.env.MY_ENV_VAR;
   });
 });
+
+describe("Cluster Wait Function", () => {
+  it("should resolve if the cluster is already ready", async () => {
+    const cluster = await waitForCluster(5);
+    expect(cluster).toEqual({ server: "http://jest-test:8080" });
+  });
+});

package/src/helpers.ts

@@ -1,12 +1,24 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 
+import { Cluster, KubeConfig } from "@kubernetes/client-node";
+
 declare const Deno: {
   env: {
     get(name: string): string | undefined;
   };
 };
 
+/**
+ *  Sleep for a number of seconds.
+ *
+ * @param seconds The number of seconds to sleep.
+ * @returns A promise that resolves after the specified number of seconds.
+ */
+function sleep(seconds: number): Promise<void> {
+  return new Promise(resolve => setTimeout(resolve, seconds * 1000));
+}
+
 /**
  * Get an environment variable (Node, Deno or Bun), or throw an error if it's not set.
  *
@@ -45,3 +57,26 @@ export function fromEnv(name: string): string {
 
   return envValue;
 }
+
+/**
+ * Wait for the Kubernetes cluster to be ready.
+ *
+ * @param seconds The number of seconds to wait for the cluster to be ready.
+ * @returns The current cluster.
+ */
+export async function waitForCluster(seconds = 30): Promise<Cluster> {
+  const kubeConfig = new KubeConfig();
+  kubeConfig.loadFromDefault();
+
+  const cluster = kubeConfig.getCurrentCluster();
+  if (!cluster) {
+    await sleep(1);
+    if (seconds > 0) {
+      return await waitForCluster(seconds - 1);
+    } else {
+      throw new Error("Cluster not ready");
+    }
+  }
+
+  return cluster;
+}

package/src/index.ts

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 
+import "./patch";
+
 // Export kinds as a single object
 import * as kind from "./upstream";
 

package/src/kinds.test.ts

@@ -54,7 +54,12 @@ const testCases = [
   { name: kind.Ingress, expected: { group: "networking.k8s.io", version: "v1", kind: "Ingress" } },
   {
     name: kind.NetworkPolicy,
-    expected: { group: "networking.k8s.io", version: "v1", kind: "NetworkPolicy" },
+    expected: {
+      group: "networking.k8s.io",
+      version: "v1",
+      kind: "NetworkPolicy",
+      plural: "networkpolicies",
+    },
   },
   { name: kind.Node, expected: { group: "", version: "v1", kind: "Node" } },
   { name: kind.PersistentVolume, expected: { group: "", version: "v1", kind: "PersistentVolume" } },

package/src/kinds.ts

@@ -506,6 +506,7 @@ const gvkMap: Record<string, GroupVersionKind> = {
     kind: "NetworkPolicy",
     version: "v1",
     group: "networking.k8s.io",
+    plural: "networkpolicies",
   },
 
   /**

package/src/patch.ts

@@ -0,0 +1,8 @@
+import { V1NetworkPolicyPeer } from "@kubernetes/client-node";
+
+declare module "@kubernetes/client-node" {
+  interface V1NetworkPolicyIngressRule {
+    from?: Array<V1NetworkPolicyPeer>;
+    // No need to redeclare other unchanged properties
+  }
+}