Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b12c3b86
Commit
b12c3b86
authored
Jan 06, 2018
by
zhangxiaoyu-zidif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use sets.String to replace slice when sort []string
parent
dc44a317
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
24 deletions
+7
-24
BUILD
pkg/controller/service/BUILD
+1
-0
service_controller.go
pkg/controller/service/service_controller.go
+6
-24
No files found.
pkg/controller/service/BUILD
View file @
b12c3b86
...
...
@@ -23,6 +23,7 @@ go_library(
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
...
...
pkg/controller/service/service_controller.go
View file @
b12c3b86
...
...
@@ -18,7 +18,6 @@ package service
import
(
"fmt"
"sort"
"sync"
"time"
...
...
@@ -28,6 +27,7 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
utilfeature
"k8s.io/apiserver/pkg/util/feature"
coreinformers
"k8s.io/client-go/informers/core/v1"
...
...
@@ -567,10 +567,10 @@ func portEqualForLB(x, y *v1.ServicePort) bool {
return
true
}
func
nodeNames
(
nodes
[]
*
v1
.
Node
)
[]
s
tring
{
ret
:=
make
([]
string
,
len
(
nodes
)
)
for
i
,
node
:=
range
nodes
{
ret
[
i
]
=
node
.
Name
func
nodeNames
(
nodes
[]
*
v1
.
Node
)
sets
.
S
tring
{
ret
:=
sets
.
NewString
(
)
for
_
,
node
:=
range
nodes
{
ret
.
Insert
(
node
.
Name
)
}
return
ret
}
...
...
@@ -579,25 +579,7 @@ func nodeSlicesEqualForLB(x, y []*v1.Node) bool {
if
len
(
x
)
!=
len
(
y
)
{
return
false
}
return
stringSlicesEqual
(
nodeNames
(
x
),
nodeNames
(
y
))
}
func
stringSlicesEqual
(
x
,
y
[]
string
)
bool
{
if
len
(
x
)
!=
len
(
y
)
{
return
false
}
if
!
sort
.
StringsAreSorted
(
x
)
{
sort
.
Strings
(
x
)
}
if
!
sort
.
StringsAreSorted
(
y
)
{
sort
.
Strings
(
y
)
}
for
i
:=
range
x
{
if
x
[
i
]
!=
y
[
i
]
{
return
false
}
}
return
true
return
nodeNames
(
x
)
.
Equal
(
nodeNames
(
x
))
}
func
getNodeConditionPredicate
()
corelisters
.
NodeConditionPredicate
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment