knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

references to client now faas root package

This commit is contained in:
Luke K 2020-05-11 00:21:17 +00:00
parent 724b64b51a
commit 33a86e6e91
No known key found for this signature in database
GPG Key ID: 4896F75BAF2E1966
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/describe.go
View File

@ -8,7 +8,7 @@ import (
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
"github.com/boson-project/faas/client" "github.com/boson-project/faas"
"github.com/boson-project/faas/knative" "github.com/boson-project/faas/knative"
"github.com/ory/viper" "github.com/ory/viper"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -37,15 +37,15 @@ func describe(cmd *cobra.Command, args []string) (err error) {
) )
name := args[0] name := args[0]
describer, err := knative.NewDescriber(client.DefaultNamespace) describer, err := knative.NewDescriber(faas.DefaultNamespace)
if err != nil { if err != nil {
return return
} }
describer.Verbose = verbose describer.Verbose = verbose
client, err := client.New(".", client, err := faas.New(".",
client.WithVerbose(verbose), faas.WithVerbose(verbose),
client.WithDescriber(describer), faas.WithDescriber(describer),
) )
if err != nil { if err != nil {
return return

4
kn/updater.go
View File

@ -8,7 +8,7 @@ import (
"os/exec" "os/exec"
"time" "time"
faasclient "github.com/boson-project/faas/client" "github.com/boson-project/faas"
"github.com/boson-project/faas/k8s" "github.com/boson-project/faas/k8s"
) )
@ -42,7 +42,7 @@ func (d *Updater) Update(name, image string) (err error) {
// TODO: use knative client directly. // TODO: use knative client directly.
// TODO: use tags and traffic splitting. // TODO: use tags and traffic splitting.
cmd := exec.Command("kn", "service", "update", project, "--env", timestamp, "--namespace", faasclient.DefaultNamespace) cmd := exec.Command("kn", "service", "update", project, "--env", timestamp, "--namespace", faas.DefaultNamespace)
// If verbose logging is enabled, echo appsody's chatty stdout. // If verbose logging is enabled, echo appsody's chatty stdout.
if d.Verbose { if d.Verbose {

11
knative/describer.go
View File

@ -2,7 +2,8 @@ package knative
import ( import (
"fmt" "fmt"
"github.com/boson-project/faas/client"
"github.com/boson-project/faas"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
@ -16,7 +17,7 @@ type Describer struct {
namespace string namespace string
servingClient *servingv1client.ServingV1alpha1Client servingClient *servingv1client.ServingV1alpha1Client
eventingClient *eventingv1client.EventingV1alpha1Client eventingClient *eventingv1client.EventingV1alpha1Client
config *rest.Config config *rest.Config
} }
func NewDescriber(namespace string) (describer *Describer, err error) { func NewDescriber(namespace string) (describer *Describer, err error) {
@ -45,7 +46,7 @@ func NewDescriber(namespace string) (describer *Describer, err error) {
return return
} }
func (describer *Describer) Describe(name string) (description client.FunctionDescription, err error) { func (describer *Describer) Describe(name string) (description faas.FunctionDescription, err error) {
namespace := describer.namespace namespace := describer.namespace
servingClient := describer.servingClient servingClient := describer.servingClient
@ -79,11 +80,11 @@ func (describer *Describer) Describe(name string) (description client.FunctionDe
} }
subscriptions := make([]client.Subscription, 0, len(triggers.Items)) subscriptions := make([]faas.Subscription, 0, len(triggers.Items))
for _, trigger := range triggers.Items { for _, trigger := range triggers.Items {
if triggerMatches(&trigger) { if triggerMatches(&trigger) {
filterAttrs := *trigger.Spec.Filter.Attributes filterAttrs := *trigger.Spec.Filter.Attributes
subscription := client.Subscription{ subscription := faas.Subscription{
Source: filterAttrs["source"], Source: filterAttrs["source"],
Type: filterAttrs["type"], Type: filterAttrs["type"],
Broker: trigger.Spec.Broker, Broker: trigger.Spec.Broker,

4
kubectl/deployer.go
View File

@ -11,7 +11,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
faasclient "github.com/boson-project/faas/client" "github.com/boson-project/faas"
"github.com/boson-project/faas/k8s" "github.com/boson-project/faas/k8s"
) )
@ -97,7 +97,7 @@ func (d *Deployer) Deploy(name, image string) (address string, err error) {
// Write out the final service yaml // Write out the final service yaml
err = t.Execute(f, map[string]string{ err = t.Execute(f, map[string]string{
"Project": project, "Project": project,
"Namespace": faasclient.DefaultNamespace, "Namespace": faas.DefaultNamespace,
"Subdomain": subdomain, "Subdomain": subdomain,
"Domain": domain, "Domain": domain,
"Image": image, "Image": image,

4
kubectl/remover.go
View File

@ -7,7 +7,7 @@ import (
"os" "os"
"os/exec" "os/exec"
faasclient "github.com/boson-project/faas/client" "github.com/boson-project/faas"
"github.com/boson-project/faas/k8s" "github.com/boson-project/faas/k8s"
) )
@ -39,7 +39,7 @@ func (d *Remover) Remove(name string) (err error) {
} }
// Command to run // Command to run
cmd := exec.Command("kubectl", "delete", "kservice", serviceName, "--namespace", faasclient.DefaultNamespace) cmd := exec.Command("kubectl", "delete", "kservice", serviceName, "--namespace", faas.DefaultNamespace)
// If verbose logging is enabled, echo appsody's chatty stdout. // If verbose logging is enabled, echo appsody's chatty stdout.
if d.Verbose { if d.Verbose {