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
9865aef2
Commit
9865aef2
authored
Sep 10, 2018
by
Doug Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some minor fixes for warnings while running the tests
Signed-off-by:
Doug Davis
<
dug@us.ibm.com
>
parent
ba33abd5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
certs.go
cmd/kubeadm/app/phases/certs/certs.go
+1
-1
ipset.go
pkg/util/ipset/ipset.go
+1
-1
azure_dd.go
pkg/volume/azure_dd/azure_dd.go
+1
-1
No files found.
cmd/kubeadm/app/phases/certs/certs.go
View file @
9865aef2
...
@@ -110,7 +110,7 @@ func CreateCACertAndKeyFiles(certSpec *KubeadmCert, cfg *kubeadmapi.InitConfigur
...
@@ -110,7 +110,7 @@ func CreateCACertAndKeyFiles(certSpec *KubeadmCert, cfg *kubeadmapi.InitConfigur
if
certSpec
.
CAName
!=
""
{
if
certSpec
.
CAName
!=
""
{
return
fmt
.
Errorf
(
"This function should only be used for CAs, but cert %s has CA %s"
,
certSpec
.
Name
,
certSpec
.
CAName
)
return
fmt
.
Errorf
(
"This function should only be used for CAs, but cert %s has CA %s"
,
certSpec
.
Name
,
certSpec
.
CAName
)
}
}
glog
.
V
(
1
)
.
Info
ln
(
"creating a new certificate authority for %s"
,
certSpec
.
Name
)
glog
.
V
(
1
)
.
Info
f
(
"creating a new certificate authority for %s"
,
certSpec
.
Name
)
certConfig
,
err
:=
certSpec
.
GetConfig
(
cfg
)
certConfig
,
err
:=
certSpec
.
GetConfig
(
cfg
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/util/ipset/ipset.go
View file @
9865aef2
...
@@ -485,7 +485,7 @@ func validateProtocol(protocol string) bool {
...
@@ -485,7 +485,7 @@ func validateProtocol(protocol string) bool {
if
protocol
==
ProtocolTCP
||
protocol
==
ProtocolUDP
||
protocol
==
ProtocolSCTP
{
if
protocol
==
ProtocolTCP
||
protocol
==
ProtocolUDP
||
protocol
==
ProtocolSCTP
{
return
true
return
true
}
}
glog
.
Errorf
(
"Invalid entry's protocol: %s, supported protocols are [%s, %s]"
,
protocol
,
ProtocolTCP
,
ProtocolUDP
,
ProtocolSCTP
)
glog
.
Errorf
(
"Invalid entry's protocol: %s, supported protocols are [%s, %s
, %s
]"
,
protocol
,
ProtocolTCP
,
ProtocolUDP
,
ProtocolSCTP
)
return
false
return
false
}
}
...
...
pkg/volume/azure_dd/azure_dd.go
View file @
9865aef2
...
@@ -188,7 +188,7 @@ func getMaxDataDiskCount(instanceType string, sizeList *[]compute.VirtualMachine
...
@@ -188,7 +188,7 @@ func getMaxDataDiskCount(instanceType string, sizeList *[]compute.VirtualMachine
continue
continue
}
}
if
strings
.
ToUpper
(
*
size
.
Name
)
==
vmsize
{
if
strings
.
ToUpper
(
*
size
.
Name
)
==
vmsize
{
glog
.
V
(
2
)
.
Infof
(
"got a matching size in getMaxDataDiskCount, Name: %s, MaxDataDiskCount: %
s
"
,
*
size
.
Name
,
*
size
.
MaxDataDiskCount
)
glog
.
V
(
2
)
.
Infof
(
"got a matching size in getMaxDataDiskCount, Name: %s, MaxDataDiskCount: %
d
"
,
*
size
.
Name
,
*
size
.
MaxDataDiskCount
)
return
int64
(
*
size
.
MaxDataDiskCount
)
return
int64
(
*
size
.
MaxDataDiskCount
)
}
}
}
}
...
...
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