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
d839ab20
Commit
d839ab20
authored
Aug 26, 2015
by
Yu-Ju Hong
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12940 from Miciah/Warning-to-Warningf
glog.Warning -> glog.Warningf
parents
1c7ebc4a
8aa299da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
aws.go
pkg/cloudprovider/providers/aws/aws.go
+1
-1
metrics.go
pkg/kubelet/metrics/metrics.go
+1
-1
iptables.go
pkg/util/iptables/iptables.go
+1
-1
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
d839ab20
...
@@ -1773,7 +1773,7 @@ func findSecurityGroupForInstance(instance *ec2.Instance) *string {
...
@@ -1773,7 +1773,7 @@ func findSecurityGroupForInstance(instance *ec2.Instance) *string {
if
securityGroupId
!=
nil
{
if
securityGroupId
!=
nil
{
// We create instances with one SG
// We create instances with one SG
glog
.
Warning
(
"Multiple security groups found for instance (%s); will use first group (%s)"
,
orEmpty
(
instance
.
InstanceID
),
*
securityGroupId
)
glog
.
Warning
f
(
"Multiple security groups found for instance (%s); will use first group (%s)"
,
orEmpty
(
instance
.
InstanceID
),
*
securityGroupId
)
continue
continue
}
else
{
}
else
{
securityGroupId
=
securityGroup
.
GroupID
securityGroupId
=
securityGroup
.
GroupID
...
...
pkg/kubelet/metrics/metrics.go
View file @
d839ab20
...
@@ -163,7 +163,7 @@ func (pc *podAndContainerCollector) Describe(ch chan<- *prometheus.Desc) {
...
@@ -163,7 +163,7 @@ func (pc *podAndContainerCollector) Describe(ch chan<- *prometheus.Desc) {
func
(
pc
*
podAndContainerCollector
)
Collect
(
ch
chan
<-
prometheus
.
Metric
)
{
func
(
pc
*
podAndContainerCollector
)
Collect
(
ch
chan
<-
prometheus
.
Metric
)
{
runningPods
,
err
:=
pc
.
containerCache
.
GetPods
()
runningPods
,
err
:=
pc
.
containerCache
.
GetPods
()
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Warning
(
"Failed to get running container information while collecting metrics: %v"
,
err
)
glog
.
Warning
f
(
"Failed to get running container information while collecting metrics: %v"
,
err
)
return
return
}
}
...
...
pkg/util/iptables/iptables.go
View file @
d839ab20
...
@@ -310,7 +310,7 @@ func (runner *runner) run(op operation, args []string) ([]byte, error) {
...
@@ -310,7 +310,7 @@ func (runner *runner) run(op operation, args []string) ([]byte, error) {
func
(
runner
*
runner
)
checkRule
(
table
Table
,
chain
Chain
,
args
...
string
)
(
bool
,
error
)
{
func
(
runner
*
runner
)
checkRule
(
table
Table
,
chain
Chain
,
args
...
string
)
(
bool
,
error
)
{
checkPresent
,
err
:=
getIptablesHasCheckCommand
(
runner
.
exec
)
checkPresent
,
err
:=
getIptablesHasCheckCommand
(
runner
.
exec
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Warning
(
"Error checking iptables version, assuming version at least 1.4.11: %v"
,
err
)
glog
.
Warning
f
(
"Error checking iptables version, assuming version at least 1.4.11: %v"
,
err
)
checkPresent
=
true
checkPresent
=
true
}
}
if
checkPresent
{
if
checkPresent
{
...
...
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