github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

fix golint

Browse Source
This commit is contained in:
JieJhih Jhang 2019-04-26 15:37:38 +08:00
parent 1c5eed4233
commit 098a7c5972
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/util/iptables/iptables.go
View File

@ -401,25 +401,23 @@ func (runner *runner) restoreInternal(args []string, data []byte, flush FlushFla
func iptablesSaveCommand(protocol Protocol) string { func iptablesSaveCommand(protocol Protocol) string {
if protocol == ProtocolIpv6 { if protocol == ProtocolIpv6 {
return cmdIP6TablesSave return cmdIP6TablesSave
} else {
return cmdIPTablesSave
} }
return cmdIPTablesSave
} }
func iptablesRestoreCommand(protocol Protocol) string { func iptablesRestoreCommand(protocol Protocol) string {
if protocol == ProtocolIpv6 { if protocol == ProtocolIpv6 {
return cmdIP6TablesRestore return cmdIP6TablesRestore
} else {
return cmdIPTablesRestore
} }
return cmdIPTablesRestore
} }
func iptablesCommand(protocol Protocol) string { func iptablesCommand(protocol Protocol) string {
if protocol == ProtocolIpv6 { if protocol == ProtocolIpv6 {
return cmdIP6Tables return cmdIP6Tables
} else {
return cmdIPTables
} }
return cmdIPTables
} }
func (runner *runner) run(op operation, args []string) ([]byte, error) { func (runner *runner) run(op operation, args []string) ([]byte, error) {
@ -579,9 +577,9 @@ func getIPTablesWaitFlag(vstring string) []string {
} }
if version.LessThan(minVersion) { if version.LessThan(minVersion) {
return []string{WaitString} return []string{WaitString}
} else {
return []string{WaitString, WaitSecondsValue}
} }
return []string{WaitString, WaitSecondsValue}
} }
// getIPTablesVersionString runs "iptables --version" to get the version string // getIPTablesVersionString runs "iptables --version" to get the version string
@ -656,9 +654,9 @@ func (runner *runner) dbusSignalHandler(bus utildbus.Connection) {
switch s.Name { switch s.Name {
case "org.freedesktop.DBus.NameOwnerChanged": case "org.freedesktop.DBus.NameOwnerChanged":
name := s.Body[0].(string) name := s.Body[0].(string)
new_owner := s.Body[2].(string) newOwner := s.Body[2].(string)
if name != firewalldName || len(new_owner) == 0 { if name != firewalldName || len(newOwner) == 0 {
continue continue
} }