kubernetes-fluent-client 3.7.0-nightly.0 → 3.7.0-nightly.1

package/dist/cli.js

@@ -20,6 +20,10 @@ void yargs(hideBin(process.argv))
         .positional("directory", {
         describe: "the directory to output the generated types to",
         type: "string",
+    })
+        .option("overrideClassName", {
+        type: "string",
+        description: "override the class name for the generated types, useful for generating types when multiple CRDs have the same kind",
     })
         .option("plain", {
         alias: "p",
@@ -42,6 +46,7 @@ void yargs(hideBin(process.argv))
 }, async (argv) => {
     const opts = argv;
     opts.logFn = console.log;
+    opts.npmPackage = "kubernetes-fluent-client";
     // Pass the `post` flag to opts
     opts.noPost = argv.noPost;
     // Use NodeFileSystem as the file system for post-processing

package/dist/generate.d.ts

@@ -5,6 +5,7 @@ export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
     source: string;
     directory?: string;
+    overrideClassName?: string;
     plain?: boolean;
     language: QuicktypeLang;
     npmPackage?: string;

package/dist/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EACd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAuCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CASnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,SAAS,EAET,cAAc,EACd,SAAS,EACV,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,eAAe,GACpB,OAAO,CACR;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CAwCA;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAYvF;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CASnB;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,QAAQ,EAAE,MAAM,GAAG,cAAc,GAChC,IAAI,CAON;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC,CA0B/F;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,GAAG,IAAI,CAMtD;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAC5D;IACE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,EAAE,CACJ,CA8BA"}

package/dist/generate.js

@@ -15,7 +15,8 @@ import { CustomResourceDefinition } from "./upstream.js";
  * @returns A promise that resolves to a record of generated TypeScript types.
  */
 export async function convertCRDtoTS(crd, opts) {
-    const name = crd.spec.names.kind;
+    const name = opts.overrideClassName || crd.spec.names.kind;
+    const originalKind = crd.spec.names.kind;
     const results = {};
     const output = [];
     // Check for missing versions or empty schema
@@ -33,7 +34,7 @@ export async function convertCRDtoTS(crd, opts) {
         opts.logFn(`- Generating ${crd.spec.group}/${match.name} types for ${name}`);
         const inputData = await prepareInputData(name, schema);
         const generatedTypes = await generateTypes(inputData, opts);
-        const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
+        const fileName = `${originalKind.toLowerCase()}-${match.name.toLowerCase()}`;
         writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
         results[fileName] = generatedTypes;
         output.push({ results, name, crd, version: match.name });

package/dist/postProcessing.d.ts

@@ -89,10 +89,10 @@ export declare function updateBraceBalance(line: string, braceBalance: number):
  * @param name The name of the schema.
  * @param crd The CustomResourceDefinition object.
  * @param version The version of the CRD.
- * @param npmPackage The NPM package name for the fluent client.
+ * @param opts the options for the generation process.
  * @returns The processed TypeScript lines.
  */
-export declare function wrapWithFluentClient(lines: string[], name: string, crd: CustomResourceDefinition, version: string, npmPackage?: string): string[];
+export declare function wrapWithFluentClient(lines: string[], name: string, crd: CustomResourceDefinition, version: string, opts: GenerateOptions): string[];
 /**
  * Processes the lines of the TypeScript file, focusing on classes extending `GenericKind`.
  *

package/dist/postProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessing.d.ts","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAMzD,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAIvF;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,eAAe,iBAalF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAahF;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACxC,IAAI,EAAE,eAAe,iBAoBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,eAAe,QA2BtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,CAoBR;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAalE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,UAAU,GAAE,MAAmC,GAC9C,MAAM,EAAE,CAoBV;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,EAAE,EACf,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,EAAE,CAiBV;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,kBAAkB,CAgBpB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,QAGpF"}
+{"version":3,"file":"postProcessing.d.ts","sourceRoot":"","sources":["../src/postProcessing.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAMzD,KAAK,SAAS,GAAG;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,wBAAwB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAIvF;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,eAAe,iBAalF;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAahF;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,MAAM,EAAE,EACf,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EACxC,IAAI,EAAE,eAAe,iBAoBtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EACrB,IAAI,EAAE,eAAe,QA2BtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,CAoBR;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,EAAE,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAalE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,wBAAwB,EAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,eAAe,GACpB,MAAM,EAAE,CAmBV;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,EAAE,EACf,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,MAAM,EAAE,CAiBV;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,MAAM,EACpB,qBAAqB,EAAE,MAAM,EAAE,EAC/B,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,GAC3B,kBAAkB,CAgBpB;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,QAGpF"}

package/dist/postProcessing.js

@@ -31,7 +31,7 @@ export async function postProcessing(allResults, opts) {
 export function mapFilesToCRD(allResults) {
     const fileResultMap = {};
     for (const { name, crd, version } of allResults) {
-        const expectedFileName = `${name.toLowerCase()}-${version.toLowerCase()}.ts`;
+        const expectedFileName = `${crd.spec.names.kind.toLowerCase()}-${version.toLowerCase()}.ts`;
         fileResultMap[expectedFileName] = { name, crd, version };
     }
     if (Object.keys(fileResultMap).length === 0) {
@@ -117,7 +117,7 @@ export function applyCRDPostProcessing(content, name, crd, version, opts) {
         let lines = content.split("\n");
         // Wraps with the fluent client if needed
         if (opts.language === "ts" && !opts.plain) {
-            lines = wrapWithFluentClient(lines, name, crd, version, opts.npmPackage);
+            lines = wrapWithFluentClient(lines, name, crd, version, opts);
         }
         const foundInterfaces = collectInterfaceNames(lines);
         // Process the lines, focusing on classes extending `GenericKind`
@@ -187,18 +187,18 @@ export function updateBraceBalance(line, braceBalance) {
  * @param name The name of the schema.
  * @param crd The CustomResourceDefinition object.
  * @param version The version of the CRD.
- * @param npmPackage The NPM package name for the fluent client.
+ * @param opts the options for the generation process.
  * @returns The processed TypeScript lines.
  */
-export function wrapWithFluentClient(lines, name, crd, version, npmPackage = "kubernetes-fluent-client") {
-    const autoGenNotice = `// This file is auto-generated by ${npmPackage}, do not edit manually`;
-    const imports = `import { GenericKind, RegisterKind } from "${npmPackage}";`;
+export function wrapWithFluentClient(lines, name, crd, version, opts) {
+    const autoGenNotice = `// This file is auto-generated by ${opts.npmPackage}, do not edit manually`;
+    const imports = `import { GenericKind, RegisterKind } from "${opts.npmPackage}";`;
     const classIndex = lines.findIndex(line => line.includes(`export interface ${name} {`));
     if (classIndex !== -1) {
         lines[classIndex] = `export class ${name} extends GenericKind {`;
     }
     lines.unshift(autoGenNotice, imports);
-    lines.push(`RegisterKind(${name}, {`, `  group: "${crd.spec.group}",`, `  version: "${version}",`, `  kind: "${name}",`, `  plural: "${crd.spec.names.plural}",`, `});`);
+    lines.push(`RegisterKind(${name}, {`, `  group: "${crd.spec.group}",`, `  version: "${version}",`, `  kind: "${crd.spec.names.kind}",`, `  plural: "${crd.spec.names.plural}",`, `});`);
     return lines;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kubernetes-fluent-client",
-  "version": "3.7.0-nightly.0",
+  "version": "3.7.0-nightly.1",
   "description": "A @kubernetes/client-node fluent API wrapper that leverages K8s Server Side Apply.",
   "bin": "./dist/cli.js",
   "main": "dist/index.js",

package/src/cli.ts

@@ -27,6 +27,11 @@ void yargs(hideBin(process.argv))
           describe: "the directory to output the generated types to",
           type: "string",
         })
+        .option("overrideClassName", {
+          type: "string",
+          description:
+            "override the class name for the generated types, useful for generating types when multiple CRDs have the same kind",
+        })
         .option("plain", {
           alias: "p",
           type: "boolean",
@@ -51,6 +56,7 @@ void yargs(hideBin(process.argv))
     async argv => {
       const opts = argv as unknown as GenerateOptions;
       opts.logFn = console.log;
+      opts.npmPackage = "kubernetes-fluent-client";
 
       // Pass the `post` flag to opts
       opts.noPost = argv.noPost as boolean;

package/src/generate.ts

@@ -20,6 +20,7 @@ export type QuicktypeLang = Parameters<typeof quicktype>[0]["lang"];
 export interface GenerateOptions {
   source: string; // URL, file path, or K8s CRD name
   directory?: string; // Output directory path
+  overrideClassName?: string; // Override class name for generated types
   plain?: boolean; // Disable fluent client wrapping
   language: QuicktypeLang; // Language for type generation (default: "ts")
   npmPackage?: string; // Override NPM package
@@ -45,7 +46,8 @@ export async function convertCRDtoTS(
     version: string;
   }[]
 > {
-  const name = crd.spec.names.kind;
+  const name = opts.overrideClassName || crd.spec.names.kind;
+  const originalKind = crd.spec.names.kind;
   const results: Record<string, string[]> = {};
   const output: {
     results: Record<string, string[]>;
@@ -75,7 +77,7 @@ export async function convertCRDtoTS(
     const inputData = await prepareInputData(name, schema);
     const generatedTypes = await generateTypes(inputData, opts);
 
-    const fileName = `${name.toLowerCase()}-${match.name.toLowerCase()}`;
+    const fileName = `${originalKind.toLowerCase()}-${match.name.toLowerCase()}`;
     writeGeneratedFile(fileName, opts.directory || "", generatedTypes, opts.language || "ts");
 
     results[fileName] = generatedTypes;

package/src/postProcessing.ts

@@ -52,7 +52,7 @@ export function mapFilesToCRD(allResults: CRDResult[]): Record<string, CRDResult
   const fileResultMap: Record<string, CRDResult> = {};
 
   for (const { name, crd, version } of allResults) {
-    const expectedFileName = `${name.toLowerCase()}-${version.toLowerCase()}.ts`;
+    const expectedFileName = `${crd.spec.names.kind.toLowerCase()}-${version.toLowerCase()}.ts`;
     fileResultMap[expectedFileName] = { name, crd, version };
   }
 
@@ -159,7 +159,7 @@ export function applyCRDPostProcessing(
 
     // Wraps with the fluent client if needed
     if (opts.language === "ts" && !opts.plain) {
-      lines = wrapWithFluentClient(lines, name, crd, version, opts.npmPackage);
+      lines = wrapWithFluentClient(lines, name, crd, version, opts);
     }
     const foundInterfaces = collectInterfaceNames(lines);
 
@@ -242,7 +242,7 @@ export function updateBraceBalance(line: string, braceBalance: number): number {
  * @param name The name of the schema.
  * @param crd The CustomResourceDefinition object.
  * @param version The version of the CRD.
- * @param npmPackage The NPM package name for the fluent client.
+ * @param opts the options for the generation process.
  * @returns The processed TypeScript lines.
  */
 export function wrapWithFluentClient(
@@ -250,11 +250,10 @@ export function wrapWithFluentClient(
   name: string,
   crd: CustomResourceDefinition,
   version: string,
-  npmPackage: string = "kubernetes-fluent-client",
+  opts: GenerateOptions,
 ): string[] {
-  const autoGenNotice = `// This file is auto-generated by ${npmPackage}, do not edit manually`;
-  const imports = `import { GenericKind, RegisterKind } from "${npmPackage}";`;
-
+  const autoGenNotice = `// This file is auto-generated by ${opts.npmPackage}, do not edit manually`;
+  const imports = `import { GenericKind, RegisterKind } from "${opts.npmPackage}";`;
   const classIndex = lines.findIndex(line => line.includes(`export interface ${name} {`));
   if (classIndex !== -1) {
     lines[classIndex] = `export class ${name} extends GenericKind {`;
@@ -265,7 +264,7 @@ export function wrapWithFluentClient(
     `RegisterKind(${name}, {`,
     `  group: "${crd.spec.group}",`,
     `  version: "${version}",`,
-    `  kind: "${name}",`,
+    `  kind: "${crd.spec.names.kind}",`,
     `  plural: "${crd.spec.names.plural}",`,
     `});`,
   );