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
2ec49efd
Commit
2ec49efd
authored
Feb 09, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #19945 from Clarifai/fix-formatting
Auto commit by PR queue bot
parents
c1e79e42
a0831a23
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
9 deletions
+9
-9
hollow-node.go
cmd/kubemark/hollow-node.go
+1
-1
main.go
cmd/libs/go2idl/client-gen/main.go
+1
-1
aws.go
pkg/cloudprovider/providers/aws/aws.go
+2
-2
openstack.go
pkg/cloudprovider/providers/openstack/openstack.go
+1
-1
persistentvolume_provisioner_controller.go
...rsistentvolume/persistentvolume_provisioner_controller.go
+1
-1
rkt.go
pkg/kubelet/rkt/rkt.go
+1
-1
generic_metrics.go
pkg/metrics/generic_metrics.go
+1
-1
empty_dir_linux.go
pkg/volume/empty_dir/empty_dir_linux.go
+1
-1
No files found.
cmd/kubemark/hollow-node.go
View file @
2ec49efd
...
...
@@ -84,7 +84,7 @@ func main() {
util
.
InitFlags
()
if
!
knownMorphs
.
Has
(
config
.
Morph
)
{
glog
.
Fatal
(
"Unknown morph: %v. Allowed values: %v"
,
config
.
Morph
,
knownMorphs
.
List
())
glog
.
Fatal
f
(
"Unknown morph: %v. Allowed values: %v"
,
config
.
Morph
,
knownMorphs
.
List
())
}
// create a client to communicate with API server.
...
...
cmd/libs/go2idl/client-gen/main.go
View file @
2ec49efd
...
...
@@ -98,7 +98,7 @@ func main() {
if
err
!=
nil
{
glog
.
Fatalf
(
"Error: %v"
,
err
)
}
glog
.
Info
(
"going to generate clientset from these input paths: %v"
,
inputPath
)
glog
.
Info
f
(
"going to generate clientset from these input paths: %v"
,
inputPath
)
arguments
.
InputDirs
=
append
(
inputPath
,
dependencies
...
)
// TODO: we need to make OutPackagePath a map[string]string. For example,
// we need clientset and the individual typed clients be output to different
...
...
pkg/cloudprovider/providers/aws/aws.go
View file @
2ec49efd
...
...
@@ -1234,7 +1234,7 @@ func (c *AWSCloud) AttachDisk(diskName string, instanceName string, readOnly boo
return
""
,
fmt
.
Errorf
(
"Error attaching EBS volume: %v"
,
err
)
}
glog
.
V
(
2
)
.
Info
(
"AttachVolume request returned %v"
,
attachResponse
)
glog
.
V
(
2
)
.
Info
f
(
"AttachVolume request returned %v"
,
attachResponse
)
}
err
=
disk
.
waitForAttachmentStatus
(
"attached"
)
...
...
@@ -1890,7 +1890,7 @@ func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, port
err
=
s
.
ensureLoadBalancerInstances
(
orEmpty
(
loadBalancer
.
LoadBalancerName
),
loadBalancer
.
Instances
,
instances
)
if
err
!=
nil
{
glog
.
Warning
(
"Error registering instances with the load balancer: %v"
,
err
)
glog
.
Warning
f
(
"Error registering instances with the load balancer: %v"
,
err
)
return
nil
,
err
}
...
...
pkg/cloudprovider/providers/openstack/openstack.go
View file @
2ec49efd
...
...
@@ -679,7 +679,7 @@ func (lb *LoadBalancer) EnsureLoadBalancer(name, region string, loadBalancerIP n
return
nil
,
fmt
.
Errorf
(
"unsupported load balancer affinity: %v"
,
affinity
)
}
glog
.
V
(
2
)
.
Info
(
"Checking if openstack load balancer already exists: %s"
,
name
)
glog
.
V
(
2
)
.
Info
f
(
"Checking if openstack load balancer already exists: %s"
,
name
)
_
,
exists
,
err
:=
lb
.
GetLoadBalancer
(
name
,
region
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"error checking if openstack load balancer already exists: %v"
,
err
)
...
...
pkg/controller/persistentvolume/persistentvolume_provisioner_controller.go
View file @
2ec49efd
...
...
@@ -202,7 +202,7 @@ func (controller *PersistentVolumeProvisionerController) reconcileClaim(claim *a
claim
.
Annotations
[
pvProvisioningRequiredAnnotationKey
]
=
pvProvisioningCompletedAnnotationValue
_
,
err
=
controller
.
client
.
UpdatePersistentVolumeClaim
(
claim
)
if
err
!=
nil
{
glog
.
Error
(
"error updating persistent volume claim: %v"
,
err
)
glog
.
Error
f
(
"error updating persistent volume claim: %v"
,
err
)
}
return
nil
...
...
pkg/kubelet/rkt/rkt.go
View file @
2ec49efd
...
...
@@ -1449,7 +1449,7 @@ func (r *Runtime) GetPodStatus(uid types.UID, name, namespace string) (*kubecont
for
_
,
pod
:=
range
listResp
.
Pods
{
manifest
,
creationTime
,
restartCount
,
err
:=
getPodInfo
(
pod
)
if
err
!=
nil
{
glog
.
Warning
(
"rkt: Couldn't get necessary info from the rkt pod, (uuid %q): %v"
,
pod
.
Id
,
err
)
glog
.
Warning
f
(
"rkt: Couldn't get necessary info from the rkt pod, (uuid %q): %v"
,
pod
.
Id
,
err
)
continue
}
...
...
pkg/metrics/generic_metrics.go
View file @
2ec49efd
...
...
@@ -134,7 +134,7 @@ func parseMetrics(data string, knownMetrics map[string][]string, output *Metrics
if
isKnownMetric
||
isCommonMetric
{
(
*
output
)[
name
]
=
append
((
*
output
)[
name
],
metric
)
}
else
{
glog
.
Warning
(
"Unknown metric %v"
,
metric
)
glog
.
Warning
f
(
"Unknown metric %v"
,
metric
)
if
unknownMetrics
!=
nil
{
unknownMetrics
.
Insert
(
name
)
}
...
...
pkg/volume/empty_dir/empty_dir_linux.go
View file @
2ec49efd
...
...
@@ -46,7 +46,7 @@ func (m *realMountDetector) GetMountMedium(path string) (storageMedium, bool, er
return
0
,
false
,
fmt
.
Errorf
(
"statfs(%q): %v"
,
path
,
err
)
}
glog
.
V
(
5
)
.
Info
(
"Statfs_t of %v: %+v"
,
path
,
buf
)
glog
.
V
(
5
)
.
Info
f
(
"Statfs_t of %v: %+v"
,
path
,
buf
)
if
buf
.
Type
==
linuxTmpfsMagic
{
return
mediumMemory
,
!
notMnt
,
nil
}
...
...
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