update

labring · Dec 31, 2024 · 910b03c · 910b03c
1 parent aba761a
commit 910b03c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/frontend/providers/applaunchpad/src/pages/api/pauseApp.ts b/frontend/providers/applaunchpad/src/pages/api/pauseApp.ts
@@ -60,17 +60,21 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       );
       if (ingress?.items?.length > 0) {
         for (const ingressItem of ingress.items) {
-          if (
-            ingressItem?.metadata?.name &&
-            ingressItem.metadata?.annotations?.['kubernetes.io/ingress.class'] === 'nginx'
-          ) {
-            const patchData = {
-              metadata: {
+          if (ingressItem?.metadata?.name) {
+            const patchData: Record<string, any> = {};
+            if (ingressItem.metadata?.annotations?.['kubernetes.io/ingress.class'] === 'nginx') {
+              patchData.metadata = {
                 annotations: {
                   'kubernetes.io/ingress.class': 'pause'
                 }
-              }
-            };
+              };
+            }
+            if (ingressItem.spec?.ingressClassName === 'nginx') {
+              patchData.spec = {
+                ingressClassName: 'pause'
+              };
+            }
+
             requestQueue.push(
               k8sNetworkingApp.patchNamespacedIngress(
                 ingressItem.metadata.name,

diff --git a/frontend/providers/applaunchpad/src/pages/api/startApp.ts b/frontend/providers/applaunchpad/src/pages/api/startApp.ts
@@ -73,17 +73,21 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       );
       if (ingress?.items?.length > 0) {
         for (const ingressItem of ingress.items) {
-          if (
-            ingressItem?.metadata?.name &&
-            ingressItem.metadata?.annotations?.['kubernetes.io/ingress.class'] === 'pause'
-          ) {
-            const patchData = {
-              metadata: {
+          if (ingressItem?.metadata?.name) {
+            const patchData: Record<string, any> = {};
+            if (ingressItem.metadata?.annotations?.['kubernetes.io/ingress.class'] === 'pause') {
+              patchData.metadata = {
                 annotations: {
                   'kubernetes.io/ingress.class': 'nginx'
                 }
-              }
-            };
+              };
+            }
+            if (ingressItem.spec?.ingressClassName === 'pause') {
+              patchData.spec = {
+                ingressClassName: 'nginx'
+              };
+            }
+
             requestQueue.push(
               k8sNetworkingApp.patchNamespacedIngress(
                 ingressItem.metadata.name,