fix: Update ingress api-version from networking.k8s.io/v1beta1 to net…

…working.k8s.io/v1
kore3lab · Oct 21, 2022 · 482dbf8 · 482dbf8
1 parent 42cf326
commit 482dbf8
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 26 deletions.
diff --git a/src/app/frontend/assets/template/ingress.json b/src/app/frontend/assets/template/ingress.json
@@ -1,29 +1,34 @@
 {
-    "apiVersion": "networking.k8s.io/v1beta1",
-    "kind": "Ingress",
-    "metadata": {
-        "name": "test-ingress",
-        "namespace": "default",
-        "annotations": {
-            "nginx.ingress.kubernetes.io/rewrite-target": "/"
-        }
-    },
-    "spec": {
-        "rules": [
+  "apiVersion": "networking.k8s.io/v1",
+  "kind": "Ingress",
+  "metadata": {
+      "name": "minimal-ingress",
+      "namespace": "default",
+      "annotations": {
+          "nginx.ingress.kubernetes.io/rewrite-target": "/"
+      }
+  },
+  "spec": {
+    "ingressClassName": "nginx-example",
+    "rules": [
+      {
+        "http": {
+          "paths": [
             {
-                "http": {
-                    "paths": [
-                        {
-                            "path": "/testpath",
-                            "pathType": "Prefix",
-                            "backend": {
-                                "serviceName": "test",
-                                "servicePort": 80
-                            }
-                        }
-                    ]
+              "path": "/testpath",
+              "pathType": "Prefix",
+              "backend": {
+                "service": {
+                  "name": "test",
+                  "port": {
+                    "number": 80
+                  }
                 }
+              }
             }
-        ]
-    }
+          ]
+        }
+      }
+    ]
+  }
 }
diff --git a/src/app/frontend/pages/networking/ingress.view.vue b/src/app/frontend/pages/networking/ingress.view.vue
@@ -106,8 +106,8 @@ export default {
 					host = rule.host
 					list = [];
 					rule.http.paths.map((p,_) => {
-						const serviceName = "service" in p.backend ? p.backend.service.name : p.backend.serviceName;
-						const servicePort = "service" in p.backend ? p.backend.service.port.number ?? p.backend.service.port.name : p.backend.servicePort;
+						const serviceName = "service" in p.backend && p.backend.service ? p.backend.service.name : p.backend.serviceName;
+						const servicePort = "service" in p.backend && p.backend.service ? p.backend.service.port.number ?? p.backend.service.port.name : p.backend.servicePort;
 						list.push({
 							path: p.path || "-",
 							backends: `${serviceName}:${servicePort}`