Address comments

Signed-off-by: Yun-Tang Hsu <[email protected]>
antrea-io · May 25, 2023 · 69a97bf · 69a97bf
1 parent 443a420
commit 69a97bf
Show file tree

Hide file tree

Showing 10 changed files with 280 additions and 252 deletions.
diff --git a/build/charts/antrea/conf/antrea-agent.conf b/build/charts/antrea/conf/antrea-agent.conf
@@ -195,42 +195,43 @@ enablePrometheusMetrics: {{ .Values.agent.enablePrometheusMetrics }}
 
 
 flowExporter:
-    {{- with .Values.flowExporter }}
-    # Enable FlowExporter, a feature used to export polled conntrack connections as IPFIX flow records from each agent
-    # to a configured collector. To enable this feature, you need to set "enable" to true, and ensure that the
-    # FlowExporter feature gate is also enabled.
-    enable: {{ .enable }}
-    # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
-    # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
-    # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
-    # wrapped with []. When the collector is running in-cluster as a Service, set
-    # <HOST> to <Service namespace>/<Service name>. For example,
-    # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
-    # Flow Aggregator Service.
-    # If PORT is empty, we default to 4739, the standard IPFIX port.
-    # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
-    # "udp" protocols. "tls" is used for securing communication between flow exporter and
-    # flow aggregator.
-    flowCollectorAddr: {{ .collectorAddr | quote }}
-
-    # Provide flow poll interval as a duration string. This determines how often the
-    # flow exporter dumps connections from the conntrack module. Flow poll interval
-    # should be greater than or equal to 1s (one second).
-    # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-    flowPollInterval: {{ .flowPollInterval | quote }}
-
-    # Provide the active flow export timeout, which is the timeout after which a flow
-    # record is sent to the collector for active flows. Thus, for flows with a continuous
-    # stream of packets, a flow record will be exported to the collector once the elapsed
-    # time since the last export event is equal to the value of this timeout.
-    # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-    activeFlowExportTimeout: {{ .activeFlowExportTimeout | quote }}
-
-    # Provide the idle flow export timeout, which is the timeout after which a flow
-    # record is sent to the collector for idle flows. A flow is considered idle if no
-    # packet matching this flow has been observed since the last export event.
-    # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-    idleFlowExportTimeout: {{ .idleFlowExportTimeout | quote }}
+  {{- with .Values.flowExporter }}
+  # Enable FlowExporter, a feature used to export polled conntrack connections as
+  # IPFIX flow records from each agent to a configured collector. To enable this
+  # feature, you need to set "enable" to true, and ensure that the FlowExporter
+  # feature gate is also enabled.
+  enable: {{ .enable }}
+  # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
+  # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
+  # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
+  # wrapped with []. When the collector is running in-cluster as a Service, set
+  # <HOST> to <Service namespace>/<Service name>. For example,
+  # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
+  # Flow Aggregator Service.
+  # If PORT is empty, we default to 4739, the standard IPFIX port.
+  # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
+  # "udp" protocols. "tls" is used for securing communication between flow exporter and
+  # flow aggregator.
+  flowCollectorAddr: {{ .flowCollectorAddr | quote }}
+
+  # Provide flow poll interval as a duration string. This determines how often the
+  # flow exporter dumps connections from the conntrack module. Flow poll interval
+  # should be greater than or equal to 1s (one second).
+  # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+  flowPollInterval: {{ .flowPollInterval | quote }}
+
+  # Provide the active flow export timeout, which is the timeout after which a flow
+  # record is sent to the collector for active flows. Thus, for flows with a continuous
+  # stream of packets, a flow record will be exported to the collector once the elapsed
+  # time since the last export event is equal to the value of this timeout.
+  # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+  activeFlowExportTimeout: {{ .activeFlowExportTimeout | quote }}
+
+  # Provide the idle flow export timeout, which is the timeout after which a flow
+  # record is sent to the collector for idle flows. A flow is considered idle if no
+  # packet matching this flow has been observed since the last export event.
+  # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+  idleFlowExportTimeout: {{ .idleFlowExportTimeout | quote }}
 {{- end }}
 
 nodePortLocal:

diff --git a/build/charts/antrea/values.yaml b/build/charts/antrea/values.yaml
@@ -304,7 +304,7 @@ flowExporter:
   # -- IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
   # If the collector is running in-cluster as a Service, set <HOST> to
   # <Service namespace>/<Service name>.
