change kube apiserver request header

kubernetes-sigs · Mar 12, 2022 · 02b9633 · 02b9633
1 parent 0ea96b1
commit 02b9633
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 120 deletions.
diff --git a/web/api/v1/node.ts b/web/api/v1/node.ts
@@ -1,24 +1,21 @@
 import { V1Node, V1NodeList } from "@kubernetes/client-node";
 import { k8sInstance } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyNode = async (req: V1Node, onError: (_: string) => void) => {
   try {
     if (!req.metadata?.name) {
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "Node";
+    req.apiVersion = "v1";
     const res = await k8sInstance.patch<V1Node>(
       `/nodes/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createNode(req, onError);
-      return res;
-    }
     onError("failed to applyNode: " + e);
   }
 };
@@ -52,15 +49,3 @@ export const deleteNode = async (
     onError("failed to deleteNode: " + e);
   }
 };
-
-const createNode = async (req: V1Node, onError: (_: string) => void) => {
-  try {
-    const res = await k8sInstance.post<V1Node>(
-      `/nodes?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createNode: " + e);
-  }
-};
diff --git a/web/api/v1/pod.ts b/web/api/v1/pod.ts
@@ -1,24 +1,21 @@
 import { V1Pod, V1PodList } from "@kubernetes/client-node";
 import { k8sInstance, namespaceURL } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyPod = async (req: V1Pod, onError: (_: string) => void) => {
   try {
     if (!req.metadata?.name) {
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "Pod";
+    req.apiVersion = "v1";
     const res = await k8sInstance.patch<V1Pod>(
       namespaceURL + `/pods/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createPod(req, onError);
-      return res;
-    }
     onError("failed to applyPod: " + e);
   }
 };
@@ -55,15 +52,3 @@ export const deletePod = async (name: string, onError: (_: string) => void) => {
     onError("failed to deletePod: " + e);
   }
 };
-
-const createPod = async (req: V1Pod, onError: (_: string) => void) => {
-  try {
-    const res = await k8sInstance.post<V1Pod>(
-      namespaceURL + `/pods?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createPod: " + e);
-  }
-};
diff --git a/web/api/v1/priorityclass.ts b/web/api/v1/priorityclass.ts
@@ -1,6 +1,5 @@
 import { V1PriorityClass, V1PriorityClassList } from "@kubernetes/client-node";
 import { k8sSchedulingInstance } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyPriorityClass = async (
   req: V1PriorityClass,
@@ -11,17 +10,15 @@ export const applyPriorityClass = async (
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "PriorityClass";
+    req.apiVersion = "scheduling.k8s.io/v1";
     const res = await k8sSchedulingInstance.patch<V1PriorityClass>(
       `/priorityclasses/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createPriorityClass(req, onError);
-      return res;
-    }
     onError("failed to applyPriorityClass: " + e);
   }
 };
@@ -67,18 +64,3 @@ export const deletePriorityClass = async (
     onError("failed to deletePriorityClass: " + e);
   }
 };
-
-const createPriorityClass = async (
-  req: V1PriorityClass,
-  onError: (_: string) => void
-) => {
-  try {
-    const res = await k8sSchedulingInstance.post<V1PriorityClass>(
-      `/priorityclasses?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createPriorityClass: " + e);
-  }
-};
diff --git a/web/api/v1/pv.ts b/web/api/v1/pv.ts
@@ -3,7 +3,6 @@ import {
   V1PersistentVolumeList,
 } from "@kubernetes/client-node";
 import { k8sInstance } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyPersistentVolume = async (
   req: V1PersistentVolume,
@@ -14,17 +13,15 @@ export const applyPersistentVolume = async (
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "PersistentVolume";
+    req.apiVersion = "v1";
     const res = await k8sInstance.patch<V1PersistentVolume>(
       `/persistentvolumes/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createPersistentvolumes(req, onError);
-      return res;
-    }
     onError("failed to applyPersistentVolume: " + e);
   }
 };
@@ -67,18 +64,3 @@ export const deletePersistentVolume = async (
     onError("failed to deletePersistentVolume: " + e);
   }
 };
-
-const createPersistentvolumes = async (
-  req: V1PersistentVolume,
-  onError: (_: string) => void
-) => {
-  try {
-    const res = await k8sInstance.post<V1PersistentVolume>(
-      `/persistentvolumes?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createPersistentvolumes: " + e);
-  }
-};
diff --git a/web/api/v1/pvc.ts b/web/api/v1/pvc.ts
@@ -3,7 +3,6 @@ import {
   V1PersistentVolumeClaimList,
 } from "@kubernetes/client-node";
 import { k8sInstance, namespaceURL } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyPersistentVolumeClaim = async (
   req: V1PersistentVolumeClaim,
@@ -14,18 +13,16 @@ export const applyPersistentVolumeClaim = async (
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "PersistentVolumeClaim";
+    req.apiVersion = "v1";
     const res = await k8sInstance.patch<V1PersistentVolumeClaim>(
       namespaceURL +
         `/persistentvolumeclaims/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createPersistentVolumeClaim(req, onError);
-      return res;
-    }
     onError("failed to applyPersistentVolumeClaim: " + e);
   }
 };
@@ -73,18 +70,3 @@ export const deletePersistentVolumeClaim = async (
     onError("failed to deletePersistentVolumeClaim: " + e);
   }
 };
-
-const createPersistentVolumeClaim = async (
-  req: V1PersistentVolumeClaim,
-  onError: (_: string) => void
-) => {
-  try {
-    const res = await k8sInstance.post<V1PersistentVolumeClaim>(
-      namespaceURL + `/persistentvolumeclaims?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createPersistentVolumeClaim: " + e);
-  }
-};
diff --git a/web/api/v1/storageclass.ts b/web/api/v1/storageclass.ts
@@ -1,6 +1,5 @@
 import { V1StorageClass, V1StorageClassList } from "@kubernetes/client-node";
 import { k8sStorageInstance } from "@/api/v1/index";
-import axios from "axios";
 
 export const applyStorageClass = async (
   req: V1StorageClass,
@@ -11,17 +10,15 @@ export const applyStorageClass = async (
       onError("metadata.name is not provided");
       return;
     }
+    req.kind = "StorageClass";
+    req.apiVersion = "storage.k8s.io/v1";
     const res = await k8sStorageInstance.patch<V1StorageClass>(
       `/storageclasses/${req.metadata.name}?fieldManager=simulator`,
       req,
-      { headers: { "Content-Type": "application/strategic-merge-patch+json" } }
+      { headers: { "Content-Type": "application/apply-patch+yaml" } }
     );
     return res.data;
   } catch (e: any) {
-    if (axios.isAxiosError(e) && e.response && e.response.status === 404) {
-      const res = await createStorageClass(req, onError);
-      return res;
-    }
     onError("failed to applyStorageClass: " + e);
   }
 };
@@ -64,18 +61,3 @@ export const deleteStorageClass = async (
     onError("failed to deleteStorageClass: " + e);
   }
 };
-
-const createStorageClass = async (
-  req: V1StorageClass,
-  onError: (_: string) => void
-) => {
-  try {
-    const res = await k8sStorageInstance.post<V1StorageClass>(
-      `/storageclasses?fieldManager=simulator`,
-      req
-    );
-    return res.data;
-  } catch (e: any) {
-    onError("failed to createStorageClass: " + e);
-  }
-};