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
3c34d28f
Unverified
Commit
3c34d28f
authored
Jan 28, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Jan 28, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #72818 from humblec/md-2
Remove explicit nil initialization and correct error string.
parents
44d18592
428dc5ce
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
main.go
cmd/hyperkube/main.go
+1
-1
core.go
cmd/kube-controller-manager/app/core.go
+2
-2
.golint_failures
hack/.golint_failures
+0
-1
doc.go
pkg/controller/endpoint/doc.go
+1
-1
No files found.
cmd/hyperkube/main.go
View file @
3c34d28f
...
@@ -170,7 +170,7 @@ func makeSymlinks(targetName string, commandFns []func() *cobra.Command) error {
...
@@ -170,7 +170,7 @@ func makeSymlinks(targetName string, commandFns []func() *cobra.Command) error {
}
}
if
errs
{
if
errs
{
return
errors
.
New
(
"Error creating one or more symlinks
.
"
)
return
errors
.
New
(
"Error creating one or more symlinks"
)
}
}
return
nil
return
nil
}
}
cmd/kube-controller-manager/app/core.go
View file @
3c34d28f
...
@@ -82,8 +82,8 @@ func startServiceController(ctx ControllerContext) (http.Handler, bool, error) {
...
@@ -82,8 +82,8 @@ func startServiceController(ctx ControllerContext) (http.Handler, bool, error) {
}
}
func
startNodeIpamController
(
ctx
ControllerContext
)
(
http
.
Handler
,
bool
,
error
)
{
func
startNodeIpamController
(
ctx
ControllerContext
)
(
http
.
Handler
,
bool
,
error
)
{
var
clusterCIDR
*
net
.
IPNet
=
nil
var
clusterCIDR
*
net
.
IPNet
var
serviceCIDR
*
net
.
IPNet
=
nil
var
serviceCIDR
*
net
.
IPNet
if
!
ctx
.
ComponentConfig
.
KubeCloudShared
.
AllocateNodeCIDRs
{
if
!
ctx
.
ComponentConfig
.
KubeCloudShared
.
AllocateNodeCIDRs
{
return
nil
,
false
,
nil
return
nil
,
false
,
nil
...
...
hack/.golint_failures
View file @
3c34d28f
cmd/cloud-controller-manager/app/apis/config/v1alpha1
cmd/cloud-controller-manager/app/apis/config/v1alpha1
cmd/hyperkube
cmd/kube-apiserver/app
cmd/kube-apiserver/app
cmd/kube-controller-manager/app
cmd/kube-controller-manager/app
cmd/kube-proxy/app
cmd/kube-proxy/app
...
...
pkg/controller/endpoint/doc.go
View file @
3c34d28f
...
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
...
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
*/
*/
// Package
service
provides EndpointController implementation
// Package
endpoint
provides EndpointController implementation
// to manage and sync service endpoints.
// to manage and sync service endpoints.
package
endpoint
// import "k8s.io/kubernetes/pkg/controller/endpoint"
package
endpoint
// import "k8s.io/kubernetes/pkg/controller/endpoint"
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