improve regular expression for exclude-l2-config.yaml

All entries should use the correct notation "^",Otherwise, which maybe match an unexpect interface. Signed-off-by: cyclinder <qifeng.guo@daocloud.io>
metallb · Aug 25, 2023 · c5b1e35 · c5b1e35
1 parent 04abf80
commit c5b1e35
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/charts/metallb/templates/exclude-l2-config.yaml b/charts/metallb/templates/exclude-l2-config.yaml
@@ -7,17 +7,17 @@ metadata:
 data:
   excludel2.yaml: |
     announcedInterfacesToExclude:
-    - docker.*
-    - cbr.*
-    - dummy.*
-    - virbr.*
-    - lxcbr.*
-    - veth.*
-    - lo
+    - ^docker.*
+    - ^cbr.*
+    - ^dummy.*
+    - ^virbr.*
+    - ^lxcbr.*
+    - ^veth.*
+    - ^lo$
     - ^cali.*
     - ^tunl.*
-    - flannel.*
-    - kube-ipvs.*
-    - cni.*
+    - ^flannel.*
+    - ^kube-ipvs.*
+    - ^cni.*
     - ^nodelocaldns.*
 {{- end }}
diff --git a/config/manifests/metallb-frr-prometheus.yaml b/config/manifests/metallb-frr-prometheus.yaml
@@ -1833,7 +1833,7 @@ metadata:
 apiVersion: v1
 data:
   excludel2.yaml: |
-    announcedInterfacesToExclude: ["docker.*", "cbr.*", "dummy.*", "virbr.*", "lxcbr.*", "veth.*", "lo", "^cali.*", "^tunl.*", "flannel.*", "kube-ipvs.*", "cni.*", "^nodelocaldns.*"]
+    announcedInterfacesToExclude: ["^docker.*", "^cbr.*", "^dummy.*", "^virbr.*", "^lxcbr.*", "^veth.*", "^lo$", "^cali.*", "^tunl.*", "^flannel.*", "^kube-ipvs.*", "^cni.*", "^nodelocaldns.*"]
 kind: ConfigMap
 metadata:
   name: metallb-excludel2

diff --git a/config/manifests/metallb-frr.yaml b/config/manifests/metallb-frr.yaml
@@ -1778,7 +1778,7 @@ metadata:
 apiVersion: v1
 data:
   excludel2.yaml: |
-    announcedInterfacesToExclude: ["docker.*", "cbr.*", "dummy.*", "virbr.*", "lxcbr.*", "veth.*", "lo", "^cali.*", "^tunl.*", "flannel.*", "kube-ipvs.*", "cni.*", "^nodelocaldns.*"]
+    announcedInterfacesToExclude: ["^docker.*", "^cbr.*", "^dummy.*", "^virbr.*", "^lxcbr.*", "^veth.*", "^lo$", "^cali.*", "^tunl.*", "^flannel.*", "^kube-ipvs.*", "^cni.*", "^nodelocaldns.*"]
 kind: ConfigMap
 metadata:
   name: metallb-excludel2

diff --git a/config/manifests/metallb-native-prometheus.yaml b/config/manifests/metallb-native-prometheus.yaml
@@ -1735,7 +1735,7 @@ subjects:
 apiVersion: v1
 data:
   excludel2.yaml: |
-    announcedInterfacesToExclude: ["docker.*", "cbr.*", "dummy.*", "virbr.*", "lxcbr.*", "veth.*", "lo", "^cali.*", "^tunl.*", "flannel.*", "kube-ipvs.*", "cni.*", "^nodelocaldns.*"]
+    announcedInterfacesToExclude: ["^docker.*", "^cbr.*", "^dummy.*", "^virbr.*", "^lxcbr.*", "^veth.*", "^lo$", "^cali.*", "^tunl.*", "^flannel.*", "^kube-ipvs.*", "^cni.*", "^nodelocaldns.*"]
 kind: ConfigMap
 metadata:
   name: metallb-excludel2

diff --git a/config/manifests/metallb-native.yaml b/config/manifests/metallb-native.yaml
@@ -1680,7 +1680,7 @@ subjects:
 apiVersion: v1
 data:
   excludel2.yaml: |
-    announcedInterfacesToExclude: ["docker.*", "cbr.*", "dummy.*", "virbr.*", "lxcbr.*", "veth.*", "lo", "^cali.*", "^tunl.*", "flannel.*", "kube-ipvs.*", "cni.*", "^nodelocaldns.*"]
+    announcedInterfacesToExclude: ["^docker.*", "^cbr.*", "^dummy.*", "^virbr.*", "^lxcbr.*", "^veth.*", "^lo$", "^cali.*", "^tunl.*", "^flannel.*", "^kube-ipvs.*", "^cni.*", "^nodelocaldns.*"]
 kind: ConfigMap
 metadata:
   name: metallb-excludel2

diff --git a/config/native/exclude-l2-config.yaml b/config/native/exclude-l2-config.yaml
@@ -5,4 +5,4 @@ metadata:
   namespace: metallb-system
 data:
   excludel2.yaml: |
-    announcedInterfacesToExclude: ["docker.*", "cbr.*", "dummy.*", "virbr.*", "lxcbr.*", "veth.*", "lo", "^cali.*", "^tunl.*", "flannel.*", "kube-ipvs.*", "cni.*", "^nodelocaldns.*"]
+    announcedInterfacesToExclude: ["^docker.*", "^cbr.*", "^dummy.*", "^virbr.*", "^lxcbr.*", "^veth.*", "^lo$", "^cali.*", "^tunl.*", "^flannel.*", "^kube-ipvs.*", "^cni.*", "^nodelocaldns.*"]