Merge pull request #6706 from granular-ryanbonham/apiserver_cpurequest

Add ability to specify cpuRequest for API Server

nodeup/pkg/model/kube_apiserver.go

@@ -387,6 +387,11 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
 		probeAction.Scheme = v1.URISchemeHTTPS
 	}
 
+	requestCPU := resource.MustParse("150m")
+	if b.Cluster.Spec.KubeAPIServer.CPURequest != "" {
+		requestCPU = resource.MustParse(b.Cluster.Spec.KubeAPIServer.CPURequest)
+	}
+
 	container := &v1.Container{
 		Name:  "kube-apiserver",
 		Image: b.Cluster.Spec.KubeAPIServer.Image,
@@ -416,7 +421,7 @@ func (b *KubeAPIServerBuilder) buildPod() (*v1.Pod, error) {
 		},
 		Resources: v1.ResourceRequirements{
 			Requests: v1.ResourceList{
-				v1.ResourceCPU: resource.MustParse("150m"),
+				v1.ResourceCPU: requestCPU,
 			},
 		},
 	}

pkg/apis/kops/componentconfig.go

@@ -417,6 +417,9 @@ type KubeAPIServerConfig struct {
 	// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.
 	// If unspecified, --tls-private-key-file is used.
 	ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`
+
+	// CPURequest, cpu request compute resource for api server. Defaults to "150m"
+	CPURequest string `json:"cpuRequest,omitempty"`
 }
 
 // KubeControllerManagerConfig is the configuration for the controller

pkg/apis/kops/v1alpha1/componentconfig.go

@@ -417,6 +417,9 @@ type KubeAPIServerConfig struct {
 	// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.
 	// If unspecified, --tls-private-key-file is used.
 	ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`
+
+	// CPURequest, cpu request compute resource for api server. Defaults to "150m"
+	CPURequest string `json:"cpuRequest,omitempty"`
 }
 
 // KubeControllerManagerConfig is the configuration for the controller

pkg/apis/kops/v1alpha1/zz_generated.conversion.go

@@ -2987,6 +2987,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
 	out.MinRequestTimeout = in.MinRequestTimeout
 	out.TargetRamMb = in.TargetRamMb
 	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
+	out.CPURequest = in.CPURequest
 	return nil
 }
 
@@ -3074,6 +3075,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
 	out.MinRequestTimeout = in.MinRequestTimeout
 	out.TargetRamMb = in.TargetRamMb
 	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
+	out.CPURequest = in.CPURequest
 	return nil
 }
 

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -417,6 +417,9 @@ type KubeAPIServerConfig struct {
 	// The specified file can contain multiple keys, and the flag can be specified multiple times with different files.
 	// If unspecified, --tls-private-key-file is used.
 	ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`
+
+	// CPURequest, cpu request compute resource for api server. Defaults to "150m"
+	CPURequest string `json:"cpuRequest,omitempty"`
 }
 
 // KubeControllerManagerConfig is the configuration for the controller

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -3257,6 +3257,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
 	out.MinRequestTimeout = in.MinRequestTimeout
 	out.TargetRamMb = in.TargetRamMb
 	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
+	out.CPURequest = in.CPURequest
 	return nil
 }
 
@@ -3344,6 +3345,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
 	out.MinRequestTimeout = in.MinRequestTimeout
 	out.TargetRamMb = in.TargetRamMb
 	out.ServiceAccountKeyFile = in.ServiceAccountKeyFile
+	out.CPURequest = in.CPURequest
 	return nil
 }