npc: Replace isNil by reflect.IsNil
This commit is contained in:
1 parent
49224ec9f7
commit
cf3a3be8f2
3 files changed
+3
-12
No files matched your search
@@ -48,10 +48,6 @@ func (spec *ipBlockSpec) getRuleSpec(src bool) ([]string, string) {
|
||||
return rule, comment
|
||||
}
|
||||
|
||||
func (spec *ipBlockSpec) isNil() bool {
|
||||
return spec == nil
|
||||
}
|
||||
|
||||
type ipBlockSet struct {
|
||||
ips ipset.Interface
|
||||
users map[string]map[types.UID]struct{}
|
||||
|
||||
+3
-4
@@ -2,6 +2,7 @@ package npc
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
@@ -16,8 +17,6 @@ type ruleHost interface {
|
||||
//
|
||||
// If src=true then the rulespec is for source, otherwise - for destination.
|
||||
getRuleSpec(src bool) ([]string, string)
|
||||
// TODO(brb) Get rid
|
||||
isNil() bool
|
||||
}
|
||||
|
||||
type ruleSpec struct {
|
||||
@@ -32,13 +31,13 @@ func newRuleSpec(policyType policyType, proto *string, srcHost, dstHost ruleHost
|
||||
args = append(args, "-p", *proto)
|
||||
}
|
||||
srcComment := "anywhere"
|
||||
if srcHost != nil && !srcHost.isNil() {
|
||||
if srcHost != nil && !reflect.ValueOf(srcHost).IsNil() {
|
||||
rule, comment := srcHost.getRuleSpec(true)
|
||||
args = append(args, rule...)
|
||||
srcComment = comment
|
||||
}
|
||||
dstComment := "anywhere"
|
||||
if dstHost != nil && !dstHost.isNil() {
|
||||
if dstHost != nil && !reflect.ValueOf(dstHost).IsNil() {
|
||||
rule, comment := dstHost.getRuleSpec(false)
|
||||
args = append(args, rule...)
|
||||
dstComment = comment
|
||||
|
||||
@@ -56,10 +56,6 @@ func (spec *selectorSpec) getRuleSpec(src bool) ([]string, string) {
|
||||
return rule, comment
|
||||
}
|
||||
|
||||
func (spec *selectorSpec) isNil() bool {
|
||||
return spec == nil
|
||||
}
|
||||
|
||||
type selector struct {
|
||||
ips ipset.Interface
|
||||
spec *selectorSpec
|
||||
|
||||
Reference in new issue
Block a user