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
21e4f003
Commit
21e4f003
authored
May 03, 2019
by
JieJhih Jhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix golint
parent
6a23a627
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
12 deletions
+9
-12
server.go
cmd/kube-proxy/app/server.go
+1
-4
endpoints.go
pkg/proxy/endpoints.go
+3
-3
service.go
pkg/proxy/service.go
+3
-3
network.go
pkg/proxy/util/network.go
+2
-2
No files found.
cmd/kube-proxy/app/server.go
View file @
21e4f003
...
...
@@ -236,10 +236,7 @@ func (o *Options) Complete() error {
return
err
}
if
err
:=
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
o
.
config
.
FeatureGates
);
err
!=
nil
{
return
err
}
return
nil
return
utilfeature
.
DefaultMutableFeatureGate
.
SetFromMap
(
o
.
config
.
FeatureGates
)
}
// Creates a new filesystem watcher and adds watches for the config file.
...
...
pkg/proxy/endpoints.go
View file @
21e4f003
...
...
@@ -282,7 +282,7 @@ func (ect *EndpointChangeTracker) endpointsToEndpointsMap(endpoints *v1.Endpoint
// The changes map is cleared after applying them.
// In addition it returns (via argument) and resets the lastChangeTriggerTimes for all endpoints
// that were changed and will result in syncing the proxy rules.
func
(
e
ndpointsMap
EndpointsMap
)
apply
(
changes
*
EndpointChangeTracker
,
staleEndpoints
*
[]
ServiceEndpoint
,
func
(
e
m
EndpointsMap
)
apply
(
changes
*
EndpointChangeTracker
,
staleEndpoints
*
[]
ServiceEndpoint
,
staleServiceNames
*
[]
ServicePortName
,
lastChangeTriggerTimes
*
[]
time
.
Time
)
{
if
changes
==
nil
{
return
...
...
@@ -290,8 +290,8 @@ func (endpointsMap EndpointsMap) apply(changes *EndpointChangeTracker, staleEndp
changes
.
lock
.
Lock
()
defer
changes
.
lock
.
Unlock
()
for
_
,
change
:=
range
changes
.
items
{
e
ndpointsMap
.
Unmerge
(
change
.
previous
)
e
ndpointsMap
.
Merge
(
change
.
current
)
e
m
.
Unmerge
(
change
.
previous
)
e
m
.
Merge
(
change
.
current
)
detectStaleConnections
(
change
.
previous
,
change
.
current
,
staleEndpoints
,
staleServiceNames
)
}
changes
.
items
=
make
(
map
[
types
.
NamespacedName
]
*
endpointsChange
)
...
...
pkg/proxy/service.go
View file @
21e4f003
...
...
@@ -284,15 +284,15 @@ func (sct *ServiceChangeTracker) serviceToServiceMap(service *v1.Service) Servic
// apply the changes to ServiceMap and update the stale udp cluster IP set. The UDPStaleClusterIP argument is passed in to store the
// udp protocol service cluster ip when service is deleted from the ServiceMap.
func
(
s
erviceMap
*
ServiceMap
)
apply
(
changes
*
ServiceChangeTracker
,
UDPStaleClusterIP
sets
.
String
)
{
func
(
s
m
*
ServiceMap
)
apply
(
changes
*
ServiceChangeTracker
,
UDPStaleClusterIP
sets
.
String
)
{
changes
.
lock
.
Lock
()
defer
changes
.
lock
.
Unlock
()
for
_
,
change
:=
range
changes
.
items
{
s
erviceMap
.
merge
(
change
.
current
)
s
m
.
merge
(
change
.
current
)
// filter out the Update event of current changes from previous changes before calling unmerge() so that can
// skip deleting the Update events.
change
.
previous
.
filter
(
change
.
current
)
s
erviceMap
.
unmerge
(
change
.
previous
,
UDPStaleClusterIP
)
s
m
.
unmerge
(
change
.
previous
,
UDPStaleClusterIP
)
}
// clear changes after applying them to ServiceMap.
changes
.
items
=
make
(
map
[
types
.
NamespacedName
]
*
serviceChange
)
...
...
pkg/proxy/util/network.go
View file @
21e4f003
...
...
@@ -33,12 +33,12 @@ type NetworkInterfacer interface {
type
RealNetwork
struct
{}
// Addrs wraps net.Interface.Addrs(), it's a part of NetworkInterfacer interface.
func
(
_
RealNetwork
)
Addrs
(
intf
*
net
.
Interface
)
([]
net
.
Addr
,
error
)
{
func
(
RealNetwork
)
Addrs
(
intf
*
net
.
Interface
)
([]
net
.
Addr
,
error
)
{
return
intf
.
Addrs
()
}
// Interfaces wraps net.Interfaces(), it's a part of NetworkInterfacer interface.
func
(
_
RealNetwork
)
Interfaces
()
([]
net
.
Interface
,
error
)
{
func
(
RealNetwork
)
Interfaces
()
([]
net
.
Interface
,
error
)
{
return
net
.
Interfaces
()
}
...
...
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