github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #80926 from davidz627/automated-cherry-pick-of-#80923-upstream-release-1.14 

Automated cherry pick of #80923: Reduce GCE PD Attach Limits by 1 because Node Boot Disk
k3s-v1.14.6
Kubernetes Prow Robot 2019-08-06 17:19:06 -07:00 committed by GitHub
parent c20df25e2d 49e72d6049
commit aaaf6d417a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/gcepd/gce_pd.go
View File

@ -63,9 +63,12 @@ const (
// The constants are used to map from the machine type (number of CPUs) to the limit of
// persistent disks that can be attached to an instance. Please refer to gcloud doc
// https://cloud.google.com/compute/docs/disks/#increased_persistent_disk_limits
// These constants are all the documented attach limit minus one because the
// node boot disk is considered an attachable disk so effective attach limit is
// one less.
const (
VolumeLimit16 = 16
VolumeLimit128 = 128
volumeLimitSmall = 15
VolumeLimitBig = 127
)
func getPath(uid types.UID, volName string, host volume.VolumeHost) string {
@ -121,7 +124,7 @@ func (plugin *gcePersistentDiskPlugin) GetAccessModes() []v1.PersistentVolumeAcc
func (plugin *gcePersistentDiskPlugin) GetVolumeLimits() (map[string]int64, error) {
volumeLimits := map[string]int64{
util.GCEVolumeLimitKey: VolumeLimit16,
util.GCEVolumeLimitKey: volumeLimitSmall,
}
cloud := plugin.host.GetCloudProvider()
@ -149,9 +152,9 @@ func (plugin *gcePersistentDiskPlugin) GetVolumeLimits() (map[string]int64, erro
return volumeLimits, nil
}
if strings.HasPrefix(instanceType, "n1-") || strings.HasPrefix(instanceType, "custom-") {
volumeLimits[util.GCEVolumeLimitKey] = VolumeLimit128
volumeLimits[util.GCEVolumeLimitKey] = VolumeLimitBig
} else {
volumeLimits[util.GCEVolumeLimitKey] = VolumeLimit16
volumeLimits[util.GCEVolumeLimitKey] = volumeLimitSmall
}
return volumeLimits, nil