fix: k8s errors with new deprecated imports

linode · Nov 1, 2024 · 2bf98a9 · 2bf98a9
1 parent 853e3d7
commit 2bf98a9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/src/k8s.ts b/src/k8s.ts
@@ -3,7 +3,7 @@
 import {
   CoreV1Api,
   KubeConfig,
-  NetworkingV1beta1Api,
+  NetworkingV1Api,
   V1ObjectMeta,
   V1Secret,
   V1ServiceAccount,
@@ -13,7 +13,7 @@ import { findIndex, mapValues } from 'lodash'
 
 let kc: KubeConfig
 let coreClient: CoreV1Api
-let networkingClient: NetworkingV1beta1Api
+let networkingClient: NetworkingV1Api
 
 export const k8s = {
   kc: (): KubeConfig => {
@@ -27,9 +27,9 @@ export const k8s = {
     coreClient = k8s.kc().makeApiClient(CoreV1Api)
     return coreClient
   },
-  networking: (): NetworkingV1beta1Api => {
+  networking: (): NetworkingV1Api => {
     if (networkingClient) return networkingClient
-    networkingClient = k8s.kc().makeApiClient(NetworkingV1beta1Api)
+    networkingClient = k8s.kc().makeApiClient(NetworkingV1Api)
     return networkingClient
   },
 }
@@ -128,9 +128,19 @@ export async function createK8sSecret({
   const idx = findIndex(sa.imagePullSecrets, { name })
   if (idx === -1) {
     sa.imagePullSecrets.push({ name })
-    await client.patchNamespacedServiceAccount('default', namespace, sa, undefined, undefined, undefined, undefined, {
-      headers: { 'content-type': 'application/strategic-merge-patch+json' },
-    })
+    await client.patchNamespacedServiceAccount(
+      'default',
+      namespace,
+      sa,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      {
+        headers: { 'content-type': 'application/strategic-merge-patch+json' },
+      },
+    )
   }
 }
 
@@ -196,9 +206,19 @@ export async function deleteSecret(namespace: string, name: string): Promise<voi
   const idx = findIndex(sa.imagePullSecrets, { name })
   if (idx > -1) {
     sa.imagePullSecrets!.splice(idx, 1)
-    await client.patchNamespacedServiceAccount('default', namespace, sa, undefined, undefined, undefined, undefined, {
-      headers: { 'content-type': 'application/strategic-merge-patch+json' },
-    })
+    await client.patchNamespacedServiceAccount(
+      'default',
+      namespace,
+      sa,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      {
+        headers: { 'content-type': 'application/strategic-merge-patch+json' },
+      },
+    )
   }
   try {
     await client.deleteNamespacedSecret(name, namespace)

diff --git a/src/operator/secrets.ts b/src/operator/secrets.ts
@@ -77,6 +77,7 @@ export default class MyOperator extends Operator {
               undefined,
               undefined,
               undefined,
+              undefined,
               { headers },
             )
             console.debug(