manifest: adjust manifests of l2status function

Signed-off-by: lwabish <wubw@pku.edu.cn>
metallb · Apr 20, 2024 · 2aba615 · 2aba615
1 parent 950f74d
commit 2aba615
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 0 deletions.
diff --git a/charts/metallb/templates/speaker.yaml b/charts/metallb/templates/speaker.yaml
@@ -250,6 +250,9 @@ spec:
         {{- if .Values.prometheus.secureMetricsPort }}
         - --host=localhost
         {{- end }}
+        {{- if not .Values.speaker.layer2Status }}
+        - --enable-l2-service-status=false
+        {{- end }}
         env:
         - name: METALLB_NODE_NAME
           valueFrom:

diff --git a/config/controllers/speaker.yaml b/config/controllers/speaker.yaml
@@ -23,6 +23,7 @@ spec:
       - args:
         - --port=7472
         - --log-level=info
+        - --enable-l2-service-status=true
         env:
         - name: METALLB_NODE_NAME
           valueFrom:

diff --git a/config/manifests/metallb-frr-k8s-prometheus.yaml b/config/manifests/metallb-frr-k8s-prometheus.yaml
@@ -1846,6 +1846,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -3055,6 +3056,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef:

diff --git a/config/manifests/metallb-frr-k8s.yaml b/config/manifests/metallb-frr-k8s.yaml
@@ -1846,6 +1846,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -2937,6 +2938,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef:

diff --git a/config/manifests/metallb-frr-prometheus.yaml b/config/manifests/metallb-frr-prometheus.yaml
@@ -1320,6 +1320,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -2080,6 +2081,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef:

diff --git a/config/manifests/metallb-frr.yaml b/config/manifests/metallb-frr.yaml
@@ -1320,6 +1320,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -1903,6 +1904,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef:

diff --git a/config/manifests/metallb-native-prometheus.yaml b/config/manifests/metallb-native-prometheus.yaml
@@ -1320,6 +1320,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -1876,6 +1877,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef:

diff --git a/config/manifests/metallb-native.yaml b/config/manifests/metallb-native.yaml
@@ -1320,6 +1320,7 @@ rules:
   - pods
   verbs:
   - list
+  - get
 - apiGroups:
   - ""
   resources:
@@ -1730,6 +1731,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: METALLB_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: METALLB_HOST
           valueFrom:
             fieldRef: