remove unused (#3696)

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Feb 5, 2024 · 50b6506 · 50b6506
1 parent a0e3b67
commit 50b6506
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 15 deletions.
diff --git a/charts/templates/controller-deploy.yaml b/charts/templates/controller-deploy.yaml
@@ -114,7 +114,6 @@ spec:
           - --log_file_max_size=0
           - --enable-lb-svc={{- .Values.func.ENABLE_LB_SVC }}
           - --keep-vm-ip={{- .Values.func.ENABLE_KEEP_VM_IP }}
-          - --pod-default-fip-type={{- .Values.networking.POD_DEFAULT_FIP_TYPE }}
           - --enable-metrics={{- .Values.networking.ENABLE_METRICS }}
           - --node-local-dns-ip={{- .Values.networking.NODE_LOCAL_DNS_IP }}
           env:

diff --git a/charts/values.yaml b/charts/values.yaml
@@ -40,7 +40,6 @@ networking:
     VLAN_ID: "100"
   ENABLE_EIP_SNAT: true
   EXCHANGE_LINK_NAME: false
-  POD_DEFAULT_FIP_TYPE: ""
   DEFAULT_SUBNET: "ovn-default"
   DEFAULT_VPC: "ovn-cluster"
   NODE_SUBNET: "join"

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -82,7 +82,6 @@ DEPRECATED_LABEL="node-role.kubernetes.io/master" # The node label to deploy OVN
 NETWORK_TYPE="geneve"                             # geneve or vlan
 TUNNEL_TYPE="geneve"                              # geneve, vxlan or stt. ATTENTION: some networkpolicy cannot take effect when using vxlan and stt need custom compile ovs kernel module
 POD_NIC_TYPE="veth-pair"                          # veth-pair or internal-port
-POD_DEFAULT_FIP_TYPE=""                           # iptables, pod can set iptables fip automatically by enable fip annotation
 
 # VLAN Config only take effect when NETWORK_TYPE is vlan
 VLAN_INTERFACE_NAME=""
@@ -3974,7 +3973,6 @@ spec:
           - --log_file_max_size=0
           - --enable-lb-svc=$ENABLE_LB_SVC
           - --keep-vm-ip=$ENABLE_KEEP_VM_IP
-          - --pod-default-fip-type=$POD_DEFAULT_FIP_TYPE
           - --node-local-dns-ip=$NODE_LOCAL_DNS_IP
           env:
             - name: ENABLE_SSL

diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -64,8 +64,6 @@ type Configuration struct {
 	PodNamespace string
 	PodNicType   string
 
-	PodDefaultFipType string
-
 	WorkerNum       int
 	PprofPort       int
 	EnablePprof     bool
@@ -152,7 +150,6 @@ func ParseFlags() (*Configuration, error) {
 		argLsDnatModDlDst          = pflag.Bool("ls-dnat-mod-dl-dst", true, "Set ethernet destination address for DNAT on logical switch")
 		argLsCtSkipDstLportIPs     = pflag.Bool("ls-ct-skip-dst-lport-ips", true, "Skip conntrack for direct traffic between lports")
 		argPodNicType              = pflag.String("pod-nic-type", "veth-pair", "The default pod network nic implementation type")
-		argPodDefaultFipType       = pflag.String("pod-default-fip-type", "", "The type of fip bind to pod automatically: iptables")
 		argEnableLb                = pflag.Bool("enable-lb", true, "Enable load balancer")
 		argEnableNP                = pflag.Bool("enable-np", true, "Enable network policy support")
 		argEnableEipSnat           = pflag.Bool("enable-eip-snat", true, "Enable EIP and SNAT")
@@ -233,7 +230,6 @@ func ParseFlags() (*Configuration, error) {
 		PodName:                        os.Getenv("POD_NAME"),
 		PodNamespace:                   os.Getenv("KUBE_NAMESPACE"),
 		PodNicType:                     *argPodNicType,
-		PodDefaultFipType:              *argPodDefaultFipType,
 		EnableLb:                       *argEnableLb,
 		EnableNP:                       *argEnableNP,
 		EnableEipSnat:                  *argEnableEipSnat,

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -1093,10 +1093,8 @@ func (c *Controller) initResourceOnce() {
 		util.LogFatalAndExit(err, "failed to initialize 'deny_all' security group")
 	}
 
-	if c.config.PodDefaultFipType == util.IptablesFip {
-		if err := c.initSyncCrdVpcNatGw(); err != nil {
-			util.LogFatalAndExit(err, "failed to sync crd vpc nat gateways")
-		}
+	if err := c.syncVpcNatGatewayCR(); err != nil {
+		util.LogFatalAndExit(err, "failed to sync crd vpc nat gateways")
 	}
 
 	if c.config.EnableLb {

diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml
@@ -80,7 +80,6 @@ spec:
             - --log_file_max_size=0
             - --enable-lb-svc=false
             - --keep-vm-ip=true
-            - --pod-default-fip-type=
             - --node-local-dns-ip=
           env:
             - name: ENABLE_SSL

diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
@@ -80,7 +80,6 @@ spec:
             - --log_file_max_size=0
             - --enable-lb-svc=false
             - --keep-vm-ip=true
-            - --pod-default-fip-type=
             - --node-local-dns-ip=
           env:
             - name: ENABLE_SSL

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -80,7 +80,6 @@ spec:
             - --log_file_max_size=0
             - --enable-lb-svc=false
             - --keep-vm-ip=true
-            - --pod-default-fip-type=
             - --node-local-dns-ip=
           env:
             - name: ENABLE_SSL