-  collectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
+  flowCollectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
   # -- Determines how often the flow exporter polls for new connections.
   flowPollInterval: "5s"
   # -- timeout after which a flow record is sent to the collector for active

diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -3161,41 +3161,42 @@ data:
 
 
     flowExporter:
-        # Enable FlowExporter, a feature used to export polled conntrack connections as IPFIX flow records from each agent
-        # to a configured collector. To enable this feature, you need to set "enable" to true, and ensure that the
-        # FlowExporter feature gate is also enabled.
-        enable: false
-        # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
-        # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
-        # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
-        # wrapped with []. When the collector is running in-cluster as a Service, set
-        # <HOST> to <Service namespace>/<Service name>. For example,
-        # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
-        # Flow Aggregator Service.
-        # If PORT is empty, we default to 4739, the standard IPFIX port.
-        # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
-        # "udp" protocols. "tls" is used for securing communication between flow exporter and
-        # flow aggregator.
-        flowCollectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
+      # Enable FlowExporter, a feature used to export polled conntrack connections as
+      # IPFIX flow records from each agent to a configured collector. To enable this
+      # feature, you need to set "enable" to true, and ensure that the FlowExporter
+      # feature gate is also enabled.
+      enable: false
+      # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
+      # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
+      # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
+      # wrapped with []. When the collector is running in-cluster as a Service, set
+      # <HOST> to <Service namespace>/<Service name>. For example,
+      # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
+      # Flow Aggregator Service.
+      # If PORT is empty, we default to 4739, the standard IPFIX port.
+      # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
+      # "udp" protocols. "tls" is used for securing communication between flow exporter and
+      # flow aggregator.
+      flowCollectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
 
-        # Provide flow poll interval as a duration string. This determines how often the
-        # flow exporter dumps connections from the conntrack module. Flow poll interval
-        # should be greater than or equal to 1s (one second).
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        flowPollInterval: "5s"
+      # Provide flow poll interval as a duration string. This determines how often the
+      # flow exporter dumps connections from the conntrack module. Flow poll interval
+      # should be greater than or equal to 1s (one second).
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      flowPollInterval: "5s"
 
-        # Provide the active flow export timeout, which is the timeout after which a flow
-        # record is sent to the collector for active flows. Thus, for flows with a continuous
-        # stream of packets, a flow record will be exported to the collector once the elapsed
-        # time since the last export event is equal to the value of this timeout.
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        activeFlowExportTimeout: "5s"
+      # Provide the active flow export timeout, which is the timeout after which a flow
+      # record is sent to the collector for active flows. Thus, for flows with a continuous
+      # stream of packets, a flow record will be exported to the collector once the elapsed
+      # time since the last export event is equal to the value of this timeout.
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      activeFlowExportTimeout: "5s"
 
-        # Provide the idle flow export timeout, which is the timeout after which a flow
-        # record is sent to the collector for idle flows. A flow is considered idle if no
-        # packet matching this flow has been observed since the last export event.
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        idleFlowExportTimeout: "15s"
+      # Provide the idle flow export timeout, which is the timeout after which a flow
+      # record is sent to the collector for idle flows. A flow is considered idle if no
+      # packet matching this flow has been observed since the last export event.
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      idleFlowExportTimeout: "15s"
 
     nodePortLocal:
     # Enable NodePortLocal, a feature used to make Pods reachable using port forwarding on the host. To
@@ -4370,7 +4371,7 @@ spec:
         kubectl.kubernetes.io/default-container: antrea-agent
         # Automatically restart Pods with a RollingUpdate if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
-        checksum/config: a448b6d172f99933df9532bca27017c1e04d3db4a35170987ef4b0a8ca5987ed
+        checksum/config: abf7cb1c21b730664510e8a762d967df5c620467f12bf3e0bae41df73489de65
       labels:
         app: antrea
         component: antrea-agent
@@ -4611,7 +4612,7 @@ spec:
       annotations:
         # Automatically restart Pod if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
-        checksum/config: a448b6d172f99933df9532bca27017c1e04d3db4a35170987ef4b0a8ca5987ed
+        checksum/config: abf7cb1c21b730664510e8a762d967df5c620467f12bf3e0bae41df73489de65
       labels:
         app: antrea
         component: antrea-controller

diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
@@ -3161,41 +3161,42 @@ data:
 
 
     flowExporter:
