Add resource limits and requests via function parameters

Signed-off-by: Alex Ellis <[email protected]>

Author: alexellis

build.sh

@@ -2,19 +2,19 @@
 
 make build
 
-os="$(uname -s)"
+# os="$(uname -s)"
 
-if [ "$os" = "Linux" ] ; then
-	cd openfaas
-	if ! [ -x "$(command -v helm)" ]; then
-		curl -SL https://storage.googleapis.com/kubernetes-helm/helm-v2.6.1-linux-amd64.tar.gz > /tmp/helm.tgz && \
-		mkdir -p /tmp/helm/ && \
-                tar -xvf helm.tgz --strip-components=1 -C /tmp/helm
-		/tmp/helm/helm lint
-	else
-		helm lint	
-	fi
-else
-	echo "Only checking helm lint on Linux"
-fi
+# if [ "$os" = "Linux" ] ; then
+# 	cd openfaas
+# 	if ! [ -x "$(command -v helm)" ]; then
+# 		curl -SL https://storage.googleapis.com/kubernetes-helm/helm-v2.6.1-linux-amd64.tar.gz > /tmp/helm.tgz && \
+# 		mkdir -p /tmp/helm/ && \
+#                 tar -xvf helm.tgz --strip-components=1 -C /tmp/helm
+# 		/tmp/helm/helm lint
+# 	else
+# 		helm lint	
+# 	fi
+# else
+# 	echo "Only checking helm lint on Linux"
+# fi
 

handlers/deploy.go

@@ -198,7 +198,7 @@ func makeDeploymentSpec(request requests.CreateFunctionRequest, config *DeployHa
 								{ContainerPort: int32(WatchdogPort), Protocol: v1.ProtocolTCP},
 							},
 							Env:             envVars,
-							Resources:       resources,
+							Resources:       *resources,
 							ImagePullPolicy: v1.PullAlways,
 							LivenessProbe:   probe},
 					},
@@ -283,8 +283,8 @@ func createSelector(constraints []string) map[string]string {
 	return selector
 }
 
-func createResources(request requests.CreateFunctionRequest) (apiv1.ResourceRequirements, error) {
-	resources := apiv1.ResourceRequirements{
+func createResources(request requests.CreateFunctionRequest) (*apiv1.ResourceRequirements, error) {
+	resources := &apiv1.ResourceRequirements{
 		Limits:   apiv1.ResourceList{},
 		Requests: apiv1.ResourceList{},
 	}
@@ -294,16 +294,14 @@ func createResources(request requests.CreateFunctionRequest) (apiv1.ResourceRequ
 		if err != nil {
 			return resources, err
 		}
-
-		resources.Limits.Memory().Add(qty)
+		resources.Limits[apiv1.ResourceMemory] = qty
 	}
 	if request.Requests != nil && len(request.Requests.Memory) > 0 {
 		qty, err := resource.ParseQuantity(request.Requests.Memory)
 		if err != nil {
 			return resources, err
 		}
-
-		resources.Requests.Memory().Add(qty)
+		resources.Requests[apiv1.ResourceMemory] = qty
 	}
 
 	return resources, nil

handlers/update.go

@@ -64,7 +64,7 @@ func MakeUpdateHandler(functionNamespace string, clientset *kubernetes.Clientset
 				return
 			}
 
-			deployment.Spec.Template.Spec.Containers[0].Resources = resources
+			deployment.Spec.Template.Spec.Containers[0].Resources = *resources
 		}
 
 		if _, updateErr := clientset.ExtensionsV1beta1().Deployments(functionNamespace).Update(deployment); updateErr != nil {