Merge pull request #1341 from davidgamero/davidgamero/bump-openapi-for-media-types

bump openapi version to support for k8s media types

Author: k8s-ci-robot

examples/patch-example.js

@@ -1,5 +1,7 @@
 // in a real program use require('@kubernetes/client-node')
 const k8s = require('../dist/index');
+const { createConfiguration, ServerConfiguration } = require('../dist');
+const { PromiseMiddlewareWrapper } = require('../dist/gen/middleware');
 
 const kc = new k8s.KubeConfig();
 kc.loadFromDefault();
@@ -18,10 +20,36 @@ k8sApi.listNamespacedPod({ namespace }).then((res) => {
             },
         },
     ];
-    // TODO this method of passing the content type will change when we figure out a way to properly do this
-    const options = { headers: { 'Content-type': k8s.PatchUtils.PATCH_FORMAT_JSON_PATCH } };
+    const headerPatchMiddleware = new PromiseMiddlewareWrapper({
+        pre: async (requestContext) => {
+            requestContext.setHeaderParam('Content-type', 'application/json-patch+json');
+            return requestContext;
+        },
+        post: async (responseContext) => responseContext,
+    });
+    let currentContext = kc.getCurrentContext();
+    let currentCluster = kc.getCluster(currentContext);
+    if (currentCluster === undefined || currentCluster === null) {
+        throw new Error('Cluster is undefined');
+    }
+    let server = currentCluster.server;
+    if (server === undefined) {
+        throw new Error('Server is undefined');
+    }
+
+    const baseServerConfig = new ServerConfiguration(server, {});
+    const configuration = createConfiguration({
+        middleware: [headerPatchMiddleware],
+        baseServer: baseServerConfig,
+        authMethods: {
+            default: kc,
+        },
+    });
     k8sApi
-        .patchNamespacedPod({ name: res?.items?.[0].metadata?.name ?? '', namespace, body: patch }, options)
+        .patchNamespacedPod(
+            { name: res?.items?.[0].metadata?.name ?? '', namespace, body: patch },
+            configuration,
+        )
         .then(() => {
             console.log('Patched.');
         })

examples/typescript/patch/patch-example.ts

@@ -0,0 +1,80 @@
+// in a real program use require('@kubernetes/client-node')
+import {
+    CoreV1Api,
+    RequestContext,
+    ResponseContext,
+    KubeConfig,
+    createConfiguration,
+    Configuration,
+    ServerConfiguration,
+} from '../../../dist';
+import { PromiseMiddlewareWrapper } from '../../../dist/gen/middleware';
+
+const kc = new KubeConfig();
+kc.loadFromDefault();
+
+const k8sApi = kc.makeApiClient(CoreV1Api);
+
+k8sApi
+    .listNamespacedPod({
+        namespace: 'default',
+    })
+    .then((res) => {
+        const patch = [
+            {
+                op: 'replace',
+                path: '/metadata/labels',
+                value: {
+                    foo: 'bar',
+                },
+            },
+        ];
+        const options = { headers: { 'Content-type': 'application/json-patch+json' } };
+        const headerPatchMiddleware = new PromiseMiddlewareWrapper({
+            pre: async (requestContext: RequestContext) => {
+                requestContext.setHeaderParam('Content-type', 'application/json-patch+json');
+                return requestContext;
+            },
+            post: async (responseContext: ResponseContext) => responseContext,
+        });
+        const currentContext = kc.getCurrentContext();
+        const currentCluster = kc.getCluster(currentContext);
+        if (currentCluster === undefined || 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');
+        }
+        k8sApi
+            .patchNamespacedPod(
+                {
+                    name: podName,
+                    namespace: 'default',
+                    body: patch,
+                },
+                configuration,
+            )
+            .then(() => {
+                // tslint:disable-next-line:no-console
+                console.log('Patched.');
+            })
+            .catch((err) => {
+                // tslint:disable-next-line:no-console
+                console.log('Error: ', err);
+            });
+    });

package-lock.json

@@ -94,7 +94,7 @@
         "prettier": "^3.0.0",
         "source-map-support": "^0.5.9",
         "ts-mockito": "^2.3.1",
-        "ts-node": "^8.2.0",
+        "ts-node": "^8.10.2",
         "tslint": "^6.1.3",
         "typedoc": "^0.25.0",
         "typescript": "~5.2.2"

package.json

@@ -30,4 +30,4 @@ export CLIENT_VERSION="0.8-SNAPSHOT"
 # Name of the release package
 export PACKAGE_NAME="@kubernetes/node-client"
 
-export OPENAPI_GENERATOR_COMMIT=5555137b7926de2f501e091718ff72429b808220
+export OPENAPI_GENERATOR_COMMIT=53289263d921e627cb05894c8477238dff48d62f

settings

@@ -1,2 +1,2 @@
-Requested Commit: 5555137b7926de2f501e091718ff72429b808220
-Actual Commit: 5555137b7926de2f501e091718ff72429b808220
+Requested Commit: 53289263d921e627cb05894c8477238dff48d62f
+Actual Commit: 53289263d921e627cb05894c8477238dff48d62f

src/gen/.openapi-generator/COMMIT

@@ -1 +1 @@
-7.0.0-SNAPSHOT
+7.2.0-SNAPSHOT

src/gen/.openapi-generator/VERSION

@@ -1,7 +1,7 @@
 // TODO: better import syntax?
 import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi';
 import {Configuration} from '../configuration';
-import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
+import {RequestContext, HttpMethod, ResponseContext, HttpFile, HttpInfo} from '../http/http';
 import  FormData from "form-data";
 import { URLSearchParams } from 'url';
 import {ObjectSerializer} from '../models/ObjectSerializer';
@@ -57,14 +57,14 @@ export class AdmissionregistrationApiResponseProcessor {
      * @params response Response returned by the server for a request to getAPIGroup
      * @throws ApiException if the response code was not in [200, 299]
      */
-     public async getAPIGroup(response: ResponseContext): Promise<V1APIGroup > {
+     public async getAPIGroupWithHttpInfo(response: ResponseContext): Promise<HttpInfo<V1APIGroup >> {
         const contentType = ObjectSerializer.normalizeMediaType(response.headers["content-type"]);
         if (isCodeInRange("200", response.httpStatusCode)) {
             const body: V1APIGroup = ObjectSerializer.deserialize(
                 ObjectSerializer.parse(await response.body.text(), contentType),
                 "V1APIGroup", ""
             ) as V1APIGroup;
-            return body;
+            return new HttpInfo(response.httpStatusCode, response.headers, response.body, body);
         }
         if (isCodeInRange("401", response.httpStatusCode)) {
             throw new ApiException<undefined>(response.httpStatusCode, "Unauthorized", undefined, response.headers);
@@ -76,7 +76,7 @@ export class AdmissionregistrationApiResponseProcessor {
                 ObjectSerializer.parse(await response.body.text(), contentType),
                 "V1APIGroup", ""
             ) as V1APIGroup;
-            return body;
+            return new HttpInfo(response.httpStatusCode, response.headers, response.body, body);
         }
 
         throw new ApiException<string | Buffer | undefined>(response.httpStatusCode, "Unknown API Status Code!", await response.getBodyAsAny(), response.headers);