A newdeploy backend which uses new deployment to serve requests. This is the second phase of #193 and builds on top of changes in #384 . * Executor layer added on top of pool manager * Removed the external server for executor * Minor changes to keep existing semantics as much possible * Separating the executor vs. poolmgr backend functionality and associated data members * Executor logic separated from Poolmgr backend completely, placeholder for new backend * Changed references to poolmgr in tests * Moved poolmgr to it's package, as a side effect moved Cache to its's package (was causing cyclical dependency) and had to make some data structures exposed outside package * Rebased from master and changed references to tpr -> crd * Executor layer added on top of pool manager * Executor logic separated from Poolmgr backend completely, placeholder for new backend * Changed podName to a generic objectReference in fscache (#391) Changed podName to a generic objectReference in function service cache implementation. * Moved poolmgr to it's package, as a side effect moved Cache to its's package (was causing cyclical dependency) and had to make some data structures exposed outside package * Rebased from master and changed references to tpr -> crd * Merged from master with latest changes * Executor layer added on top of pool manager * Removed the external server for executor * Minor changes to keep existing semantics as much possible * Separating the executor vs. poolmgr backend functionality and associated data members * Executor logic separated from Poolmgr backend completely, placeholder for new backend * Changed references to poolmgr in tests * update compiling.md to use helm * Compile instructions: changed pullPolicy to IfNotPresent (#378) Containers will get stuck in ErrImagePull/ImagePullBackOff state otherwise * Moved poolmgr to it's package, as a side effect moved Cache to its's package (was causing cyclical dependency) and had to make some data structures exposed outside package * Fetcher called when pod is created for newDeploy backend but also supports older way, this is WIP and still needs pod specialization and creating & exposing a service so the URL can be hit by end user * WIP Specializing the POD as part of startup along with fetching * Working specialization of a new deployment. Needs some work on caching, cleanup etc. * Switched to service based address instead of POD address * Minor formating issue fixed * Added logging to pods and a readiness check, the readiness check is flaky though ATM * Fixed some rebase issues that were failing build * Better names for K8S objects and methods * Switched usage of FuncSvc in backends from pod to api.ObjectReference * Adding retry to fetcher request, for now just using default retry client which might need tweaking in future * Switching to plain old retry, some issue in getting retryablehttp with glide import * Removed stale executor service & deployment from previous merge * Addressed review comments, still testing some areas * Added types in FunctionSpec * Resolved conflicts due to merge from executor_abstraction branch * Added backend type on EnvironmentSpec along with operations for create/list/update, the pools are created/destroyed based on change in backend type * Backend from types and a minor err return issue fixed * Draft version of CPU and memory parameters added to environment * Added resourceReq to newDeploy, though it has some issues * Issue with resourceName fixed, now newdeploy pods also pick up resources from the environment config * Adding scale params, removing validation on CPU params for now * Fixed a formatting issue * Checking if slight more delay helps in the test which is currently failing for internal routes * The resourceList newly added in Env can not be compared by compiler, hence must use breakdown comparison instead * Added strategy selection on client side * Added caching, informers, delete operations for newdeploy backend functions * Deleted a stale directory * A simple HPA based on scale parameters, testing still WIP * Fixed a small issue in delete function, added HPA delete too when deleting a function * Previous merge missed the pkg flag for update fn command somehow, fixed that * Fixed comments from review * Changed poolmgr cleanup to be generic cleanup and moved to executor, added instanceID labels to newdeploy so that cleanup works * Moved instanceIdLabel to types to avoid cyclic dependency * More review fixes * Tweaking sleep to see results * If user does not provide poolsize, then it should not default to zero * Switched to naming convention for now, fixed default poolsize if not provided * Changed error return behaviour in delete fn, also changed cleanup to look based on obj type though support for additional type will need more work * Changed check location so avoid false logging * Test for newdeploy backend * Adding tests for poolmgr backend * Fixed an issue with glide dependency version, already fixed in master * Added instanceId for NewDeploy, Initial cleanup now cleans older objects of newdeploy backend, removed eagercreate flag and instead using minScale to drive eager creation * Moved cleanup to executor layer with cleanup for newDeploy backend, changes to use the new Cache impl * Cleaning up pod & rs along with deployment for newdeploy backend * Enhanced fn and env listing to show min/maxscale and resuorces respectively * Added conditional heapster deployment and fixed a small issue with resources for fetcher container in function pod * Addressed review comments from previous change * Addressed some more review comments - majorly create only on NotFoundError * Added TargetCPU as an input for scaling * Bumped target CPU to be greater than 0 and added a default value * Min replicas should be 1 even if the minScale is 0 when creating deployment * Changed name from 'backend' to executorType, added additional test for minscale 0 case, changed TargetCPU to TargetCPUPercent
253 lines
6.1 KiB
Go
253 lines
6.1 KiB
Go
/*
|
|
Copyright 2016 The Fission Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strconv"
|
|
"text/tabwriter"
|
|
|
|
"github.com/urfave/cli"
|
|
"k8s.io/apimachinery/pkg/api/resource"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/pkg/api/v1"
|
|
|
|
"github.com/fission/fission"
|
|
"github.com/fission/fission/crd"
|
|
)
|
|
|
|
func envCreate(c *cli.Context) error {
|
|
client := getClient(c.GlobalString("server"))
|
|
|
|
envName := c.String("name")
|
|
if len(envName) == 0 {
|
|
fatal("Need a name, use --name.")
|
|
}
|
|
|
|
var poolsize int
|
|
if c.IsSet("poolsize") {
|
|
poolsize = c.Int("poolsize")
|
|
} else {
|
|
poolsize = 3
|
|
}
|
|
|
|
envImg := c.String("image")
|
|
if len(envImg) == 0 {
|
|
fatal("Need an image, use --image.")
|
|
}
|
|
|
|
envVersion := c.Int("version")
|
|
envBuilderImg := c.String("builder")
|
|
envBuildCmd := c.String("buildcmd")
|
|
|
|
if len(envBuilderImg) > 0 {
|
|
envVersion = 2
|
|
if len(envBuildCmd) == 0 {
|
|
envBuildCmd = "build"
|
|
}
|
|
}
|
|
|
|
resourceReq := getResourceReq(c.Int("mincpu"), c.Int("maxcpu"), c.Int("minmemory"), c.Int("maxmemory"))
|
|
|
|
// Environment API interface version is not specified and
|
|
// builder image is empty, set default interface version
|
|
if envVersion == 0 {
|
|
envVersion = 1
|
|
}
|
|
|
|
env := &crd.Environment{
|
|
Metadata: metav1.ObjectMeta{
|
|
Name: envName,
|
|
Namespace: metav1.NamespaceDefault,
|
|
},
|
|
Spec: fission.EnvironmentSpec{
|
|
Version: envVersion,
|
|
Runtime: fission.Runtime{
|
|
Image: envImg,
|
|
},
|
|
Builder: fission.Builder{
|
|
Image: envBuilderImg,
|
|
Command: envBuildCmd,
|
|
},
|
|
Poolsize: poolsize,
|
|
Resources: resourceReq,
|
|
},
|
|
}
|
|
|
|
_, err := client.EnvironmentCreate(env)
|
|
checkErr(err, "create environment")
|
|
|
|
fmt.Printf("environment '%v' created\n", envName)
|
|
return err
|
|
}
|
|
|
|
func envGet(c *cli.Context) error {
|
|
client := getClient(c.GlobalString("server"))
|
|
|
|
envName := c.String("name")
|
|
if len(envName) == 0 {
|
|
fatal("Need a name, use --name.")
|
|
}
|
|
|
|
m := &metav1.ObjectMeta{
|
|
Name: envName,
|
|
Namespace: metav1.NamespaceDefault,
|
|
}
|
|
env, err := client.EnvironmentGet(m)
|
|
checkErr(err, "get environment")
|
|
|
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
|
|
fmt.Fprintf(w, "%v\t%v\t%v\n", "NAME", "UID", "IMAGE")
|
|
fmt.Fprintf(w, "%v\t%v\t%v\n",
|
|
env.Metadata.Name, env.Metadata.UID, env.Spec.Runtime.Image)
|
|
w.Flush()
|
|
return nil
|
|
}
|
|
|
|
func envUpdate(c *cli.Context) error {
|
|
client := getClient(c.GlobalString("server"))
|
|
|
|
envName := c.String("name")
|
|
if len(envName) == 0 {
|
|
fatal("Need a name, use --name.")
|
|
}
|
|
|
|
envImg := c.String("image")
|
|
envBuilderImg := c.String("builder")
|
|
envBuildCmd := c.String("buildcmd")
|
|
|
|
if len(envImg) == 0 && len(envBuilderImg) == 0 && len(envBuildCmd) == 0 {
|
|
fatal("Need --image to specify env image, or use --builder to specify env builder, or use --buildcmd to specify new build command.")
|
|
}
|
|
|
|
env, err := client.EnvironmentGet(&metav1.ObjectMeta{
|
|
Name: envName,
|
|
Namespace: metav1.NamespaceDefault,
|
|
})
|
|
checkErr(err, "find environment")
|
|
|
|
if len(envImg) > 0 {
|
|
env.Spec.Runtime.Image = envImg
|
|
}
|
|
|
|
if env.Spec.Version == 1 && (len(envBuilderImg) > 0 || len(envBuildCmd) > 0) {
|
|
fatal("Version 1 Environments do not support builders. Must specify --version=2.")
|
|
}
|
|
|
|
if len(envBuilderImg) > 0 {
|
|
env.Spec.Builder.Image = envBuilderImg
|
|
}
|
|
if len(envBuildCmd) > 0 {
|
|
env.Spec.Builder.Command = envBuildCmd
|
|
}
|
|
|
|
if c.IsSet("poolsize") {
|
|
env.Spec.Poolsize = c.Int("poolsize")
|
|
}
|
|
|
|
_, err = client.EnvironmentUpdate(env)
|
|
checkErr(err, "update environment")
|
|
|
|
fmt.Printf("environment '%v' updated\n", envName)
|
|
return nil
|
|
}
|
|
|
|
func envDelete(c *cli.Context) error {
|
|
client := getClient(c.GlobalString("server"))
|
|
|
|
envName := c.String("name")
|
|
if len(envName) == 0 {
|
|
fatal("Need a name , use --name.")
|
|
}
|
|
|
|
m := &metav1.ObjectMeta{
|
|
Name: envName,
|
|
Namespace: metav1.NamespaceDefault,
|
|
}
|
|
err := client.EnvironmentDelete(m)
|
|
checkErr(err, "delete environment")
|
|
|
|
fmt.Printf("environment '%v' deleted\n", envName)
|
|
return nil
|
|
}
|
|
|
|
func envList(c *cli.Context) error {
|
|
client := getClient(c.GlobalString("server"))
|
|
|
|
envs, err := client.EnvironmentList()
|
|
checkErr(err, "list environments")
|
|
|
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
|
|
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "UID", "IMAGE", "POOLSIZE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY")
|
|
for _, env := range envs {
|
|
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
|
|
env.Metadata.Name, env.Metadata.UID, env.Spec.Runtime.Image, env.Spec.Poolsize,
|
|
env.Spec.Resources.Requests.Cpu(), env.Spec.Resources.Limits.Cpu(),
|
|
env.Spec.Resources.Requests.Memory(), env.Spec.Resources.Limits.Memory())
|
|
}
|
|
w.Flush()
|
|
|
|
return nil
|
|
}
|
|
|
|
func getResourceReq(mincpu int, maxcpu int, minmem int, maxmem int) v1.ResourceRequirements {
|
|
|
|
requestResources := make(map[v1.ResourceName]resource.Quantity)
|
|
|
|
if mincpu != 0 {
|
|
cpuRequest, err := resource.ParseQuantity(strconv.Itoa(mincpu) + "m")
|
|
if err != nil {
|
|
fatal("Failed to parse mincpu")
|
|
}
|
|
requestResources[v1.ResourceCPU] = cpuRequest
|
|
}
|
|
|
|
if minmem != 0 {
|
|
memRequest, err := resource.ParseQuantity(strconv.Itoa(minmem) + "Mi")
|
|
if err != nil {
|
|
fatal("Failed to parse minmemory")
|
|
}
|
|
requestResources[v1.ResourceMemory] = memRequest
|
|
}
|
|
|
|
limitResources := make(map[v1.ResourceName]resource.Quantity)
|
|
|
|
if maxcpu != 0 {
|
|
cpuLimit, err := resource.ParseQuantity(strconv.Itoa(maxcpu) + "m")
|
|
if err != nil {
|
|
fatal("Failed to parse maxcpu")
|
|
}
|
|
limitResources[v1.ResourceCPU] = cpuLimit
|
|
}
|
|
|
|
if maxmem != 0 {
|
|
memLimit, err := resource.ParseQuantity(strconv.Itoa(maxmem) + "Mi")
|
|
if err != nil {
|
|
fatal("Failed to parse maxmemory")
|
|
}
|
|
limitResources[v1.ResourceMemory] = memLimit
|
|
}
|
|
|
|
resources := v1.ResourceRequirements{
|
|
Requests: requestResources,
|
|
Limits: limitResources,
|
|
}
|
|
|
|
return resources
|
|
}
|