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
f1622129
Commit
f1622129
authored
Nov 01, 2021
by
Deshi Xiao
Committed by
Brad Davidson
Nov 01, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor: Use plain channel send or receive
fix issue #4369 should use a simple channel send/receive instead of select with a single case Signed-off-by:
Deshi Xiao
<
xiaods@gmail.com
>
parent
f9f1cabe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
30 deletions
+28
-30
tunnel.go
pkg/agent/tunnel/tunnel.go
+28
-30
No files found.
pkg/agent/tunnel/tunnel.go
View file @
f1622129
...
...
@@ -92,42 +92,40 @@ func Setup(ctx context.Context, config *config.Node, proxy proxy.Proxy) error {
}
watching
:
for
{
select
{
case
ev
,
ok
:=
<-
watch
.
ResultChan
()
:
if
!
ok
||
ev
.
Type
==
watchtypes
.
Error
{
if
ok
{
logrus
.
Errorf
(
"Tunnel endpoint watch channel closed: %v"
,
ev
)
}
watch
.
Stop
()
continue
connect
}
endpoint
,
ok
:=
ev
.
Object
.
(
*
v1
.
Endpoints
)
if
!
ok
{
logrus
.
Errorf
(
"Tunnel could not convert event object to endpoint: %v"
,
ev
)
continue
watching
ev
,
ok
:=
<-
watch
.
ResultChan
()
if
!
ok
||
ev
.
Type
==
watchtypes
.
Error
{
if
ok
{
logrus
.
Errorf
(
"Tunnel endpoint watch channel closed: %v"
,
ev
)
}
watch
.
Stop
()
continue
connect
}
endpoint
,
ok
:=
ev
.
Object
.
(
*
v1
.
Endpoints
)
if
!
ok
{
logrus
.
Errorf
(
"Tunnel could not convert event object to endpoint: %v"
,
ev
)
continue
watching
}
newAddresses
:=
util
.
GetAddresses
(
endpoint
)
if
reflect
.
DeepEqual
(
newAddresses
,
proxy
.
SupervisorAddresses
())
{
continue
watching
}
proxy
.
Update
(
newAddresses
)
newAddresses
:=
util
.
GetAddresses
(
endpoint
)
if
reflect
.
DeepEqual
(
newAddresses
,
proxy
.
SupervisorAddresses
())
{
continue
watching
}
proxy
.
Update
(
newAddresses
)
validEndpoint
:=
map
[
string
]
bool
{}
validEndpoint
:=
map
[
string
]
bool
{}
for
_
,
address
:=
range
proxy
.
SupervisorAddresses
()
{
validEndpoint
[
address
]
=
true
if
_
,
ok
:=
disconnect
[
address
];
!
ok
{
disconnect
[
address
]
=
connect
(
ctx
,
nil
,
address
,
tlsConfig
)
}
for
_
,
address
:=
range
proxy
.
SupervisorAddresses
()
{
validEndpoint
[
address
]
=
true
if
_
,
ok
:=
disconnect
[
address
];
!
ok
{
disconnect
[
address
]
=
connect
(
ctx
,
nil
,
address
,
tlsConfig
)
}
}
for
address
,
cancel
:=
range
disconnect
{
if
!
validEndpoint
[
address
]
{
cancel
()
delete
(
disconnect
,
address
)
logrus
.
Infof
(
"Stopped tunnel to %s"
,
address
)
}
for
address
,
cancel
:=
range
disconnect
{
if
!
validEndpoint
[
address
]
{
cancel
()
delete
(
disconnect
,
address
)
logrus
.
Infof
(
"Stopped tunnel to %s"
,
address
)
}
}
}
...
...
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