-        # Enable FlowExporter, a feature used to export polled conntrack connections as IPFIX flow records from each agent
-        # to a configured collector. To enable this feature, you need to set "enable" to true, and ensure that the
-        # FlowExporter feature gate is also enabled.
-        enable: false
-        # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
-        # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
-        # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
-        # wrapped with []. When the collector is running in-cluster as a Service, set
-        # <HOST> to <Service namespace>/<Service name>. For example,
-        # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
-        # Flow Aggregator Service.
-        # If PORT is empty, we default to 4739, the standard IPFIX port.
-        # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
-        # "udp" protocols. "tls" is used for securing communication between flow exporter and
-        # flow aggregator.
-        flowCollectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
+      # Enable FlowExporter, a feature used to export polled conntrack connections as
+      # IPFIX flow records from each agent to a configured collector. To enable this
+      # feature, you need to set "enable" to true, and ensure that the FlowExporter
+      # feature gate is also enabled.
+      enable: false
+      # Provide the IPFIX collector address as a string with format <HOST>:[<PORT>][:<PROTO>].
+      # HOST can either be the DNS name, IP, or Service name of the Flow Collector. If
+      # using an IP, it can be either IPv4 or IPv6. However, IPv6 address should be
+      # wrapped with []. When the collector is running in-cluster as a Service, set
+      # <HOST> to <Service namespace>/<Service name>. For example,
+      # "flow-aggregator/flow-aggregator" can be provided to connect to the Antrea
+      # Flow Aggregator Service.
+      # If PORT is empty, we default to 4739, the standard IPFIX port.
+      # If no PROTO is given, we consider "tls" as default. We support "tls", "tcp" and
+      # "udp" protocols. "tls" is used for securing communication between flow exporter and
+      # flow aggregator.
+      flowCollectorAddr: "flow-aggregator/flow-aggregator:4739:tls"
 
-        # Provide flow poll interval as a duration string. This determines how often the
-        # flow exporter dumps connections from the conntrack module. Flow poll interval
-        # should be greater than or equal to 1s (one second).
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        flowPollInterval: "5s"
+      # Provide flow poll interval as a duration string. This determines how often the
+      # flow exporter dumps connections from the conntrack module. Flow poll interval
+      # should be greater than or equal to 1s (one second).
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      flowPollInterval: "5s"
 
-        # Provide the active flow export timeout, which is the timeout after which a flow
-        # record is sent to the collector for active flows. Thus, for flows with a continuous
-        # stream of packets, a flow record will be exported to the collector once the elapsed
-        # time since the last export event is equal to the value of this timeout.
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        activeFlowExportTimeout: "5s"
+      # Provide the active flow export timeout, which is the timeout after which a flow
+      # record is sent to the collector for active flows. Thus, for flows with a continuous
+      # stream of packets, a flow record will be exported to the collector once the elapsed
+      # time since the last export event is equal to the value of this timeout.
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      activeFlowExportTimeout: "5s"
 
-        # Provide the idle flow export timeout, which is the timeout after which a flow
-        # record is sent to the collector for idle flows. A flow is considered idle if no
-        # packet matching this flow has been observed since the last export event.
-        # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        idleFlowExportTimeout: "15s"
+      # Provide the idle flow export timeout, which is the timeout after which a flow
+      # record is sent to the collector for idle flows. A flow is considered idle if no
+      # packet matching this flow has been observed since the last export event.
+      # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
+      idleFlowExportTimeout: "15s"
 
     nodePortLocal:
     # Enable NodePortLocal, a feature used to make Pods reachable using port forwarding on the host. To
@@ -4370,7 +4371,7 @@ spec:
         kubectl.kubernetes.io/default-container: antrea-agent
         # Automatically restart Pods with a RollingUpdate if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
-        checksum/config: a448b6d172f99933df9532bca27017c1e04d3db4a35170987ef4b0a8ca5987ed
+        checksum/config: abf7cb1c21b730664510e8a762d967df5c620467f12bf3e0bae41df73489de65
       labels:
         app: antrea
         component: antrea-agent
@@ -4612,7 +4613,7 @@ spec:
       annotations:
         # Automatically restart Pod if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
-        checksum/config: a448b6d172f99933df9532bca27017c1e04d3db4a35170987ef4b0a8ca5987ed
+        checksum/config: abf7cb1c21b730664510e8a762d967df5c620467f12bf3e0bae41df73489de65
       labels:
         app: antrea
         component: antrea-controller