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
9e2abd4b
Commit
9e2abd4b
authored
Aug 30, 2016
by
Jedrzej Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix various typos in pgk/cloudprovider,dns,kubectl
parent
3fd14d97
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
13 additions
and
13 deletions
+13
-13
aws.go
pkg/cloudprovider/providers/aws/aws.go
+1
-1
aws_loadbalancer.go
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
+1
-1
cloudstack_test.go
pkg/cloudprovider/providers/cloudstack/cloudstack_test.go
+1
-1
gce.go
pkg/cloudprovider/providers/gce/gce.go
+1
-1
openstack_volumes.go
pkg/cloudprovider/providers/openstack/openstack_volumes.go
+1
-1
rackspace.go
pkg/cloudprovider/providers/rackspace/rackspace.go
+1
-1
vsphere.go
pkg/cloudprovider/providers/vsphere/vsphere.go
+1
-1
dns.go
pkg/dns/dns.go
+2
-2
treecache.go
pkg/dns/treecache.go
+1
-1
resource_printer.go
pkg/kubectl/resource_printer.go
+1
-1
stop.go
pkg/kubectl/stop.go
+1
-1
stop_test.go
pkg/kubectl/stop_test.go
+1
-1
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
9e2abd4b
...
@@ -1014,7 +1014,7 @@ func (c *Cloud) List(filter string) ([]string, error) {
...
@@ -1014,7 +1014,7 @@ func (c *Cloud) List(filter string) ([]string, error) {
// It currently involves querying all instances
// It currently involves querying all instances
func
(
c
*
Cloud
)
getAllZones
()
(
sets
.
String
,
error
)
{
func
(
c
*
Cloud
)
getAllZones
()
(
sets
.
String
,
error
)
{
// We don't currently cache this; it is currently used only in volume
// We don't currently cache this; it is currently used only in volume
// creation which is expected to be a comparatively rare occurence.
// creation which is expected to be a comparatively rare occur
r
ence.
// TODO: Caching / expose api.Nodes to the cloud provider?
// TODO: Caching / expose api.Nodes to the cloud provider?
// TODO: We could also query for subnets, I think
// TODO: We could also query for subnets, I think
...
...
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @
9e2abd4b
...
@@ -218,7 +218,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
...
@@ -218,7 +218,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
// NOTE The documentation for the AWS API indicates we could get an HTTP 400
// NOTE The documentation for the AWS API indicates we could get an HTTP 400
// back if a policy of the same name already exists. However, the aws-sdk does not
// back if a policy of the same name already exists. However, the aws-sdk does not
// seem to return an error to us in these cases. Therefore this will issue an API
// seem to return an error to us in these cases. Therefore
,
this will issue an API
// request every time.
// request every time.
err
:=
c
.
createProxyProtocolPolicy
(
loadBalancerName
)
err
:=
c
.
createProxyProtocolPolicy
(
loadBalancerName
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/cloudprovider/providers/cloudstack/cloudstack_test.go
View file @
9e2abd4b
...
@@ -74,7 +74,7 @@ func configFromEnv() (*CSConfig, bool) {
...
@@ -74,7 +74,7 @@ func configFromEnv() (*CSConfig, bool) {
cfg
.
Global
.
Zone
=
os
.
Getenv
(
"CS_ZONE"
)
cfg
.
Global
.
Zone
=
os
.
Getenv
(
"CS_ZONE"
)
// It is save to ignore the error here. If the input cannot be parsed SSLNoVerify
// It is save to ignore the error here. If the input cannot be parsed SSLNoVerify
// will still be a bool with it
'
s zero value (false) which is the expected default.
// will still be a bool with its zero value (false) which is the expected default.
cfg
.
Global
.
SSLNoVerify
,
_
=
strconv
.
ParseBool
(
os
.
Getenv
(
"CS_SSL_NO_VERIFY"
))
cfg
.
Global
.
SSLNoVerify
,
_
=
strconv
.
ParseBool
(
os
.
Getenv
(
"CS_SSL_NO_VERIFY"
))
// Check if we have the minimum required info to be able to connect to CloudStack.
// Check if we have the minimum required info to be able to connect to CloudStack.
...
...
pkg/cloudprovider/providers/gce/gce.go
View file @
9e2abd4b
...
@@ -2596,7 +2596,7 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
...
@@ -2596,7 +2596,7 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
// GetGCERegion returns region of the gce zone. Zone names
// GetGCERegion returns region of the gce zone. Zone names
// are of the form: ${region-name}-${ix}.
// are of the form: ${region-name}-${ix}.
// For example "us-central1-b" has a region of "us-central1".
// For example
,
"us-central1-b" has a region of "us-central1".
// So we look for the last '-' and trim to just before that.
// So we look for the last '-' and trim to just before that.
func
GetGCERegion
(
zone
string
)
(
string
,
error
)
{
func
GetGCERegion
(
zone
string
)
(
string
,
error
)
{
ix
:=
strings
.
LastIndex
(
zone
,
"-"
)
ix
:=
strings
.
LastIndex
(
zone
,
"-"
)
...
...
pkg/cloudprovider/providers/openstack/openstack_volumes.go
View file @
9e2abd4b
...
@@ -129,7 +129,7 @@ func (os *OpenStack) getVolume(diskName string) (volumes.Volume, error) {
...
@@ -129,7 +129,7 @@ func (os *OpenStack) getVolume(diskName string) (volumes.Volume, error) {
return
false
,
errors
.
New
(
errmsg
)
return
false
,
errors
.
New
(
errmsg
)
})
})
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Errorf
(
"Error occured getting volume: %s"
,
diskName
)
glog
.
Errorf
(
"Error occur
r
ed getting volume: %s"
,
diskName
)
return
volume
,
err
return
volume
,
err
}
}
return
volume
,
err
return
volume
,
err
...
...
pkg/cloudprovider/providers/rackspace/rackspace.go
View file @
9e2abd4b
...
@@ -563,7 +563,7 @@ func (rs *Rackspace) getVolume(diskName string) (volumes.Volume, error) {
...
@@ -563,7 +563,7 @@ func (rs *Rackspace) getVolume(diskName string) (volumes.Volume, error) {
return
false
,
errors
.
New
(
errmsg
)
return
false
,
errors
.
New
(
errmsg
)
})
})
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Errorf
(
"Error occured getting volume: %s"
,
diskName
)
glog
.
Errorf
(
"Error occur
r
ed getting volume: %s"
,
diskName
)
}
}
return
volume
,
err
return
volume
,
err
}
}
...
...
pkg/cloudprovider/providers/vsphere/vsphere.go
View file @
9e2abd4b
...
@@ -742,7 +742,7 @@ func getNextUnitNumber(devices object.VirtualDeviceList, c types.BaseVirtualCont
...
@@ -742,7 +742,7 @@ func getNextUnitNumber(devices object.VirtualDeviceList, c types.BaseVirtualCont
return
int32
(
unitNumber
),
nil
return
int32
(
unitNumber
),
nil
}
}
}
}
return
-
1
,
fmt
.
Errorf
(
"SCSI Controller with key=%d does not have any avaiable slots (LUN)."
,
key
)
return
-
1
,
fmt
.
Errorf
(
"SCSI Controller with key=%d does not have any avai
l
able slots (LUN)."
,
key
)
}
}
func
getSCSIController
(
vmDevices
object
.
VirtualDeviceList
,
scsiType
string
)
*
types
.
VirtualController
{
func
getSCSIController
(
vmDevices
object
.
VirtualDeviceList
,
scsiType
string
)
*
types
.
VirtualController
{
...
...
pkg/dns/dns.go
View file @
9e2abd4b
...
@@ -99,7 +99,7 @@ type KubeDNS struct {
...
@@ -99,7 +99,7 @@ type KubeDNS struct {
// Map of cluster IP to service object. Headless services are not part of this map.
// Map of cluster IP to service object. Headless services are not part of this map.
// Used to get a service when given its cluster IP.
// Used to get a service when given its cluster IP.
// Access to this is coordinated using cacheLock. We use the same lock for cache and this map
// Access to this is coordinated using cacheLock. We use the same lock for cache and this map
// to ensure that they dont get out of sync.
// to ensure that they don
'
t get out of sync.
clusterIPServiceMap
map
[
string
]
*
kapi
.
Service
clusterIPServiceMap
map
[
string
]
*
kapi
.
Service
// caller is responsible for using the cacheLock before invoking methods on cache
// caller is responsible for using the cacheLock before invoking methods on cache
...
@@ -253,7 +253,7 @@ func (kd *KubeDNS) newService(obj interface{}) {
...
@@ -253,7 +253,7 @@ func (kd *KubeDNS) newService(obj interface{}) {
return
return
}
}
if
len
(
service
.
Spec
.
Ports
)
==
0
{
if
len
(
service
.
Spec
.
Ports
)
==
0
{
glog
.
Warningf
(
"Unexpected service with no ports, this should not have happend: %v"
,
service
)
glog
.
Warningf
(
"Unexpected service with no ports, this should not have happen
e
d: %v"
,
service
)
}
}
kd
.
newPortalService
(
service
)
kd
.
newPortalService
(
service
)
}
}
...
...
pkg/dns/treecache.go
View file @
9e2abd4b
...
@@ -53,7 +53,7 @@ func (cache *TreeCache) Serialize() (string, error) {
...
@@ -53,7 +53,7 @@ func (cache *TreeCache) Serialize() (string, error) {
func
(
cache
*
TreeCache
)
setEntry
(
key
string
,
val
*
skymsg
.
Service
,
fqdn
string
,
path
...
string
)
{
func
(
cache
*
TreeCache
)
setEntry
(
key
string
,
val
*
skymsg
.
Service
,
fqdn
string
,
path
...
string
)
{
// TODO: Consolidate setEntry and setSubCache into a single method with a
// TODO: Consolidate setEntry and setSubCache into a single method with a
// type switch.
// type switch.
// TODO: Insted of passing the fqdn as an argument, we can reconstruct
// TODO: Inste
a
d of passing the fqdn as an argument, we can reconstruct
// it from the path, provided callers always pass the full path to the
// it from the path, provided callers always pass the full path to the
// object. This is currently *not* the case, since callers first create
// object. This is currently *not* the case, since callers first create
// a new, empty node, populate it, then parent it under the right path.
// a new, empty node, populate it, then parent it under the right path.
...
...
pkg/kubectl/resource_printer.go
View file @
9e2abd4b
...
@@ -1779,7 +1779,7 @@ func extractCSRStatus(csr *certificates.CertificateSigningRequest) (string, erro
...
@@ -1779,7 +1779,7 @@ func extractCSRStatus(csr *certificates.CertificateSigningRequest) (string, erro
case
certificates
.
CertificateDenied
:
case
certificates
.
CertificateDenied
:
denied
=
true
denied
=
true
default
:
default
:
return
""
,
fmt
.
Errorf
(
"unknown csr conditon %q"
,
c
)
return
""
,
fmt
.
Errorf
(
"unknown csr condit
i
on %q"
,
c
)
}
}
}
}
var
status
string
var
status
string
...
...
pkg/kubectl/stop.go
View file @
9e2abd4b
...
@@ -367,7 +367,7 @@ func (reaper *PetSetReaper) Stop(namespace, name string, timeout time.Duration,
...
@@ -367,7 +367,7 @@ func (reaper *PetSetReaper) Stop(namespace, name string, timeout time.Duration,
}
}
// TODO: Cleanup volumes? We don't want to accidentally delete volumes from
// TODO: Cleanup volumes? We don't want to accidentally delete volumes from
// stop, so just leave this up to the
the
petset.
// stop, so just leave this up to the petset.
return
petsets
.
Delete
(
name
,
nil
)
return
petsets
.
Delete
(
name
,
nil
)
}
}
...
...
pkg/kubectl/stop_test.go
View file @
9e2abd4b
...
@@ -766,7 +766,7 @@ func TestDeploymentNotFoundError(t *testing.T) {
...
@@ -766,7 +766,7 @@ func TestDeploymentNotFoundError(t *testing.T) {
return
true
,
list
,
nil
return
true
,
list
,
nil
})
})
fake
.
AddReactor
(
"get"
,
"replicasets"
,
func
(
action
testclient
.
Action
)
(
handled
bool
,
ret
runtime
.
Object
,
err
error
)
{
fake
.
AddReactor
(
"get"
,
"replicasets"
,
func
(
action
testclient
.
Action
)
(
handled
bool
,
ret
runtime
.
Object
,
err
error
)
{
return
true
,
nil
,
ScaleError
{
ActualError
:
errors
.
NewNotFound
(
api
.
Resource
(
"replicaset"
),
"doesnt-matter"
)}
return
true
,
nil
,
ScaleError
{
ActualError
:
errors
.
NewNotFound
(
api
.
Resource
(
"replicaset"
),
"doesn
'
t-matter"
)}
})
})
reaper
:=
DeploymentReaper
{
fake
,
time
.
Millisecond
,
time
.
Millisecond
}
reaper
:=
DeploymentReaper
{
fake
,
time
.
Millisecond
,
time
.
Millisecond
}
...
...
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