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
5ef59ae0
Unverified
Commit
5ef59ae0
authored
May 23, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
May 23, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #78250 from qingsenLi/k8s-190523
klog format error
parents
2daad0b5
5b737a00
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
openstack_routes.go
pkg/cloudprovider/providers/openstack/openstack_routes.go
+5
-5
No files found.
pkg/cloudprovider/providers/openstack/openstack_routes.go
View file @
5ef59ae0
...
...
@@ -111,12 +111,12 @@ func updateRoutes(network *gophercloud.ServiceClient, router *routers.Router, ne
}
unwinder
:=
func
()
{
klog
.
V
(
4
)
.
Info
(
"Reverting routes change to router
"
,
router
.
ID
)
klog
.
V
(
4
)
.
Info
f
(
"Reverting routes change to router %v
"
,
router
.
ID
)
_
,
err
:=
routers
.
Update
(
network
,
router
.
ID
,
routers
.
UpdateOpts
{
Routes
:
origRoutes
,
})
.
Extract
()
if
err
!=
nil
{
klog
.
Warning
(
"Unable to reset routes during error unwind:
"
,
err
)
klog
.
Warning
f
(
"Unable to reset routes during error unwind: %v
"
,
err
)
}
}
...
...
@@ -134,12 +134,12 @@ func updateAllowedAddressPairs(network *gophercloud.ServiceClient, port *neutron
}
unwinder
:=
func
()
{
klog
.
V
(
4
)
.
Info
(
"Reverting allowed-address-pairs change to port
"
,
port
.
ID
)
klog
.
V
(
4
)
.
Info
f
(
"Reverting allowed-address-pairs change to port %v
"
,
port
.
ID
)
_
,
err
:=
neutronports
.
Update
(
network
,
port
.
ID
,
neutronports
.
UpdateOpts
{
AllowedAddressPairs
:
&
origPairs
,
})
.
Extract
()
if
err
!=
nil
{
klog
.
Warning
(
"Unable to reset allowed-address-pairs during error unwind:
"
,
err
)
klog
.
Warning
f
(
"Unable to reset allowed-address-pairs during error unwind: %v
"
,
err
)
}
}
...
...
@@ -200,7 +200,7 @@ func (r *Routes) CreateRoute(ctx context.Context, clusterName string, nameHint s
found
:=
false
for
_
,
item
:=
range
port
.
AllowedAddressPairs
{
if
item
.
IPAddress
==
route
.
DestinationCIDR
{
klog
.
V
(
4
)
.
Info
(
"Found existing allowed-address-pair:
"
,
item
)
klog
.
V
(
4
)
.
Info
f
(
"Found existing allowed-address-pair: %v
"
,
item
)
found
=
true
break
}
...
...
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