github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29639 from aveshagarwal/master-default-resources-limits-fix

Browse Source 
Automatic merge from submit-queue

Fix default resource limits (node allocatable) for downward api volumes and env vars

@kubernetes/rh-cluster-infra  @pmorie @derekwaynecarr
This commit is contained in:
Kubernetes Submit Queue
2016-08-17 11:37:41 -07:00
committed by GitHub
parent 811fd94ead 52a60fe3be
commit f3f818a190
11 changed files with 127 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/volume/attachdetach/attach_detach_controller.go
View File

@@ -582,3 +582,7 @@ func (adc *attachDetachController) GetHostIP() (net.IP, error) {
func (adc *attachDetachController) GetRootContext() string {
return ""
}
func (adc *attachDetachController) GetNodeAllocatable() (api.ResourceList, error) {
return api.ResourceList{}, nil
}

4
pkg/controller/volume/persistentvolume/volume_host.go
View File

@@ -80,3 +80,7 @@ func (ctrl *PersistentVolumeController) GetHostIP() (net.IP, error) {
func (ctrl *PersistentVolumeController) GetRootContext() string {
return ""
}
func (ctrl *PersistentVolumeController) GetNodeAllocatable() (api.ResourceList, error) {
return api.ResourceList{}, nil
}