Merge pull request kubernetes#3755 from vivekbagade/master

Add max pods per node config to build node

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/gce/gce_manager.go

@@ -485,7 +485,7 @@ func (m *gceManagerImpl) GetMigTemplateNode(mig Mig) (*apiv1.Node, error) {
 	if err != nil {
 		return nil, err
 	}
-	return m.templates.BuildNodeFromTemplate(mig, template, cpu, mem)
+	return m.templates.BuildNodeFromTemplate(mig, template, cpu, mem, nil)
 }
 
 func (m *gceManagerImpl) getCpuAndMemoryForMachineType(machineType string, zone string) (cpu int64, mem int64, err error) {

cluster-autoscaler/cloudprovider/gce/templates.go

@@ -52,10 +52,14 @@ func (t *GceTemplateBuilder) getAcceleratorCount(accelerators []*gce.Accelerator
 }
 
 // BuildCapacity builds a list of resource capacities given list of hardware.
-func (t *GceTemplateBuilder) BuildCapacity(cpu int64, mem int64, accelerators []*gce.AcceleratorConfig, os OperatingSystem) (apiv1.ResourceList, error) {
+func (t *GceTemplateBuilder) BuildCapacity(cpu int64, mem int64, accelerators []*gce.AcceleratorConfig, os OperatingSystem, pods *int64) (apiv1.ResourceList, error) {
 	capacity := apiv1.ResourceList{}
-	// TODO: get a real value.
-	capacity[apiv1.ResourcePods] = *resource.NewQuantity(110, resource.DecimalSI)
+	if pods == nil {
+		capacity[apiv1.ResourcePods] = *resource.NewQuantity(110, resource.DecimalSI)
+	} else {
+		capacity[apiv1.ResourcePods] = *resource.NewQuantity(*pods, resource.DecimalSI)
+	}
+
 	capacity[apiv1.ResourceCPU] = *resource.NewQuantity(cpu, resource.DecimalSI)
 	memTotal := mem - CalculateKernelReserved(mem, os)
 	capacity[apiv1.ResourceMemory] = *resource.NewQuantity(memTotal, resource.DecimalSI)
@@ -120,7 +124,7 @@ func getKubeEnvValueFromTemplateMetadata(template *gce.InstanceTemplate) (string
 }
 
 // BuildNodeFromTemplate builds node from provided GCE template.
-func (t *GceTemplateBuilder) BuildNodeFromTemplate(mig Mig, template *gce.InstanceTemplate, cpu int64, mem int64) (*apiv1.Node, error) {
+func (t *GceTemplateBuilder) BuildNodeFromTemplate(mig Mig, template *gce.InstanceTemplate, cpu int64, mem int64, pods *int64) (*apiv1.Node, error) {
 
 	if template.Properties == nil {
 		return nil, fmt.Errorf("instance template %s has no properties", template.Name)
@@ -146,7 +150,7 @@ func (t *GceTemplateBuilder) BuildNodeFromTemplate(mig Mig, template *gce.Instan
 		return nil, fmt.Errorf("could not obtain os from kube-env from template metadata")
 	}
 
-	capacity, err := t.BuildCapacity(cpu, mem, template.Properties.GuestAccelerators, os)
+	capacity, err := t.BuildCapacity(cpu, mem, template.Properties.GuestAccelerators, os, pods)
 	if err != nil {
 		return nil, err
 	}

cluster-autoscaler/cloudprovider/gce/templates_test.go

@@ -35,6 +35,7 @@ import (
 )
 
 func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
+	var thirtyPodsPerNode int64 = 30
 	type testCase struct {
 		scenario       string
 		kubeEnv        string
@@ -46,6 +47,7 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 		reservedCpu    string
 		reservedMemory string
 		expectedErr    bool
+		pods           *int64
 	}
 	testCases := []testCase{
 		{
@@ -87,6 +89,14 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 			scenario:    "totally messed up kube-env",
 			kubeEnv:     "This kube-env is totally messed up",
 			expectedErr: true,
+		}, {
+			scenario:       "max pods per node specified",
+			kubeEnv:        "",
+			physicalCpu:    8,
+			physicalMemory: 200 * units.MiB,
+			pods:           &thirtyPodsPerNode,
+			kubeReserved:   false,
+			expectedErr:    false,
 		},
 	}
 	for _, tc := range testCases {
@@ -110,7 +120,7 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 			if tc.kubeEnv != "" {
 				template.Properties.Metadata.Items = []*gce.MetadataItems{{Key: "kube-env", Value: &tc.kubeEnv}}
 			}
-			node, err := tb.BuildNodeFromTemplate(mig, template, tc.physicalCpu, tc.physicalMemory)
+			node, err := tb.BuildNodeFromTemplate(mig, template, tc.physicalCpu, tc.physicalMemory, tc.pods)
 			if tc.expectedErr {
 				assert.Error(t, err)
 			} else {
@@ -119,7 +129,7 @@ func TestBuildNodeFromTemplateSetsResources(t *testing.T) {
 				assert.NotNil(t, node.Status)
 				assert.NotNil(t, node.Status.Capacity)
 				assert.NotNil(t, node.Status.Allocatable)
-				capacity, err := tb.BuildCapacity(tc.physicalCpu, tc.physicalMemory, tc.accelerators, OperatingSystemLinux)
+				capacity, err := tb.BuildCapacity(tc.physicalCpu, tc.physicalMemory, tc.accelerators, OperatingSystemLinux, tc.pods)
 				assert.NoError(t, err)
 				assertEqualResourceLists(t, "Capacity", capacity, node.Status.Capacity)
 				if !tc.kubeReserved {
@@ -361,7 +371,7 @@ func TestBuildCapacityMemory(t *testing.T) {
 		t.Run(fmt.Sprintf("%v", idx), func(t *testing.T) {
 			tb := GceTemplateBuilder{}
 			noAccelerators := make([]*gce.AcceleratorConfig, 0)
-			buildCapacity, err := tb.BuildCapacity(tc.physicalCpu, tc.physicalMemory, noAccelerators, tc.os)
+			buildCapacity, err := tb.BuildCapacity(tc.physicalCpu, tc.physicalMemory, noAccelerators, tc.os, nil)
 			assert.NoError(t, err)
 			expectedCapacity, err := makeResourceList2(tc.physicalCpu, tc.expectedCapacityMemory, 0, 110)
 			assert.NoError(t, err)