diff --git a/charts/templates/controller-deploy.yaml b/charts/templates/controller-deploy.yaml index 975d7fc6ae9..cea79b7d3f9 100644 --- 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 index fef1ba76f4c..4281ace00f2 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -40,7 +40,6 @@ networking: VLAN_ID: "100" EXCHANGE_LINK_NAME: false ENABLE_EIP_SNAT: true - 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 index 69f653f7e09..7f90f93ef6d 100755 --- 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="" @@ -3988,7 +3987,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 index 8648db63f6e..a8108cea4a9 100644 --- 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", "iptables", "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 index b9d8052f705..8bd4d3e15da 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -1113,10 +1113,8 @@ func (c *Controller) initResourceOnce() { util.LogFatalAndExit(err, "failed to initialize 'deny_all' security group") } - if c.config.PodDefaultFipType == util.IptablesFip { - if err := c.syncVpcNatGatewayCR(); 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 err := c.initVpcNatGw(); err != nil { diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml index 8c4943bd74b..090b5972965 100644 --- 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 index 5840f96ab40..debdfd9ea79 100644 --- 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 index 29c03915135..6b4c3c26f49 100644 --- 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