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
8e53723d
Commit
8e53723d
authored
Jan 11, 2017
by
NickrenREN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix variables in openstack.go to keep camel casing and remove unused var
parent
1fbb22e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
openstack.go
pkg/cloudprovider/providers/openstack/openstack.go
+12
-13
No files found.
pkg/cloudprovider/providers/openstack/openstack.go
View file @
8e53723d
...
@@ -46,7 +46,6 @@ const ProviderName = "openstack"
...
@@ -46,7 +46,6 @@ const ProviderName = "openstack"
var
ErrNotFound
=
errors
.
New
(
"Failed to find object"
)
var
ErrNotFound
=
errors
.
New
(
"Failed to find object"
)
var
ErrMultipleResults
=
errors
.
New
(
"Multiple results where only one expected"
)
var
ErrMultipleResults
=
errors
.
New
(
"Multiple results where only one expected"
)
var
ErrNoAddressFound
=
errors
.
New
(
"No address found for host"
)
var
ErrNoAddressFound
=
errors
.
New
(
"No address found for host"
)
var
ErrAttrNotFound
=
errors
.
New
(
"Expected attribute not found"
)
const
(
const
(
MiB
=
1024
*
1024
MiB
=
1024
*
1024
...
@@ -316,8 +315,8 @@ func nodeAddresses(srv *servers.Server) ([]v1.NodeAddress, error) {
...
@@ -316,8 +315,8 @@ func nodeAddresses(srv *servers.Server) ([]v1.NodeAddress, error) {
return
nil
,
err
return
nil
,
err
}
}
for
network
,
addr
l
ist
:=
range
addresses
{
for
network
,
addr
L
ist
:=
range
addresses
{
for
_
,
props
:=
range
addr
l
ist
{
for
_
,
props
:=
range
addr
L
ist
{
var
addressType
v1
.
NodeAddressType
var
addressType
v1
.
NodeAddressType
if
props
.
IpType
==
"floating"
||
network
==
"public"
{
if
props
.
IpType
==
"floating"
||
network
==
"public"
{
addressType
=
v1
.
NodeExternalIP
addressType
=
v1
.
NodeExternalIP
...
@@ -392,8 +391,8 @@ func (os *OpenStack) ProviderName() string {
...
@@ -392,8 +391,8 @@ func (os *OpenStack) ProviderName() string {
}
}
// ScrubDNS filters DNS settings for pods.
// ScrubDNS filters DNS settings for pods.
func
(
os
*
OpenStack
)
ScrubDNS
(
name
servers
,
searches
[]
string
)
(
nsOut
,
srchOut
[]
string
)
{
func
(
os
*
OpenStack
)
ScrubDNS
(
name
Servers
,
searches
[]
string
)
([]
string
,
[]
string
)
{
return
name
s
ervers
,
searches
return
name
S
ervers
,
searches
}
}
func
(
os
*
OpenStack
)
LoadBalancer
()
(
cloudprovider
.
LoadBalancer
,
bool
)
{
func
(
os
*
OpenStack
)
LoadBalancer
()
(
cloudprovider
.
LoadBalancer
,
bool
)
{
...
@@ -416,8 +415,8 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
...
@@ -416,8 +415,8 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
return
nil
,
false
return
nil
,
false
}
}
lb
v
ersion
:=
os
.
lbOpts
.
LBVersion
lb
V
ersion
:=
os
.
lbOpts
.
LBVersion
if
lb
v
ersion
==
""
{
if
lb
V
ersion
==
""
{
// No version specified, try newest supported by server
// No version specified, try newest supported by server
netExts
,
err
:=
networkExtensions
(
network
)
netExts
,
err
:=
networkExtensions
(
network
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -426,24 +425,24 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
...
@@ -426,24 +425,24 @@ func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
}
}
if
netExts
[
"lbaasv2"
]
{
if
netExts
[
"lbaasv2"
]
{
lb
v
ersion
=
"v2"
lb
V
ersion
=
"v2"
}
else
if
netExts
[
"lbaas"
]
{
}
else
if
netExts
[
"lbaas"
]
{
lb
v
ersion
=
"v1"
lb
V
ersion
=
"v1"
}
else
{
}
else
{
glog
.
Warningf
(
"Failed to find neutron LBaaS extension (v1 or v2)"
)
glog
.
Warningf
(
"Failed to find neutron LBaaS extension (v1 or v2)"
)
return
nil
,
false
return
nil
,
false
}
}
glog
.
V
(
3
)
.
Infof
(
"Using LBaaS extension %v"
,
lb
v
ersion
)
glog
.
V
(
3
)
.
Infof
(
"Using LBaaS extension %v"
,
lb
V
ersion
)
}
}
glog
.
V
(
1
)
.
Info
(
"Claiming to support LoadBalancer"
)
glog
.
V
(
1
)
.
Info
(
"Claiming to support LoadBalancer"
)
if
lb
v
ersion
==
"v2"
{
if
lb
V
ersion
==
"v2"
{
return
&
LbaasV2
{
LoadBalancer
{
network
,
compute
,
os
.
lbOpts
}},
true
return
&
LbaasV2
{
LoadBalancer
{
network
,
compute
,
os
.
lbOpts
}},
true
}
else
if
lb
v
ersion
==
"v1"
{
}
else
if
lb
V
ersion
==
"v1"
{
return
&
LbaasV1
{
LoadBalancer
{
network
,
compute
,
os
.
lbOpts
}},
true
return
&
LbaasV1
{
LoadBalancer
{
network
,
compute
,
os
.
lbOpts
}},
true
}
else
{
}
else
{
glog
.
Warningf
(
"Config error: unrecognised lb-version
\"
%v
\"
"
,
lb
v
ersion
)
glog
.
Warningf
(
"Config error: unrecognised lb-version
\"
%v
\"
"
,
lb
V
ersion
)
return
nil
,
false
return
nil
,
false
}
}
}
}
...
...
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