Merge pull request #39322 from luxas/remove_reconcile_cidr

Automatic merge from submit-queue (batch tested with PRs 39351, 39322)

Remove the deprecated --reconcile-cidr flag from kubelet

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

Removes the `--reconcile-cidr` flag that has been deprecated since v1.5

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
The `--reconcile-cidr` kubelet flag was removed since it had been deprecated since v1.5
```
@thockin
This commit is contained in:
Kubernetes Submit Queue
2017-01-03 00:22:20 -08:00
committed by GitHub
8 changed files with 1 additions and 33 deletions

View File

@@ -336,7 +336,6 @@ func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface
out.CPUCFSQuota = in.CPUCFSQuota
out.Containerized = in.Containerized
out.MaxOpenFiles = in.MaxOpenFiles
out.ReconcileCIDR = in.ReconcileCIDR
out.RegisterSchedulable = in.RegisterSchedulable
if in.RegisterWithTaints != nil {
in, out := &in.RegisterWithTaints, &out.RegisterWithTaints