kubernetes-fluent-client 3.3.4 → 3.3.6

package/.husky/pre-commit

@@ -1 +1 @@
-npx lint-staged --verbose
+npx lint-staged --verbose 

package/.lintstagedrc.json

@@ -1,5 +1,6 @@
 {
   "*.ts": ["prettier --write", "eslint --fix"],
   "*.js": ["prettier --write", "eslint --fix"],
-  "*.json": ["prettier --write"]
+  "*.json": ["prettier --write"],
+  "exclude": ["e2e/**"]
 }

package/.prettierignore

@@ -1,4 +1,5 @@
 e2e/crds
 e2e/crds/**/*.ts
 e2e/generated
-generated/**/*.ts
+generated/**/*.ts
+e2e/*.ts

package/CODEOWNERS

@@ -1,7 +1,6 @@
-* @jeff-mccoy @cmwylie19 @btlghrants @schaeferka
+* @defenseunicorns/pepr
 
 # Additional privileged files
-/CODEOWNERS @jeff-mccoy @austenbryan
-/cosign.pub @jeff-mccoy @austenbryan
+/CODEOWNERS @jeff-mccoy @daveworth
+/cosign.pub @jeff-mccoy @daveworth
 /LICENSE @jeff-mccoy @austenbryan
-

package/codeql-config.yaml

@@ -0,0 +1,3 @@
+name: "Custom CodeQL Config"
+exclude:
+  - "**/e2e/**"

package/dist/fetch.d.ts

@@ -1,4 +1,4 @@
-import { RequestInfo, RequestInit } from "node-fetch";
+import { RequestInfo, RequestInit } from "undici";
 export type FetchResponse<T> = {
     data: T;
     ok: boolean;

package/dist/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAIA,OAAiB,EAAc,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5E,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,CAAC,EAC3B,GAAG,EAAE,GAAG,GAAG,WAAW,EACtB,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwC3B"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,WAAW,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAExE,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,CAAC,EAC3B,GAAG,EAAE,GAAG,GAAG,WAAW,EACtB,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CA+B3B"}

package/dist/fetch.js

@@ -1,33 +1,10 @@
 "use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetch = fetch;
 const http_status_codes_1 = require("http-status-codes");
-const node_fetch_1 = __importStar(require("node-fetch"));
+const undici_1 = require("undici");
 /**
  * Perform an async HTTP call and return the parsed JSON response, optionally
  * as a specific type.
@@ -44,11 +21,11 @@ const node_fetch_1 = __importStar(require("node-fetch"));
 async function fetch(url, init) {
     let data = undefined;
     try {
-        const resp = await (0, node_fetch_1.default)(url, init);
+        const resp = await (0, undici_1.fetch)(url, init);
         const contentType = resp.headers.get("content-type") || "";
         // Parse the response as JSON if the content type is JSON
         if (contentType.includes("application/json")) {
-            data = await resp.json();
+            data = (await resp.json());
         }
         else {
             // Otherwise, return however the response was read
@@ -62,21 +39,13 @@ async function fetch(url, init) {
         };
     }
     catch (e) {
-        if (e instanceof node_fetch_1.FetchError) {
-            // Parse the error code from the FetchError or default to 400 (Bad Request)
-            const status = parseInt(e.code || "400");
-            return {
-                data,
-                ok: false,
-                status,
-                statusText: e.message,
-            };
-        }
+        const status = parseInt(e?.code) || http_status_codes_1.StatusCodes.BAD_REQUEST;
+        const statusText = e?.message || "Unknown error";
         return {
             data,
             ok: false,
-            status: http_status_codes_1.StatusCodes.BAD_REQUEST,
-            statusText: "Unknown error",
+            status,
+            statusText,
         };
     }
 }

package/dist/fileSystem.js

@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeFileSystem = void 0;
 const fs = __importStar(require("fs"));

package/dist/fluent/types.d.ts

@@ -1,10 +1,18 @@
 import { KubernetesListObject, KubernetesObject } from "@kubernetes/client-node";
 import { Operation } from "fast-json-patch";
 import type { PartialDeep } from "type-fest";
+import { RequestInit as UndiciRequestInit } from "undici";
 import { GenericClass, GroupVersionKind } from "../types";
 import { WatchCfg, Watcher } from "./watch";
 import https from "https";
 import { SecureClientSessionOptions } from "http2";
+/**
+ * Fetch options and server URL
+ */
+export type K8sConfigPromise = Promise<{
+    opts: UndiciRequestInit;
+    serverUrl: string | URL;
+}>;
 /**
  * Agent options for the the http2Watch
  */

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":"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"}

package/dist/fluent/utils.d.ts

@@ -1,6 +1,27 @@
+import { RequestInit } from "node-fetch";
 import { URL } from "url";
+import { Dispatcher } from "undici";
 import { GenericClass } from "../types";
