mirror of
https://github.com/openfaas/faasd.git
synced 2025-06-09 00:16:46 +00:00
Extend the Function type with a memoryLimit field, create a conversion to k8s resource value and return it through the REST API.
Signed-off-by: Shikachuu <zcmate@gmail.com>
This commit is contained in:
parent
ea62c1b12d
commit
cbfefb6fa5
@ -29,6 +29,7 @@ type Function struct {
|
|||||||
secrets []string
|
secrets []string
|
||||||
envVars map[string]string
|
envVars map[string]string
|
||||||
envProcess string
|
envProcess string
|
||||||
|
memoryLimit int64
|
||||||
createdAt time.Time
|
createdAt time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,6 +113,7 @@ func GetFunction(client *containerd.Client, name string, namespace string) (Func
|
|||||||
fn.envVars = envVars
|
fn.envVars = envVars
|
||||||
fn.envProcess = envProcess
|
fn.envProcess = envProcess
|
||||||
fn.createdAt = info.CreatedAt
|
fn.createdAt = info.CreatedAt
|
||||||
|
fn.memoryLimit = *spec.Linux.Resources.Memory.Limit
|
||||||
|
|
||||||
replicas := 0
|
replicas := 0
|
||||||
task, err := c.Task(ctx, nil)
|
task, err := c.Task(ctx, nil)
|
||||||
|
@ -2,6 +2,7 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
@ -37,6 +38,7 @@ func MakeReadHandler(client *containerd.Client) func(w http.ResponseWriter, r *h
|
|||||||
for _, fn := range fns {
|
for _, fn := range fns {
|
||||||
annotations := &fn.annotations
|
annotations := &fn.annotations
|
||||||
labels := &fn.labels
|
labels := &fn.labels
|
||||||
|
memory := resource.NewQuantity(fn.memoryLimit, resource.BinarySI)
|
||||||
res = append(res, types.FunctionStatus{
|
res = append(res, types.FunctionStatus{
|
||||||
Name: fn.name,
|
Name: fn.name,
|
||||||
Image: fn.image,
|
Image: fn.image,
|
||||||
@ -47,6 +49,7 @@ func MakeReadHandler(client *containerd.Client) func(w http.ResponseWriter, r *h
|
|||||||
Secrets: fn.secrets,
|
Secrets: fn.secrets,
|
||||||
EnvVars: fn.envVars,
|
EnvVars: fn.envVars,
|
||||||
EnvProcess: fn.envProcess,
|
EnvProcess: fn.envProcess,
|
||||||
|
Limits: &types.FunctionResources{Memory: memory.String()},
|
||||||
CreatedAt: fn.createdAt,
|
CreatedAt: fn.createdAt,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user