kubernetes

mirror of https://github.com/outbackdingo/kubernetes.git synced 2026-02-18 00:40:32 +00:00

Files

Kubernetes Submit Queue 9ca2bda520 Merge pull request #54934 from akosiaris/master

Automatic merge from submit-queue (batch tested with PRs 54906, 54120, 54934, 54915, 54848). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Only parse ClusterCIDR, ServiceCIDR if AllocateNodeCIDRs

**What this PR does / why we need it**:

Avoid unnecessary spam in kube-controller-manager log if --cluster-cidr is not specified and --allocate-node-cidrs is false. Add clarification in kube-controller-manager help about that.

**Release note**
```release-note
Avoid unnecessary spam in kube-controller-manager log if --cluster-cidr is not specified and --allocate-node-cidrs is false.
```

2017-11-02 23:02:13 -07:00

clicheck

update BUILD files

2017-10-15 18:18:13 -07:00

cloud-controller-manager

Update bazel

2017-10-18 17:24:04 +02:00

gendocs

update BUILD files

2017-10-15 18:18:13 -07:00

genkubedocs

kubeadm-doc