From 49638efb36881814d51f2acd60d0675eb1387529 Mon Sep 17 00:00:00 2001 From: Jianjun Shen Date: Sat, 5 Aug 2023 16:37:54 -0700 Subject: [PATCH] Revert "Antrea Agent configuration parameters for OVS secondary network" (#5341) This reverts commit 4420cef6f4e478fceef8f6f3573d56a24e4ae609. The OVS secondary network parameters were added for overlay secondary network support, but the feature was not continued. Signed-off-by: Jianjun Shen --- build/charts/antrea/README.md | 6 ----- build/charts/antrea/conf/antrea-agent.conf | 26 ---------------------- build/charts/antrea/values.yaml | 20 ----------------- pkg/config/agent/config.go | 22 ------------------ 4 files changed, 74 deletions(-) diff --git a/build/charts/antrea/README.md b/build/charts/antrea/README.md index 07ffa8efcd4..c395784f5b7 100644 --- a/build/charts/antrea/README.md +++ b/build/charts/antrea/README.md @@ -111,12 +111,6 @@ Kubernetes: `>= 1.16.0-0` | nodePortLocal.portRange | string | `"61000-62000"` | Port range used by NodePortLocal when creating Pod port mappings. | | ovs.bridgeName | string | `"br-int"` | Name of the OVS bridge antrea-agent will create and use. | | ovs.hwOffload | bool | `false` | Enable hardware offload for the OVS bridge (required additional configuration). | -| secondaryNetwork.ovs.datapathType | string | `"system"` | 'system' is the default value and corresponds to the kernel datapath. Use 'netdev' to run OVS in userspace mode. Userspace mode requires the tun device driver to be available. | -| secondaryNetwork.ovs.enable | bool | `false` | Enable OVS bridge configuration for secondary network. | -| secondaryNetwork.ovs.integrationBridgeName | string | `"br-secnet-int"` | Secondary network OVS integration bridge name. | -| secondaryNetwork.ovs.patchPort | string | `"br-secnet-patch0"` | Name of the OVS patch port which connects the integration and transport bridge. | -| secondaryNetwork.ovs.transportBridgeName | string | `"br-secnet-trans"` | Secondary network OVS transport bridge name. | -| secondaryNetwork.tunnelType | string | `"geneve"` | Tunnel protocol used for encapsulating traffic across Nodes. It must be one of "geneve", "vxlan", "gre", "stt". | | serviceCIDR | string | `""` | IPv4 CIDR range used for Services. Required when AntreaProxy is disabled. | | serviceCIDRv6 | string | `""` | IPv6 CIDR range used for Services. Required when AntreaProxy is disabled. | | testing.coverage | bool | `false` | Enable code coverage measurement (used when testing Antrea only). | diff --git a/build/charts/antrea/conf/antrea-agent.conf b/build/charts/antrea/conf/antrea-agent.conf index e8b2ed9b2a5..2aaab4b43f7 100644 --- a/build/charts/antrea/conf/antrea-agent.conf +++ b/build/charts/antrea/conf/antrea-agent.conf @@ -413,29 +413,3 @@ auditLogging: # Compress enables gzip compression on rotated files. compress: {{ .compress }} {{- end }} - -{{- if .Values.featureGates.SecondaryNetwork }} - -secondaryNetwork: -{{- with .Values.secondaryNetwork }} - # OVS bridge configuration for secondary network. - ovs: - # Enable OVS bridge configuration for secondary network. - enable: {{ .ovs.enable }} - # Secondary network OVS integration bridge name. Ensure it doesn't conflict with your existing OpenVSwitch bridges. - integrationBridgeName: {{ .ovs.integrationBridgeName | quote }} - # Secondary network OVS transport bridge name. Ensure it doesn't conflict with your existing OpenVSwitch bridges. - transportBridgeName: {{ .ovs.transportBridgeName | quote }} - # Datapath type to use for the OpenVSwitch bridge created by Antrea. Supported values are: - # - system - # - netdev - # 'system' is the default value and corresponds to the kernel datapath. Use 'netdev' to run - # OVS in userspace mode. Userspace mode requires the tun device driver to be available. - datapathType: {{ .ovs.datapathType | quote }} - # Name of the OVS patch port which connects the integration and transport bridge. - patchPort: {{ .ovs.patchPort | quote }} - # Tunnel protocol used for encapsulating traffic across Nodes. It must be one - # of "geneve", "vxlan", "gre", "stt". - tunnelType: {{ .tunnelType | quote }} -{{- end }} -{{- end }} diff --git a/build/charts/antrea/values.yaml b/build/charts/antrea/values.yaml index c28a90005e0..f5fcf8e8103 100644 --- a/build/charts/antrea/values.yaml +++ b/build/charts/antrea/values.yaml @@ -73,26 +73,6 @@ ovs: # configuration). hwOffload: false -secondaryNetwork: - ovs: - # -- Enable OVS bridge configuration for secondary network. - enable: false - # -- Secondary network OVS integration bridge name. - integrationBridgeName: "br-secnet-int" - # -- Secondary network OVS transport bridge name. - transportBridgeName: "br-secnet-trans" - # -- Datapath type to use for the OpenVSwitch bridge created by Antrea. Supported values are: - # - system - # - netdev - # -- 'system' is the default value and corresponds to the kernel datapath. Use 'netdev' to run - # OVS in userspace mode. Userspace mode requires the tun device driver to be available. - datapathType: "system" - # -- Name of the OVS patch port which connects the integration and transport bridge. - patchPort: "br-secnet-patch0" - # -- Tunnel protocol used for encapsulating traffic across Nodes. It must be one - # of "geneve", "vxlan", "gre", "stt". - tunnelType: "geneve" - wireGuard: # -- Port for WireGuard to send and receive traffic. port: 51820 diff --git a/pkg/config/agent/config.go b/pkg/config/agent/config.go index a9754a64142..952674c01fe 100644 --- a/pkg/config/agent/config.go +++ b/pkg/config/agent/config.go @@ -194,8 +194,6 @@ type AgentConfig struct { NodeType string `yaml:"nodeType,omitempty"` // ExternalNode related configurations. ExternalNode ExternalNodeConfig `yaml:"externalNode,omitempty"` - // Antrea's native secondary network configuration. - SecondaryNetwork SecondaryNetworkConfig `yaml:"secondaryNetwork,omitempty"` // AuditLogging supports configuring log rotation for audit logs. AuditLogging AuditLoggingConfig `yaml:"auditLogging,omitempty"` } @@ -370,26 +368,6 @@ type PolicyBypassRule struct { Port int `yaml:"port,omitempty"` } -type SecondaryNetworkConfig struct { - // Secondary network specific OVS configuration. - OVS SecondaryNetworkOVSConfig `yaml:"ovs,omitempty"` - // TunnelType to be used for node to node transport, which is part of the same virtual network. - TunnelType string `yaml:"tunnelType,omitempty"` -} - -type SecondaryNetworkOVSConfig struct { - // Enable Antrea's native secondary network OVS configuration. - Enable bool `yaml:"enable,omitempty"` - // OVS integration bridge name. - OVSIntegrationBridgeName string `yaml:"ovsIntegrationBridgeName,omitempty"` - // OVS transport bridge name. - OVSTransportBridgeName string `yaml:"ovsTransportBridgeName,omitempty"` - // OVS Datapath type to use for the OpenVSwitch bridge created by Antrea. - OVSDatapathType string `yaml:"ovsDatapathType,omitempty"` - // OVS patch port which connects the integration and transport bridge. - OVSPatchPort string `yaml:"ovsPatchPort,omitempty"` -} - type AuditLoggingConfig struct { // MaxSize is the maximum size in MB of a log file before it gets rotated. Defaults to 500MB. MaxSize int32 `yaml:"maxSize,omitempty"`