Revert "Fix invalid networkPolicy schema (#2230)"

This reverts commit 2d71cce.
vdaas · Nov 30, 2023 · b9b58a5 · b9b58a5
1 parent 5bd1598
commit b9b58a5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/charts/vald-helm-operator/crds/valdrelease.yaml b/charts/vald-helm-operator/crds/valdrelease.yaml
@@ -2032,15 +2032,11 @@ spec:
                           type: object
                           properties:
                             egress:
-                              type: array
-                              items:
-                                type: object
-                                x-kubernetes-preserve-unknown-fields: true
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
                             ingress:
-                              type: array
-                              items:
-                                type: object
-                                x-kubernetes-preserve-unknown-fields: true
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
                         enabled:
                           type: boolean
                     observability:

diff --git a/charts/vald/values.schema.json b/charts/vald/values.schema.json
@@ -3288,14 +3288,12 @@
               "description": "custom network policies that a user can add",
               "properties": {
                 "egress": {
-                  "type": "array",
-                  "description": "custom egress network policies that a user can add",
-                  "items": { "type": "object" }
+                  "type": "object",
+                  "description": "custom egress network policies that a user can add"
                 },
                 "ingress": {
-                  "type": "array",
-                  "description": "custom ingress network policies that a user can add",
-                  "items": { "type": "object" }
+                  "type": "object",
+                  "description": "custom ingress network policies that a user can add"
                 }
               }
             },

diff --git a/charts/vald/values.yaml b/charts/vald/values.yaml
@@ -838,12 +838,12 @@ defaults:
     # @schema {"name": "defaults.networkPolicy.custom", "type": "object"}
     # defaults.networkPolicy.custom -- custom network policies that a user can add
     custom:
-      # @schema {"name": "defaults.networkPolicy.custom.ingress", "type": "array", "items": {"type": "object"}}
+      # @schema {"name": "defaults.networkPolicy.custom.ingress", "type": "object"}
       # defaults.networkPolicy.custom.ingress -- custom ingress network policies that a user can add
-      ingress: []
-      # @schema {"name": "defaults.networkPolicy.custom.egress", "type": "array", "items": {"type": "object"}}
+      ingress: {}
+      # @schema {"name": "defaults.networkPolicy.custom.egress", "type": "object"}
       # defaults.networkPolicy.custom.egress -- custom egress network policies that a user can add
-      egress: []
+      egress: {}
 # @schema {"name": "gateway", "type": "object"}
 gateway:
   # @schema {"name": "gateway.lb", "type": "object"}