-import { ApplyCfg, FetchMethods, Filters } from "./types";
+import { ApplyCfg, FetchMethods, Filters, K8sConfigPromise } from "./types";
+/**
+ * Get the headers for a request
+ *
+ * @returns the headers for undici
+ */
+export declare function getHeaders(): Promise<Record<string, string>>;
+/**
+ * Get the agent for a request
+ *
+ * @param opts - the request options from node-fetch
+ * @returns the agent for undici
+ */
+export declare function getHTTPSAgent(opts: RequestInit): Dispatcher | undefined;
+/**
+ * Read the serviceAccount Token
+ *
+ * @returns token or null
+ */
+export declare function getToken(): Promise<string | null>;
 /**
  * Generate a path to a Kubernetes resource
  *
@@ -22,10 +43,7 @@ export declare function pathBuilder<T extends GenericClass>(serverUrl: string, m
  * @param method - the HTTP method to use
  * @returns the fetch options and server URL
  */
-export declare function k8sCfg(method: FetchMethods): Promise<{
-    opts: import("node-fetch").RequestInit;
-    serverUrl: string;
-}>;
+export declare function k8sCfg(method: FetchMethods): K8sConfigPromise;
 /**
  * Execute a request against the Kubernetes API server.
  *

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAI1B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAI1D;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAwDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY;;;GAwBhD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,EACrB,QAAQ,GAAE,QAA2B,cAwDtC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fluent/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAS,UAAU,EAAE,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAM5E;;;;GAIG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAYlE;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAqBvE;AACD;;;;GAIG;AACH,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAMvD;AACD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAChD,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,WAAW,UAAQ,OAwDpB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,CAoBnE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,EACrD,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,EACrB,QAAQ,GAAE,QAA2B,cAyDtC"}

package/dist/fluent/utils.js

@@ -1,15 +1,80 @@
 "use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHeaders = getHeaders;
+exports.getHTTPSAgent = getHTTPSAgent;
+exports.getToken = getToken;
 exports.pathBuilder = pathBuilder;
 exports.k8sCfg = k8sCfg;
 exports.k8sExec = k8sExec;
 const client_node_1 = require("@kubernetes/client-node");
 const url_1 = require("url");
+const undici_1 = require("undici");
+const https_1 = require("https");
 const fetch_1 = require("../fetch");
 const kinds_1 = require("../kinds");
+const fs_1 = __importDefault(require("fs"));
 const SSA_CONTENT_TYPE = "application/apply-patch+yaml";
+const K8S_SA_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+/**
+ * Get the headers for a request
+ *
+ * @returns the headers for undici
+ */
+async function getHeaders() {
+    const token = await getToken();
+    const headers = {
+        "Content-Type": "application/json",
+        "User-Agent": "kubernetes-fluent-client",
+    };
+    if (token) {
+        headers["Authorization"] = `Bearer ${token}`;
+    }
+    return headers;
+}
+/**
+ * Get the agent for a request
+ *
+ * @param opts - the request options from node-fetch
+ * @returns the agent for undici
+ */
+function getHTTPSAgent(opts) {
+    // In cluster there will be agent - testing or dev no
+    const agentOptions = opts.agent instanceof https_1.Agent
+        ? {
+            ca: opts.agent.options.ca,
+            cert: opts.agent.options.cert,
+            key: opts.agent.options.key,
+        }
+        : {
+            ca: undefined,
+            cert: undefined,
+            key: undefined,
+        };
+    return new undici_1.Agent({
+        keepAliveMaxTimeout: 600000,
+        keepAliveTimeout: 600000,
+        bodyTimeout: 0,
+        connect: agentOptions,
+    });
+}
+/**
+ * Read the serviceAccount Token
+ *
+ * @returns token or null
+ */
+async function getToken() {
+    try {
+        return (await fs_1.default.promises.readFile(K8S_SA_TOKEN_PATH, "utf8")).trim();
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Generate a path to a Kubernetes resource
  *
@@ -79,19 +144,15 @@ async function k8sCfg(method) {
     if (!cluster) {
         throw new Error("No currently active cluster");
     }
-    // Setup the TLS options & auth headers, as needed
-    const opts = await kubeConfig.applyToFetchOptions({
+    // Get TLS Options
+    const opts = await kubeConfig.applyToFetchOptions({});
+    // Transform the TLS options & auth headers, as needed
+    const undiciRequestUnit = {
+        headers: await getHeaders(),
         method,
-        headers: {
-            // Set the default content type to JSON
-            "Content-Type": "application/json",
-            // Set the user agent like kubectl does
-            "User-Agent": `kubernetes-fluent-client`,
-        },
-    });
-    // Enable compression
-    opts.compress = true;
-    return { opts, serverUrl: cluster.server };
+        dispatcher: getHTTPSAgent(opts),
+    };
+    return { opts: undiciRequestUnit, serverUrl: cluster.server };
 }
 /**
  * Execute a request against the Kubernetes API server.
@@ -109,29 +170,30 @@ async function k8sExec(model, filters, method, payload, applyCfg = { force: fals
         const configMethod = method === "LOG" ? "GET" : method;
         const { opts, serverUrl } = await k8sCfg(configMethod);
         const isPost = method === "POST";
-        const baseUrl = pathBuilder(serverUrl, model, filters, isPost);
+        const baseUrl = pathBuilder(serverUrl.toString(), model, filters, isPost);
         if (method === "LOG") {
             baseUrl.pathname = `${baseUrl.pathname}/log`;
         }
         return {
-            url: baseUrl,
+            serverUrl: baseUrl,
             opts,
         };
     };
-    const { opts, url } = await reconstruct(method);
+    const { opts, serverUrl } = await reconstruct(method);
+    const url = serverUrl instanceof url_1.URL ? serverUrl : new url_1.URL(serverUrl);
     switch (opts.method) {
         // PATCH_STATUS is a special case that uses the PATCH method on status subresources
         case "PATCH_STATUS":
             opts.method = "PATCH";
             url.pathname = `${url.pathname}/status`;
-            opts.headers.set("Content-Type", client_node_1.PatchStrategy.MergePatch);
+            opts.headers["Content-Type"] = client_node_1.PatchStrategy.MergePatch;
             payload = { status: payload.status };
             break;
         case "PATCH":
-            opts.headers.set("Content-Type", client_node_1.PatchStrategy.JsonPatch);
+            opts.headers["Content-Type"] = client_node_1.PatchStrategy.JsonPatch;
             break;
         case "APPLY":
-            opts.headers.set("Content-Type", SSA_CONTENT_TYPE);
+            opts.headers["Content-Type"] = SSA_CONTENT_TYPE;
             opts.method = "PATCH";
             url.searchParams.set("fieldManager", "pepr");
             url.searchParams.set("fieldValidation", "Strict");

package/dist/fluent/watch.d.ts

@@ -1,6 +1,4 @@
 import { EventEmitter } from "events";
-import { RequestInit } from "node-fetch";
-import { Agent } from "undici";
 import { GenericClass } from "../types";
 import { Filters, WatchAction } from "./types";
 export declare enum WatchEvent {
@@ -84,6 +82,5 @@ export declare class Watcher<T extends GenericClass> {
      * @returns an EventEmitter
      */
     get events(): EventEmitter;
-    static getHTTPSAgent: (opts: RequestInit) => Agent;
 }
 //# sourceMappingURL=watch.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,KAAK,EAAS,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAc,MAAM,SAAS,CAAC;AAK3D,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;IACzB,mBAAmB;IACnB,UAAU,eAAe;IACzB,qCAAqC;IACrC,wBAAwB,6BAA6B;IACrD,iCAAiC;IACjC,eAAe,oBAAoB;CACpC;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAyBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAgB9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IA0CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;IA2MD,MAAM,CAAC,aAAa,SAAU,WAAW,WAqBvC;CAiKH"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/fluent/watch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,YAAY,EAAwB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgC,MAAM,SAAS,CAAC;AAI7E,oBAAY,UAAU;IACpB,sCAAsC;IACtC,OAAO,YAAY;IACnB,2BAA2B;IAC3B,aAAa,kBAAkB;IAC/B,kDAAkD;IAClD,UAAU,eAAe;IACzB,0BAA0B;IAC1B,SAAS,cAAc;IACvB,8BAA8B;IAC9B,OAAO,YAAY;IACnB,sBAAsB;IACtB,KAAK,UAAU;IACf,mCAAmC;IACnC,IAAI,SAAS;IACb,wCAAwC;IACxC,oBAAoB,yBAAyB;IAC7C,qCAAqC;IACrC,iBAAiB,sBAAsB;IACvC,kCAAkC;IAClC,IAAI,SAAS;IACb,2BAA2B;IAC3B,UAAU,eAAe;IACzB,mBAAmB;IACnB,UAAU,eAAe;IACzB,qCAAqC;IACrC,wBAAwB,6BAA6B;IACrD,iCAAiC;IACjC,eAAe,oBAAoB;CACpC;AAED,4CAA4C;AAC5C,MAAM,MAAM,QAAQ,GAAG;IACrB,+HAA+H;IAC/H,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,wHAAwH;IACxH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAKF,iDAAiD;AACjD,qBAAa,OAAO,CAAC,CAAC,SAAS,YAAY;;IAyBzC,YAAY,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC;IAc9B;;;;;;;;;;;OAWG;gBACS,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAE,QAAa;IA0CzF;;;;OAIG;IACU,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAO9C,gGAAgG;IACzF,KAAK;IAQZ;;;;;OAKG;IACI,UAAU;IAWjB;;;;;;OAMG;IACH,IAAW,MAAM,IAAI,YAAY,CAEhC;CA0VF"}

package/dist/fluent/watch.js

@@ -1,21 +1,15 @@
 "use strict";
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Watcher = exports.WatchEvent = void 0;
 const crypto_1 = require("crypto");
 const events_1 = require("events");
-const https_1 = __importDefault(require("https"));
 const undici_1 = require("undici");
 const fetch_1 = require("../fetch");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 const stream_1 = require("stream");
-const fs_1 = __importDefault(require("fs"));
 var WatchEvent;
 (function (WatchEvent) {
     /** Watch is connected successfully */
@@ -78,8 +72,6 @@ class Watcher {
     #resourceVersion;
     // Track the list of items in the cache
     #cache = new Map();
-    // Token Path
-    #TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
     /**
      * Setup a Kubernetes watcher for the specified model and filters. The callback function will be called for each event received.
      * The watch can be aborted by calling {@link Watcher.close} or by calling abort() on the AbortController returned by {@link Watcher.start}.
@@ -163,19 +155,6 @@ class Watcher {
     get events() {
         return this.#events;
     }
-    /**
-     * Read the serviceAccount Token
-     *
-     * @returns token or null
-     */
-    async #getToken() {
-        try {
-            return (await fs_1.default.promises.readFile(this.#TOKEN_PATH, "utf8")).trim();
-        }
-        catch {
-            return null;
-        }
-    }
     /**
      * Build the URL and request options for the watch.
      *
@@ -188,7 +167,8 @@ class Watcher {
     #buildURL = async (isWatch, resourceVersion, continueToken) => {
         // Build the path and query params for the resource, excluding the name
         const { opts, serverUrl } = await (0, utils_1.k8sCfg)("GET");
-        const url = (0, utils_1.pathBuilder)(serverUrl, this.#model, this.#filters, true);
+        const k8sUrl = serverUrl instanceof URL ? serverUrl.toString() : serverUrl;
+        const url = (0, utils_1.pathBuilder)(k8sUrl, this.#model, this.#filters, true);
         // Enable the watch query param
         if (isWatch) {
             url.searchParams.set("watch", "true");
@@ -206,7 +186,7 @@ class Watcher {
         }
         // Add the abort signal to the request options
         opts.signal = this.#abortController.signal;
-        return { opts, url };
+        return { opts, serverUrl: url };
     };
     /**
      * Retrieve the list of resources and process the events.
@@ -216,9 +196,9 @@ class Watcher {
      */
     #list = async (continueToken, removedItems) => {
         try {
-            const { opts, url } = await this.#buildURL(false, undefined, continueToken);
+            const { opts, serverUrl } = await this.#buildURL(false, undefined, continueToken);
             // Make the request to list the resources
-            const response = await (0, fetch_1.fetch)(url, opts);
+            const response = await (0, fetch_1.fetch)(serverUrl, opts);
             const list = response.data;
             // If the request fails, emit an error event and return
             if (!response.ok) {
@@ -328,26 +308,6 @@ class Watcher {
             this.#events.emit(WatchEvent.DATA_ERROR, err);
         }
     };
-    static getHTTPSAgent = (opts) => {
-        // In cluster there will be agent - testing or dev no
-        const agentOptions = opts.agent instanceof https_1.default.Agent
-            ? {
-                ca: opts.agent.options.ca,
-                cert: opts.agent.options.cert,
-                key: opts.agent.options.key,
-            }
-            : {
-                ca: undefined,
-                cert: undefined,
-                key: undefined,
-            };
-        return new undici_1.Agent({
-            keepAliveMaxTimeout: 600000,
-            keepAliveTimeout: 600000,
-            bodyTimeout: 0,
-            connect: agentOptions,
-        });
-    };
     /**
      * Watch for changes to the resource.
      */
@@ -356,19 +316,12 @@ class Watcher {
             // Start with a list operation
             await this.#list();
             // Build the URL and request options
-            const { opts, url } = await this.#buildURL(true, this.#resourceVersion);
-            const token = await this.#getToken();
-            const headers = {
-                "Content-Type": "application/json",
-                "User-Agent": "kubernetes-fluent-client",
-            };
-            if (token) {
-                headers["Authorization"] = `Bearer ${token}`;
-            }
-            const response = await (0, undici_1.fetch)(url, {
-                headers,
-                dispatcher: _a.getHTTPSAgent(opts),
+            const { opts, serverUrl } = await this.#buildURL(true, this.#resourceVersion);
+            const response = await (0, undici_1.fetch)(serverUrl, {
+                headers: await (0, utils_1.getHeaders)(),
+                ...opts,
             });
+            const url = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
             // If the request is successful, start listening for events
             if (response.ok) {
                 // Reset the pending reconnect flag
@@ -484,4 +437,3 @@ class Watcher {
     };
 }
 exports.Watcher = Watcher;
-_a = Watcher;

package/dist/generate.js

@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertCRDtoTS = convertCRDtoTS;
 exports.prepareInputData = prepareInputData;

package/dist/index.js

@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };

package/dist/postProcessing.js

@@ -17,13 +17,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessing = postProcessing;
 exports.mapFilesToCRD = mapFilesToCRD;

package/eslint.config.mjs

@@ -16,7 +16,7 @@ const compat = new FlatCompat({
 
 export default [
   {
-    ignores: ["**/node_modules", "**/dist", "**/__mocks__", "e2e/crds", "e2e/crds"],
+    ignores: ["**/node_modules", "**/dist", "**/__mocks__", "e2e/**"],
   },
   ...compat.extends(
     "eslint:recommended",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.3.4",
+  "version": "3.3.6",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",
@@ -10,7 +10,12 @@
     "build": "tsc",
     "semantic-release": "semantic-release",
     "test": "jest src --coverage",
-    "test:e2e": "jest e2e",
+    "test:e2e": "jest e2e --runInBand",
+    "test:e2e:prep-crds": "kubectl apply -f test/ && npx ts-node src/cli.ts crd ./test/datastore.crd.yaml e2e && npx ts-node src/cli.ts crd https://raw.githubusercontent.com/defenseunicorns/kubernetes-fluent-client/refs/heads/main/test/webapp.crd.yaml e2e",
+    "test:e2e:prep-cluster": "k3d cluster create kfc-dev --k3s-arg '--debug@server:0' --wait && kubectl rollout status deployment -n kube-system",
+    "test:e2e:prep-image": "npm run build && npm pack && npm i kubernetes-fluent-client-0.0.0-development.tgz --no-save",
+    "test:e2e:run": "npm run test:e2e:prep-cluster && npm run test:e2e:prep-crds && npm run test:e2e:prep-image && jest e2e --runInBand && npm run test:e2e:cleanup",
+    "test:e2e:cleanup": "k3d cluster delete kfc-dev",
     "format:check": "eslint src && prettier . --check",
     "format:fix": "eslint --fix src && prettier . --write",
     "prepare": "if [ \"$NODE_ENV\" != 'production' ]; then husky; fi"
@@ -42,8 +47,8 @@
     "http-status-codes": "2.3.0",
     "node-fetch": "2.7.0",
     "quicktype-core": "23.0.170",
-    "type-fest": "4.27.0",
-    "undici": "6.21.0",
+    "type-fest": "4.29.1",
+    "undici": "7.0.0",
     "yargs": "17.7.2"
   },
   "devDependencies": {
@@ -56,18 +61,29 @@
     "@types/readable-stream": "4.0.18",
     "@types/urijs": "^1.19.25",
     "@types/yargs": "17.0.33",
-    "@typescript-eslint/eslint-plugin": "8.15.0",
-    "@typescript-eslint/parser": "8.15.0",
-    "eslint-plugin-jsdoc": "50.5.0",
+    "@typescript-eslint/eslint-plugin": "8.16.0",
+    "@typescript-eslint/parser": "8.16.0",
+    "eslint-plugin-jsdoc": "50.6.0",
     "globals": "^15.12.0",
     "husky": "^9.1.6",
     "jest": "29.7.0",
     "lint-staged": "^15.2.10",
     "nock": "13.5.6",
-    "prettier": "3.3.3",
+    "prettier": "3.4.1",
     "semantic-release": "24.2.0",
     "ts-jest": "29.2.5",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
+  },
+  "overrides": {
+    "semantic-release@24.2.0": {
+      "npm": {
+        "glob": {
+          "foreground-child": {
+            "cross-spawn": "^7.0.6"
+          }
+        }
+      }
+    }
   },
   "release": {
     "branches": [

package/src/fetch.ts

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 
 import { StatusCodes } from "http-status-codes";
-import fetchRaw, { FetchError, RequestInfo, RequestInit } from "node-fetch";
+import { fetch as undiciFetch, RequestInfo, RequestInit } from "undici";
 
 export type FetchResponse<T> = {
   data: T;
@@ -30,12 +30,12 @@ export async function fetch<T>(
 ): Promise<FetchResponse<T>> {
   let data = undefined as unknown as T;
   try {
-    const resp = await fetchRaw(url, init);
+    const resp = await undiciFetch(url, init);
     const contentType = resp.headers.get("content-type") || "";
 
     // Parse the response as JSON if the content type is JSON
     if (contentType.includes("application/json")) {
-      data = await resp.json();
+      data = (await resp.json()) as T;
     } else {
       // Otherwise, return however the response was read
       data = (await resp.text()) as unknown as T;
@@ -48,23 +48,14 @@ export async function fetch<T>(
       statusText: resp.statusText,
     };
   } catch (e) {
-    if (e instanceof FetchError) {
-      // Parse the error code from the FetchError or default to 400 (Bad Request)
-      const status = parseInt(e.code || "400");
-
-      return {
-        data,
-        ok: false,
-        status,
-        statusText: e.message,
-      };
-    }
+    const status = parseInt(e?.code) || StatusCodes.BAD_REQUEST;
+    const statusText = e?.message || "Unknown error";
 
     return {
       data,
       ok: false,
-      status: StatusCodes.BAD_REQUEST,
-      statusText: "Unknown error",
+      status,
+      statusText,
     };
   }
 }

package/src/fluent/types.ts

@@ -4,11 +4,17 @@
 import { KubernetesListObject, KubernetesObject } from "@kubernetes/client-node";
 import { Operation } from "fast-json-patch";
 import type { PartialDeep } from "type-fest";
-
+import { RequestInit as UndiciRequestInit } from "undici";
 import { GenericClass, GroupVersionKind } from "../types";
 import { WatchCfg, Watcher } from "./watch";
 import https from "https";
 import { SecureClientSessionOptions } from "http2";
+
+/**
+ * Fetch options and server URL
+ */
+export type K8sConfigPromise = Promise<{ opts: UndiciRequestInit; serverUrl: string | URL }>;
+
 /**
  * Agent options for the the http2Watch
  */

package/src/fluent/utils.ts

@@ -2,16 +2,78 @@
 // SPDX-FileCopyrightText: 2023-Present The Kubernetes Fluent Client Authors
 
 import { KubeConfig, PatchStrategy } from "@kubernetes/client-node";
-import { Headers } from "node-fetch";
+import { RequestInit } from "node-fetch";
 import { URL } from "url";
-
+import { Agent, Dispatcher } from "undici";
+import { Agent as httpsAgent } from "https";
 import { fetch } from "../fetch";
 import { modelToGroupVersionKind } from "../kinds";
 import { GenericClass } from "../types";
-import { ApplyCfg, FetchMethods, Filters } from "./types";
+import { ApplyCfg, FetchMethods, Filters, K8sConfigPromise } from "./types";
+import fs from "fs";
 
 const SSA_CONTENT_TYPE = "application/apply-patch+yaml";
+const K8S_SA_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+
+/**
+ * Get the headers for a request
+ *
+ * @returns the headers for undici
+ */
+export async function getHeaders(): Promise<Record<string, string>> {
+  const token = await getToken();
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    "User-Agent": "kubernetes-fluent-client",
+  };
 
+  if (token) {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+
+  return headers;
+}
+
+/**
+ * Get the agent for a request
+ *
+ * @param opts - the request options from node-fetch
+ * @returns the agent for undici
+ */
+export function getHTTPSAgent(opts: RequestInit): Dispatcher | undefined {
+  // In cluster there will be agent - testing or dev no
+  const agentOptions =
+    opts.agent instanceof httpsAgent
+      ? {
+          ca: opts.agent.options.ca,
+          cert: opts.agent.options.cert,
+          key: opts.agent.options.key,
+        }
+      : {
+          ca: undefined,
+          cert: undefined,
+          key: undefined,
+        };
+
+  return new Agent({
+    keepAliveMaxTimeout: 600000,
+    keepAliveTimeout: 600000,
+    bodyTimeout: 0,
+    connect: agentOptions,
+  });
+}
+/**
+ * Read the serviceAccount Token
+ *
+ * @returns token or null
+ */
+export async function getToken(): Promise<string | null> {
+  try {
+    return (await fs.promises.readFile(K8S_SA_TOKEN_PATH, "utf8")).trim();
+  } catch {
+    return null;
+  }
+}
 /**
  * Generate a path to a Kubernetes resource
  *
@@ -94,7 +156,7 @@ export function pathBuilder<T extends GenericClass>(
  * @param method - the HTTP method to use
  * @returns the fetch options and server URL
  */
-export async function k8sCfg(method: FetchMethods) {
+export async function k8sCfg(method: FetchMethods): K8sConfigPromise {
   const kubeConfig = new KubeConfig();
   kubeConfig.loadFromDefault();
 
@@ -103,21 +165,17 @@ export async function k8sCfg(method: FetchMethods) {
     throw new Error("No currently active cluster");
   }
 
-  // Setup the TLS options & auth headers, as needed
-  const opts = await kubeConfig.applyToFetchOptions({
-    method,
-    headers: {
-      // Set the default content type to JSON
-      "Content-Type": "application/json",
-      // Set the user agent like kubectl does
-      "User-Agent": `kubernetes-fluent-client`,
-    },
-  });
+  // Get TLS Options
+  const opts = await kubeConfig.applyToFetchOptions({});
 
-  // Enable compression
-  opts.compress = true;
+  // Transform the TLS options & auth headers, as needed
+  const undiciRequestUnit = {
+    headers: await getHeaders(),
+    method,
+    dispatcher: getHTTPSAgent(opts),
+  };
 
-  return { opts, serverUrl: cluster.server };
+  return { opts: undiciRequestUnit, serverUrl: cluster.server };
 }
 
 /**
@@ -138,37 +196,38 @@ export async function k8sExec<T extends GenericClass, K>(
   payload?: K | unknown,
   applyCfg: ApplyCfg = { force: false },
 ) {
-  const reconstruct = async (method: FetchMethods) => {
+  const reconstruct = async (method: FetchMethods): K8sConfigPromise => {
     const configMethod = method === "LOG" ? "GET" : method;
     const { opts, serverUrl } = await k8sCfg(configMethod);
     const isPost = method === "POST";
-    const baseUrl = pathBuilder(serverUrl, model, filters, isPost);
+    const baseUrl = pathBuilder(serverUrl.toString(), model, filters, isPost);
     if (method === "LOG") {
       baseUrl.pathname = `${baseUrl.pathname}/log`;
     }
     return {
-      url: baseUrl,
+      serverUrl: baseUrl,
       opts,
     };
   };
 
-  const { opts, url } = await reconstruct(method);
+  const { opts, serverUrl } = await reconstruct(method);
+  const url: URL = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
 
   switch (opts.method) {
     // PATCH_STATUS is a special case that uses the PATCH method on status subresources
     case "PATCH_STATUS":
       opts.method = "PATCH";
       url.pathname = `${url.pathname}/status`;
-      (opts.headers as Headers).set("Content-Type", PatchStrategy.MergePatch);
+      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.MergePatch;
       payload = { status: (payload as { status: unknown }).status };
       break;
 
     case "PATCH":
-      (opts.headers as Headers).set("Content-Type", PatchStrategy.JsonPatch);
+      (opts.headers as Record<string, string>)["Content-Type"] = PatchStrategy.JsonPatch;
       break;
 
     case "APPLY":
-      (opts.headers as Headers).set("Content-Type", SSA_CONTENT_TYPE);
+      (opts.headers as Record<string, string>)["Content-Type"] = SSA_CONTENT_TYPE;
       opts.method = "PATCH";
       url.searchParams.set("fieldManager", "pepr");
       url.searchParams.set("fieldValidation", "Strict");

package/src/fluent/watch.ts

@@ -3,15 +3,12 @@
 
 import { createHash } from "crypto";
 import { EventEmitter } from "events";
-import https from "https";
-import { RequestInit } from "node-fetch";
-import { Agent, fetch } from "undici";
+import { fetch } from "undici";
 import { fetch as wrappedFetch } from "../fetch";
 import { GenericClass, KubernetesListObject } from "../types";
-import { Filters, WatchAction, WatchPhase } from "./types";
-import { k8sCfg, pathBuilder } from "./utils";
+import { Filters, WatchAction, WatchPhase, K8sConfigPromise } from "./types";
+import { k8sCfg, pathBuilder, getHeaders } from "./utils";
 import { Readable } from "stream";
-import fs from "fs";
 
 export enum WatchEvent {
   /** Watch is connected successfully */
@@ -99,8 +96,6 @@ export class Watcher<T extends GenericClass> {
   // Track the list of items in the cache
   #cache = new Map<string, InstanceType<T>>();
 
-  // Token Path
-  #TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
   /**
    * Setup a Kubernetes watcher for the specified model and filters. The callback function will be called for each event received.
    * The watch can be aborted by calling {@link Watcher.close} or by calling abort() on the AbortController returned by {@link Watcher.start}.
@@ -204,19 +199,6 @@ export class Watcher<T extends GenericClass> {
     return this.#events;
   }
 
-  /**
-   * Read the serviceAccount Token
-   *
-   * @returns token or null
-   */
-  async #getToken() {
-    try {
-      return (await fs.promises.readFile(this.#TOKEN_PATH, "utf8")).trim();
-    } catch {
-      return null;
-    }
-  }
-
   /**
    * Build the URL and request options for the watch.
    *
@@ -226,11 +208,15 @@ export class Watcher<T extends GenericClass> {
    *
    * @returns the URL and request options
    */
-  #buildURL = async (isWatch: boolean, resourceVersion?: string, continueToken?: string) => {
+  #buildURL = async (
+    isWatch: boolean,
+    resourceVersion?: string,
+    continueToken?: string,
+  ): K8sConfigPromise => {
     // Build the path and query params for the resource, excluding the name
     const { opts, serverUrl } = await k8sCfg("GET");
-
-    const url = pathBuilder(serverUrl, this.#model, this.#filters, true);
+    const k8sUrl = serverUrl instanceof URL ? serverUrl.toString() : serverUrl;
+    const url = pathBuilder(k8sUrl, this.#model, this.#filters, true);
 
     // Enable the watch query param
     if (isWatch) {
@@ -254,7 +240,7 @@ export class Watcher<T extends GenericClass> {
     // Add the abort signal to the request options
     opts.signal = this.#abortController.signal;
 
-    return { opts, url };
+    return { opts, serverUrl: url };
   };
 
   /**
@@ -265,10 +251,10 @@ export class Watcher<T extends GenericClass> {
    */
   #list = async (continueToken?: string, removedItems?: Map<string, InstanceType<T>>) => {
     try {
-      const { opts, url } = await this.#buildURL(false, undefined, continueToken);
+      const { opts, serverUrl } = await this.#buildURL(false, undefined, continueToken);
 
       // Make the request to list the resources
-      const response = await wrappedFetch<KubernetesListObject<InstanceType<T>>>(url, opts);
+      const response = await wrappedFetch<KubernetesListObject<InstanceType<T>>>(serverUrl, opts);
       const list = response.data;
 
       // If the request fails, emit an error event and return
@@ -405,28 +391,6 @@ export class Watcher<T extends GenericClass> {
     }
   };
 
-  static getHTTPSAgent = (opts: RequestInit) => {
-    // In cluster there will be agent - testing or dev no
-    const agentOptions =
-      opts.agent instanceof https.Agent
-        ? {
-            ca: opts.agent.options.ca,
-            cert: opts.agent.options.cert,
-            key: opts.agent.options.key,
-          }
-        : {
-            ca: undefined,
-            cert: undefined,
-            key: undefined,
-          };
-
-    return new Agent({
-      keepAliveMaxTimeout: 600000,
-      keepAliveTimeout: 600000,
-      bodyTimeout: 0,
-      connect: agentOptions,
-    });
-  };
   /**
    * Watch for changes to the resource.
    */
@@ -436,23 +400,15 @@ export class Watcher<T extends GenericClass> {
       await this.#list();
 
       // Build the URL and request options
-      const { opts, url } = await this.#buildURL(true, this.#resourceVersion);
-
-      const token = await this.#getToken();
-      const headers: Record<string, string> = {
-        "Content-Type": "application/json",
-        "User-Agent": "kubernetes-fluent-client",
-      };
+      const { opts, serverUrl } = await this.#buildURL(true, this.#resourceVersion);
 
-      if (token) {
-        headers["Authorization"] = `Bearer ${token}`;
-      }
-
-      const response = await fetch(url, {
-        headers,
-        dispatcher: Watcher.getHTTPSAgent(opts),
+      const response = await fetch(serverUrl, {
+        headers: await getHeaders(),
+        ...opts,
       });
 
+      const url = serverUrl instanceof URL ? serverUrl : new URL(serverUrl);
+
       // If the request is successful, start listening for events
       if (response.ok) {
         // Reset the pending reconnect flag

package/test/datastore.crd.yaml

@@ -0,0 +1,59 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: datastores.pepr.io
+spec:
+  group: pepr.io
+  names:
+    plural: datastores
+    singular: datastore
+    kind: Datastore
+    shortNames:
+      - ds
+  scope: Namespaced
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                kind:
+                  type: string
+                  enum:
+                    - sqlite
+                    - valkey
+                  description: "The type of datastore. Allowed values: sqlite, valkey."
+                accessModes:
+                  type: array
+                  items:
+                    type: string
+                  description: "The access modes for the datastore (e.g., ReadWriteOnce, ReadOnlyMany)."
+                capacity:
+                  type: string
+                  description: "The capacity of the datastore (e.g., 10Gi)."
+                hostPath:
+                  type: string
+                  description: "The host path for the datastore storage."
+              required:
+                - kind
+                - accessModes
+                - capacity
+                - hostPath
+            status:
+              type: object
+              properties:
+                observedGeneration:
+                  type: integer
+                phase:
+                  type: string
+                  enum:
+                    - "Failed"
+                    - "Pending"
+                    - "Ready"
+      subresources:
+        status: {}

package/test/webapp.crd.yaml

@@ -0,0 +1,62 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: webapps.pepr.io
+spec:
+  group: pepr.io
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
+      subresources:
+        status: {}
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            apiVersion:
+              type: string
+            kind:
+              type: string
+            metadata:
+              type: object
+            spec:
+              required:
+                - theme
+                - language
+                - replicas
+              type: object
+              properties:
+                theme:
+                  type: string
+                  description: "Theme defines the theme of the web application, either dark or light."
+                  enum:
+                    - "dark"
+                    - "light"
+                language:
+                  type: string
+                  description: "Language defines the language of the web application, either English (en) or Spanish (es)."
+                  enum:
+                    - "en"
+                    - "es"
+                replicas:
+                  type: integer
+                  description: "Replicas is the number of desired replicas."
+            status:
+              type: object
+              properties:
+                observedGeneration:
+                  type: integer
+                phase:
+                  type: string
+                  enum:
+                    - "Failed"
+                    - "Pending"
+                    - "Ready"
+  scope: Namespaced
+  names:
+    plural: webapps
+    singular: webapp
+    kind: WebApp
+    shortNames:
+      - wa