Browse code

Merge pull request #8495 from JacobTanenbaum/8328

Merged by openshift-bot

OpenShift Bot authored on 2016/04/28 08:46:20
Showing 1 changed files
... ...
@@ -14,6 +14,7 @@ import (
14 14
 
15 15
 	kapi "k8s.io/kubernetes/pkg/api"
16 16
 	"k8s.io/kubernetes/pkg/api/errors"
17
+	"k8s.io/kubernetes/pkg/api/resource"
17 18
 	"k8s.io/kubernetes/pkg/client/restclient"
18 19
 	kclient "k8s.io/kubernetes/pkg/client/unversioned"
19 20
 	kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
... ...
@@ -671,6 +672,12 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out io.Writer, cfg *
671 671
 			ReadinessProbe:  readinessProbe,
672 672
 			ImagePullPolicy: kapi.PullIfNotPresent,
673 673
 			VolumeMounts:    mounts,
674
+			Resources: kapi.ResourceRequirements{
675
+				Requests: kapi.ResourceList{
676
+					kapi.ResourceCPU:    resource.MustParse("100m"),
677
+					kapi.ResourceMemory: resource.MustParse("256Mi"),
678
+				},
679
+			},
674 680
 		},
675 681
 	}
676 682