Adds filtering of hosts to DialContexts.

The provided DialContext wraps existing clients' DialContext in an attempt to
preserve any existing timeout configuration. In some cases, we may replace
infinite timeouts with golang defaults.

- scaleio: tcp connect/keepalive values changed from 0/15 to 30/30
- storageos: no change

Kubernetes-commit: f2e23afcf13fef805ad5341bd7a5625de5982d6c
This commit is contained in:
Matthew Cary 2020-06-09 21:30:40 +00:00 committed by Kubernetes Publisher
parent 527edbbb80
commit d1dc775ba5
2 changed files with 16 additions and 0 deletions

View File

@ -471,6 +471,12 @@ type PersistentVolumeBinderControllerConfiguration struct {
PVClaimBinderSyncPeriod metav1.Duration PVClaimBinderSyncPeriod metav1.Duration
// volumeConfiguration holds configuration for volume related features. // volumeConfiguration holds configuration for volume related features.
VolumeConfiguration VolumeConfiguration VolumeConfiguration VolumeConfiguration
// VolumeHostCIDRDenylist is a list of CIDRs that should not be reachable by the
// controller from plugins.
VolumeHostCIDRDenylist []string
// VolumeHostAllowLocalLoopback indicates if local loopback hosts (127.0.0.1, etc)
// should be allowed from plugins.
VolumeHostAllowLocalLoopback *bool
} }
// PodGCControllerConfiguration contains elements describing PodGCController. // PodGCControllerConfiguration contains elements describing PodGCController.

View File

@ -442,6 +442,16 @@ func (in *PersistentVolumeBinderControllerConfiguration) DeepCopyInto(out *Persi
*out = *in *out = *in
out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod
in.VolumeConfiguration.DeepCopyInto(&out.VolumeConfiguration) in.VolumeConfiguration.DeepCopyInto(&out.VolumeConfiguration)
if in.VolumeHostCIDRDenylist != nil {
in, out := &in.VolumeHostCIDRDenylist, &out.VolumeHostCIDRDenylist
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.VolumeHostAllowLocalLoopback != nil {
in, out := &in.VolumeHostAllowLocalLoopback, &out.VolumeHostAllowLocalLoopback
*out = new(bool)
**out = **in
}
return return
} }