Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove unused option #3696

Merged
merged 1 commit into from
Feb 5, 2024
Merged

remove unused option #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion charts/templates/controller-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion charts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions dist/images/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions pkg/controller/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ type Configuration struct {
PodNamespace string
PodNicType string

PodDefaultFipType string

WorkerNum int
PprofPort int
EnablePprof bool
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion yamls/kube-ovn-dual-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion yamls/kube-ovn-ipv6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion yamls/kube-ovn.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading