mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-13 11:25:19 +00:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user