Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Kubernetes Client instead of Controller APIs from CLI (#2605)

Browse Source 
Use the Kubernetes and Fission Client from CLI instead of Controller API.
This removes port-forwarding for the controller across Fission CLI mostly.

* Use configurable client in CLI
* Move resource namespace under cmd client
* use server to get fission version
* get archive with URL

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
neha_gupta
2022-11-07 21:42:39 +05:30
committed by GitHub
co-authored by Sanket Sudake
parent 261bf24974
commit b71a36dc1c
86 changed files with 1115 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/timetrigger/create.go
+3 -15
View File
@@ -28,7 +28,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/core/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd/spec"
"github.com/fission/fission/pkg/fission-cli/console"
@@ -68,7 +67,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) (err error) {
return errors.New("Need a function name to create a trigger, use --function")
}
userProvidedNS, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
userProvidedNS, fnNamespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
@@ -143,17 +142,14 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return nil
}
_, err := opts.Client().V1().TimeTrigger().Create(opts.trigger)
_, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(opts.trigger.Namespace).Create(input.Context(), opts.trigger, metav1.CreateOptions{})
if err != nil {
return errors.Wrap(err, "error creating Time trigger")
}
fmt.Printf("trigger '%v' created\n", opts.trigger.ObjectMeta.Name)
t, err := getAPITimeInfo(opts.Client())
if err != nil {
return err
}
t := util.GetServerInfo(input, opts.Client()).ServerTime.CurrentTime.UTC()
err = getCronNextNActivationTime(opts.trigger.Spec.Cron, t, 1)
if err != nil {
@@ -163,14 +159,6 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return nil
}
func getAPITimeInfo(client client.Interface) (time.Time, error) {
serverInfo, err := client.V1().Misc().ServerInfo()
if err != nil {
return time.Time{}, errors.Errorf("Error syncing server time information: %v", err)
}
return serverInfo.ServerTime.CurrentTime, nil
}
func getCronNextNActivationTime(cronSpec string, serverTime time.Time, round int) error {
sched, err := cron.Parse(cronSpec)
if err != nil {
pkg/fission-cli/cmd/timetrigger/delete.go
+5 -9
View File
@@ -20,12 +20,12 @@ import (
"fmt"
"github.com/pkg/errors"
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type DeleteSubCommand struct {
@@ -38,23 +38,19 @@ func Delete(input cli.Input) error {
func (opts *DeleteSubCommand) do(input cli.Input) (err error) {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
_, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
m := &metav1.ObjectMeta{
Name: input.String(flagkey.TtName),
Namespace: namespace,
}
err = opts.Client().V1().TimeTrigger().Delete(m)
err = opts.Client().FissionClientSet.CoreV1().TimeTriggers(namespace).Delete(input.Context(), input.String(flagkey.TtName), metav1.DeleteOptions{})
if err != nil {
if input.Bool(flagkey.IgnoreNotFound) && util.IsNotFound(err) {
if input.Bool(flagkey.IgnoreNotFound) && kerrors.IsNotFound(err) {
return nil
}
return errors.Wrap(err, "error deleting trigger")
}
fmt.Printf("trigger '%v' deleted\n", m.Name)
fmt.Printf("trigger '%v' deleted\n", input.String(flagkey.TtName))
return nil
}
pkg/fission-cli/cmd/timetrigger/list.go
+5 -8
View File
@@ -22,12 +22,11 @@ import (
"text/tabwriter"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/fission/fission/pkg/apis/core/v1"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type ListSubCommand struct {
@@ -39,17 +38,15 @@ func List(input cli.Input) error {
}
func (opts *ListSubCommand) do(input cli.Input) (err error) {
_, ttNs, err := util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
_, ttNs, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
var tts []v1.TimeTrigger
if input.Bool(flagkey.AllNamespaces) {
tts, err = opts.Client().V1().TimeTrigger().List("")
} else {
tts, err = opts.Client().V1().TimeTrigger().List(ttNs)
ttNs = metav1.NamespaceAll
}
tts, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(ttNs).List(input.Context(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "list Time triggers")
@@ -58,7 +55,7 @@ func (opts *ListSubCommand) do(input cli.Input) (err error) {
w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
fmt.Fprintf(w, "%v\t%v\t%v\n", "NAME", "CRON", "FUNCTION_NAME")
for _, tt := range tts {
for _, tt := range tts.Items {
fmt.Fprintf(w, "%v\t%v\t%v\n",
tt.ObjectMeta.Name, tt.Spec.Cron, tt.Spec.FunctionReference.Name)
}
pkg/fission-cli/cmd/timetrigger/test.go
+3 -5
View File
@@ -22,6 +22,7 @@ import (
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type ShowSubCommand struct {
@@ -44,12 +45,9 @@ func (opts *ShowSubCommand) run(flaginput cli.Input) error {
return errors.New("need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
}
t, err := getAPITimeInfo(opts.Client())
if err != nil {
return err
}
t := util.GetServerInfo(flaginput, opts.Client()).ServerTime.CurrentTime.UTC()
err = getCronNextNActivationTime(cronSpec, t, round)
err := getCronNextNActivationTime(cronSpec, t, round)
if err != nil {
return errors.Wrap(err, "error passing cron spec examination")
}
pkg/fission-cli/cmd/timetrigger/update.go
+6 -8
View File
@@ -48,14 +48,12 @@ func (opts *UpdateSubCommand) do(input cli.Input) error {
}
func (opts *UpdateSubCommand) complete(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
_, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
tt, err := opts.Client().V1().TimeTrigger().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.TtName),
Namespace: namespace,
})
tt, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(namespace).Get(input.Context(), input.String(flagkey.TtName), metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "error getting time trigger")
}
@@ -70,7 +68,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
fnName := input.String("function")
if len(fnName) > 0 {
functionList := []string{fnName}
err := util.CheckFunctionExistence(opts.Client(), functionList, namespace)
err := util.CheckFunctionExistence(input.Context(), opts.Client(), functionList, namespace)
if err != nil {
console.Warn(err.Error())
}
@@ -88,14 +86,14 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
}
func (opts *UpdateSubCommand) run(input cli.Input) error {
_, err := opts.Client().V1().TimeTrigger().Update(opts.trigger)
_, err := opts.Client().FissionClientSet.CoreV1().TimeTriggers(opts.trigger.ObjectMeta.Namespace).Update(input.Context(), opts.trigger, metav1.UpdateOptions{})
if err != nil {
return errors.Wrap(err, "error updating Time trigger")
}
fmt.Printf("trigger '%v' updated\n", opts.trigger.ObjectMeta.Name)
t, err := getAPITimeInfo(opts.Client())
t := util.GetServerInfo(input, opts.Client()).ServerTime.CurrentTime.UTC()
if err != nil {
return err
}