update examples and try to add minikube test

Author: Ubuntu

.github/workflows/test.yml

@@ -26,3 +26,14 @@ jobs:
             - run: npm run lint
             - run: npm audit --audit-level=critical
             - run: npm run build-with-tests && npm run test-transpiled
+            - name: Extract k8s version
+              id: extract_version
+              run: |
+                  version=$(grep 'export KUBERNETES_BRANCH=' settings | cut -d '"' -f 2)
+                  echo "setting kubernetes version to $KUBERNETES_V_STRING"
+                  echo "KUBERNETES_V_STRING=$version" >> "$GITHUB_ENV"
+            - name: start minikube
+              uses: medyagh/setup-minikube@latest
+              id: minikube
+              with:
+                  minikube-version: env.KUBERNETES_V_STRING

examples/patch-example.js

@@ -1,5 +1,4 @@
 import * as k8s from '@kubernetes/client-node';
-import { PromiseMiddlewareWrapper } from '@kubernetes/client-node/dist/gen/middleware.js';
 
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
@@ -18,35 +17,12 @@ try {
             },
         },
     ];
-    const headerPatchMiddleware = new PromiseMiddlewareWrapper({
-        pre: async (requestContext) => {
-            requestContext.setHeaderParam('Content-type', 'application/json-patch+json');
-            return requestContext;
-        },
-        post: async (responseContext) => responseContext,
-    });
-    let currentCluster = kc.getCurrentCluster();
-    if (currentCluster === null) {
-        throw new Error('Cluster is undefined');
-    }
-    let server = currentCluster.server;
-    if (server === undefined) {
-        throw new Error('Server is undefined');
-    }
-
-    const baseServerConfig = new k8s.ServerConfiguration(server, {});
-    const configuration = k8s.createConfiguration({
-        middleware: [headerPatchMiddleware],
-        baseServer: baseServerConfig,
-        authMethods: {
-            default: kc,
-        },
-    });
 
     await k8sApi.patchNamespacedPod(
         { name: res?.items?.[0]?.metadata?.name ?? '', namespace, body: patch },
-        configuration,
+        k8s.WithHeaderOptions('Content-Type', 'application/json-patch+json'),
     );
+
     console.log('Patched.');
 } catch (err) {
     console.error('Error: ');

examples/typescript/patch/patch-example.ts

@@ -1,13 +1,4 @@
-import {
-    CoreV1Api,
-    RequestContext,
-    ResponseContext,
-    KubeConfig,
-    createConfiguration,
-    type Configuration,
-    ServerConfiguration,
-} from '@kubernetes/client-node';
-import { PromiseMiddlewareWrapper } from '@kubernetes/client-node/dist/gen/middleware.js';
+import { CoreV1Api, KubeConfig, WithHeaderOptions } from '@kubernetes/client-node';
 
 const kc = new KubeConfig();
 kc.loadFromDefault();
@@ -25,30 +16,7 @@ try {
             },
         },
     ];
-    const headerPatchMiddleware = new PromiseMiddlewareWrapper({
-        pre: async (requestContext: RequestContext) => {
-            requestContext.setHeaderParam('Content-type', 'application/json-patch+json');
-            return requestContext;
-        },
-        post: async (responseContext: ResponseContext) => responseContext,
-    });
-    const currentCluster = kc.getCurrentCluster();
-    if (currentCluster === null) {
-        throw new Error('Cluster is undefined');
-    }
-    const server = currentCluster.server;
-    if (server === undefined) {
-        throw new Error('Server is undefined');
-    }
 
-    const baseServerConfig: ServerConfiguration<{}> = new ServerConfiguration<{}>(server, {});
-    const configuration: Configuration = createConfiguration({
-        middleware: [headerPatchMiddleware],
-        baseServer: baseServerConfig,
-        authMethods: {
-            default: kc,
-        },
-    });
     const podName = res.items[0]?.metadata?.name;
     if (podName === undefined) {
         throw new Error('Pod name is undefined');
@@ -60,7 +28,7 @@ try {
             namespace: 'default',
             body: patch,
         },
-        configuration,
+        WithHeaderOptions('Content-Type', JsonPatch),
     );
 
     console.log('Patched.');

src/index.ts

@@ -15,6 +15,7 @@ export * from './patch.js';
 export * from './metrics.js';
 export * from './object.js';
 export * from './health.js';
+export * from './middleware.js';
 export { type ConfigOptions, type User, type Cluster, type Context } from './config_types.js';
 
 // Export FetchError so that instanceof checks in user code will definitely use the same instance

src/middleware.ts

@@ -0,0 +1,36 @@
+import type { RequestContext, ResponseContext, ConfigurationOptions, Middleware } from './gen/index.ts';
+import { PromiseMiddleware } from './gen/middleware.js';
+
+//WithHeaderMiddleware returns Middleware[] that sets a header value
+export function WithHeaderMiddleware(key: string, value: string): Middleware[] {
+    return [
+        {
+            pre: (c: RequestContext) => {
+                return new Promise<RequestContext>((resolve) => {
+                    c.setHeaderParam(key, value);
+                    resolve(c);
+                });
+            },
+            post: (c: ResponseContext) => {
+                return new Promise<ResponseContext>((resolve) => {
+                    resolve(c);
+                });
+            },
+        },
+    ];
+}
+
+// Returns ConfigurationOptions that set a header
+export function WithHeaderOptions(
+    key: string,
+    value: string,
+    opt?: ConfigurationOptions<PromiseMiddleware>,
+): ConfigurationOptions<PromiseMiddleware> {
+    const newMiddlware = WithHeaderMiddleware(key, value);
+    const existingMiddlware = opt?.middleware || [];
+    return {
+        ...opt,
+        middleware: existingMiddlware.concat(newMiddlware),
+        middlewareMergeStrategy: 'append', // preserve chained middleware from opt
+    };
+}