update metallb values.schema.json

Signed-off-by: Cyclinder Kuo <kuocyclinder@gmail.com>
DaoCloud · Jan 24, 2025 · f6f5901 · f6f5901
1 parent 898c451
commit f6f5901
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/charts/metallb/appendValues.yaml b/charts/metallb/appendValues.yaml
@@ -25,8 +25,8 @@ instances:
     - default-pool
     # ipAddressPoolSelectors: {}
     nodeSelectors:
-      key: "kubernetes.io/os"
-      value: "linux"
+      key: "node.spidernet.io/include-metallb-l2-loadbalancer"
+      value: "true"
     interfaces: []
 
 global:

diff --git a/charts/metallb/metallb/README.md b/charts/metallb/metallb/README.md
@@ -20,8 +20,8 @@ A network load-balancer implementation for Kubernetes using standard routing pro
 | instances.arp.interfaces | list | `[]` |  |
 | instances.arp.ipAddressPools | list | `["default-pool"]` | list of ip-address pools via arp advertisement |
 | instances.arp.name | string | `"default-l2advertisement"` | default arp advertisement name |
-| instances.arp.nodeSelectors.key | string | `"kubernetes.io/os"` |  |
-| instances.arp.nodeSelectors.value | string | `"linux"` |  |
+| instances.arp.nodeSelectors.key | string | `"node.spidernet.io/include-metallb-l2-loadbalancer"` |  |
+| instances.arp.nodeSelectors.value | string | `"true"` |  |
 | instances.enabled | bool | `false` | enable default ip-address pool |
 | instances.ipAddressPools.addresses | list | `[]` |  |
 | instances.ipAddressPools.autoAssign | bool | `true` |  |

diff --git a/charts/metallb/metallb/values.schema.json b/charts/metallb/metallb/values.schema.json
@@ -107,6 +107,11 @@
             "default": {},
             "title": "MetalLB ARP Mode",
             "description": "Metallb supports ARP and BGP modes to declare LoadBalancer IPs. the BGP mode is complex to configure and requires hardware support (such as BGP Router). If you want to configure BGP. Please refer to https://metallb.universe.tf/configuration/_advanced_bgp_configuration",
+            "required": [
+                "enabled",
+                "ipAddressPools",
+                "arp"
+            ],
             "properties": {
                 "enabled": {
                     "type": "boolean",
@@ -132,9 +137,7 @@
                             "items": {
                                 "type": "string"
                             },
-                            "default": [
-                                "192.168.10.100-192.168.10.200"
-                            ],
+                            "default": [],
                             "examples": [
                                 "192.168.10.0/24",
                                 "172.168.1.1-172.168.1.10",
@@ -156,6 +159,10 @@
                             "type": "object",
                             "title": "NodeSelectors",
                             "description": "NodeSelectors allows to limit the nodes to announce as next hops for the LoadBalancer IP. When empty, all the nodes having are announced as next hops",
+                            "required": [
+                                "key",
+                                "value"
+                            ],
                             "properties": {
                                 "key": {
                                     "type": "string",

diff --git a/charts/metallb/metallb/values.yaml b/charts/metallb/metallb/values.yaml
@@ -366,8 +366,8 @@ instances:
       - default-pool
     # ipAddressPoolSelectors: {}
     nodeSelectors:
-      key: "kubernetes.io/os"
-      value: "linux"
+      key: "node.spidernet.io/include-metallb-l2-loadbalancer"
+      value: "true"
     interfaces: []
 global:
   imageRegistry: ""

diff --git a/charts/metallb/parent/values.schema.json b/charts/metallb/parent/values.schema.json
@@ -107,6 +107,11 @@
             "default": {},
             "title": "MetalLB ARP Mode",
             "description": "Metallb supports ARP and BGP modes to declare LoadBalancer IPs. the BGP mode is complex to configure and requires hardware support (such as BGP Router). If you want to configure BGP. Please refer to https://metallb.universe.tf/configuration/_advanced_bgp_configuration",
+            "required": [
+                "enabled",
+                "ipAddressPools",
+                "arp"
+            ],
             "properties": {
                 "enabled": {
                     "type": "boolean",
@@ -132,9 +137,7 @@
                             "items": {
                                 "type": "string"
                             },
-                            "default": [
-                                "192.168.10.100-192.168.10.200"
-                            ],
+                            "default": [],
                             "examples": [
                                 "192.168.10.0/24",
                                 "172.168.1.1-172.168.1.10",
@@ -156,6 +159,10 @@
                             "type": "object",
                             "title": "NodeSelectors",
                             "description": "NodeSelectors allows to limit the nodes to announce as next hops for the LoadBalancer IP. When empty, all the nodes having are announced as next hops",
+                            "required": [
+                                "key",
+                                "value"
+                            ],
                             "properties": {
                                 "key": {
                                     "type": "string",