Revert "multicast: make igmp query interval configurable (antrea-io#3819

)"

This reverts commit 6d3036b.

Signed-off-by: Shuyang Xin <gavinx@vmware.com>

build/charts/antrea/README.md

@@ -80,8 +80,7 @@ Kubernetes: `>= 1.16.0-0`
 | ipsec.psk | string | `"changeme"` | Preshared Key (PSK) for IKE authentication. It will be stored in a secret and passed to antrea-agent as an environment variable. |
 | kubeAPIServerOverride | string | `""` | Address of Kubernetes apiserver, to override any value provided in kubeconfig or InClusterConfig. |
 | logVerbosity | int | `0` |  |
-| multicast.igmpQueryInterval | string | `"125s"` | The interval at which the antrea-agent sends IGMP queries to Pods. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". |
-| multicast.multicastInterfaces | list | `[]` | Names of the interfaces on Nodes that are used to forward multicast traffic. |
+| multicastInterfaces | list | `[]` | Names of the interfaces on Nodes that are used to forward multicast traffic. |
 | noSNAT | bool | `false` | Whether or not to SNAT (using the Node IP) the egress traffic from a Pod to the external network. |
 | nodeIPAM.clusterCIDRs | list | `[]` | CIDR ranges to use when allocating Pod IP addresses. |
 | nodeIPAM.enable | bool | `false` | Enable Node IPAM in Antrea |

build/charts/antrea/conf/antrea-agent.conf

@@ -225,19 +225,12 @@ tlsMinVersion: {{ .Values.tlsMinVersion | quote }}
 # 3. The Node IP
 transportInterface: {{ .Values.transportInterface | quote }}
 
-multicast:
-{{- with .Values.multicast }}
 # The names of the interfaces on Nodes that are used to forward multicast traffic.
 # Defaults to transport interface if not set.
-  multicastInterfaces:
-  {{- with .multicastInterfaces }}
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-
-# The interval at which the antrea-agent sends IGMP queries to Pods.
-# Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-  igmpQueryInterval: {{ .igmpQueryInterval | quote }}
-{{- end}}
+multicastInterfaces:
+{{- with .Values.multicastInterfaces }}
+{{- toYaml . | nindent 2 }}
+{{- end }}
 
 # The network CIDRs of the interface on Node which is used for tunneling or routing the traffic across
 # Nodes. If there are multiple interfaces configured the same network CIDR, the first one is used. The

build/charts/antrea/values.yaml

@@ -33,14 +33,8 @@ transportInterface: ""
 # -- Network CIDRs of the interface on Node which is used for tunneling or
 # routing the traffic across Nodes.
 transportInterfaceCIDRs: []
-
-multicast:
-  # -- Names of the interfaces on Nodes that are used to forward multicast traffic.
-  multicastInterfaces: []
-  # -- The interval at which the antrea-agent sends IGMP queries to Pods.
-  # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-  igmpQueryInterval: "125s"
-
+# -- Names of the interfaces on Nodes that are used to forward multicast traffic.
+multicastInterfaces: []
 # -- Default MTU to use for the host gateway interface and the network interface
 # of each Pod. By default, antrea-agent will discover the MTU of the Node's
 # primary interface and adjust it to accommodate for tunnel encapsulation