Soam VasaniandGitHub
e238776bf7
This changes the core fission function, environment and trigger types. It also changes Fission's storage to use ThirdPartyResources. - Functions are now specified by packages. Functions can also have both source and deployment packages. A package can be specified by a literal, or by a URL. - Environments have a build and runtime component. - Triggers reference functions by a FunctionReference. This is a layer of indirection between triggers and functions, and will allow things like incremental function upgrades in future releases. See Documentation/wip/env-v2.md for design discussion about points 1 and 2. Changes: * V2 Types All types now have a spec, following the pattern of K8s objects. Functions now have source and deployment packages. A Package can be specified by literal, or by URL. Environments now have a builder and runtime component. All triggers use a new FunctionReference to specify the function. This for now only uses a function name, but in the future can be extended to be more flexible. A new FunctionLoadRequest type is added for specialization requests to the environment runtime. * TPR types, TPR init code, and a "fission client" Implements TPR types using the spec types in fission/types.go. Adds code for adding creating TPR types, and convenient types for crud operations on each of our resource types. Adds code for connecting to K8s API and configuring a REST client with fission types set up. * Change old stateful controller into a thin apiserver This apiserver is now simply a stateless api layer on top of the TPR types. At the moment it doesn't do anything that couldn't be done by simply talking to the TPR types. In the future we can have better validation and potentially some higher level APIs (like versioning for example) in here. * Split controller client into files and update for v2 types. * Update CLI for v2 types. As far as possible we keep the CLI flags the same. We'll have to add flags for source/deploy packages and builder/runtime environments. That will come in the next change. * Update poolmgr and fetcher for v2 types. Also adds a poolmgr_test. * Update router for new types. Also adds a function reference resolver, which separates out the job of resolving a FunctionReference to a function. * Update kubewatcher and timer for v2 types. * Update Message Queue trigger type for v2 types. * Minor odds and ends. * Fission bundle CLI updates Remove controllerUrl flag, since we don't need it any more. * Remove etcd deployment (replaced by storing state in TPR) Also update the poolmgr commandline, and use an env var for the fetcher image URL. * Explicit ChecksumType and consts * Clarify separation of environment interface types
115 lines
2.5 KiB
Go
115 lines
2.5 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 client
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"log"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"time"
|
|
|
|
"k8s.io/client-go/1.5/pkg/api"
|
|
|
|
"github.com/fission/fission"
|
|
)
|
|
|
|
type Client struct {
|
|
poolmgrUrl string
|
|
tappedByUrl map[string]bool
|
|
requestChan chan string
|
|
}
|
|
|
|
func MakeClient(poolmgrUrl string) *Client {
|
|
c := &Client{
|
|
poolmgrUrl: strings.TrimSuffix(poolmgrUrl, "/"),
|
|
tappedByUrl: make(map[string]bool),
|
|
requestChan: make(chan string),
|
|
}
|
|
go c.service()
|
|
return c
|
|
}
|
|
|
|
func (c *Client) GetServiceForFunction(metadata *api.ObjectMeta) (string, error) {
|
|
poolmgrUrl := c.poolmgrUrl + "/v2/getServiceForFunction"
|
|
|
|
body, err := json.Marshal(metadata)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
resp, err := http.Post(poolmgrUrl, "application/json", bytes.NewReader(body))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode != 200 {
|
|
return "", fission.MakeErrorFromHTTP(resp)
|
|
}
|
|
|
|
svcName, err := ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return string(svcName), nil
|
|
}
|
|
|
|
func (c *Client) service() {
|
|
ticker := time.NewTicker(time.Second * 5)
|
|
for {
|
|
select {
|
|
case serviceUrl := <-c.requestChan:
|
|
c.tappedByUrl[serviceUrl] = true
|
|
case <-ticker.C:
|
|
urls := c.tappedByUrl
|
|
c.tappedByUrl = make(map[string]bool)
|
|
if len(urls) > 0 {
|
|
go func() {
|
|
for u := range c.tappedByUrl {
|
|
c._tapService(u)
|
|
}
|
|
log.Printf("Tapped %v services in batch", len(urls))
|
|
}()
|
|
log.Printf("Tapped %v services in batch", len(urls))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *Client) TapService(serviceUrl *url.URL) {
|
|
c.requestChan <- serviceUrl.String()
|
|
}
|
|
|
|
func (c *Client) _tapService(serviceUrlStr string) error {
|
|
poolmgrUrl := c.poolmgrUrl + "/v2/tapService"
|
|
|
|
resp, err := http.Post(poolmgrUrl, "application/octet-stream", bytes.NewReader([]byte(serviceUrlStr)))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != 200 {
|
|
return fission.MakeErrorFromHTTP(resp)
|
|
}
|
|
return nil
|
|
}
|