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

add namespace param for fn and env (#2556)

Browse Source 
This PR moves fission CLI as closer as possible to kubectl command behaviour.  We have improved namespace handling behaviour across CLI.

* add namespace param for fn and env
* use common fn for ns check
* update validation
* default namespace for httpTrigger, env and package, config and triggers
* use default ns
* add namespace filter to spec
* add forceNamespace flag
* set current namespace
* add default namespace in config
* add namespace specific destroy
* add all namespace in the list of resources
* add namespace as global tag
* use %s instead of %v
* add test cases for namespace
* use ns in get all functions
This commit is contained in:
neha_gupta
2022-10-11 13:23:47 +05:30
committed by GitHub
parent 0739aca920
commit b9513868ed
74 changed files with 1289 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/httptrigger/command.go
+1 -1
View File
@@ -79,7 +79,7 @@ func Commands() *cobra.Command {
RunE: wrapper.Wrapper(List),
}
wrapper.SetFlags(listCmd, flag.FlagSet{
Optional: []flag.Flag{flag.NamespaceTrigger, flag.HtFnFilter},
Optional: []flag.Flag{flag.NamespaceTrigger, flag.HtFnFilter, flag.AllNamespaces},
})
command := &cobra.Command{
pkg/fission-cli/cmd/httptrigger/create.go
+34 -17
View File
@@ -76,19 +76,10 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
triggerName = id.String()
}
fnNamespace := input.String(flagkey.NamespaceFunction)
m := &metav1.ObjectMeta{
Name: triggerName,
Namespace: fnNamespace,
}
htTrigger, err := opts.Client().V1().HTTPTrigger().Get(m)
if err != nil && !ferror.IsNotFound(err) {
return err
}
if htTrigger != nil {
return errors.New("duplicate trigger exists, choose a different name or leave it empty for fission to auto-generate it")
userProvidedNS, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
triggerUrl := input.String(flagkey.HtUrl)
@@ -130,9 +121,24 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
return err
}
}
m := metav1.ObjectMeta{
Name: triggerName,
Namespace: userProvidedNS,
}
console.Warn(fmt.Sprintf("Ns: %v", userProvidedNS))
// For Specs, the spec validate checks for function reference
if input.Bool(flagkey.SpecSave) {
htTrigger, err := opts.Client().V1().HTTPTrigger().Get(&m)
if err != nil && !ferror.IsNotFound(err) {
return err
}
if htTrigger != nil {
return errors.New("duplicate trigger exists, choose a different name or leave it empty for fission to auto-generate it")
}
specDir := util.GetSpecDir(input)
specIgnore := util.GetSpecIgnore(input)
fr, err := spec.ReadSpecs(specDir, specIgnore, false)
@@ -143,7 +149,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
exists, err := fr.ExistsInSpecs(fv1.Function{
ObjectMeta: metav1.ObjectMeta{
Name: fn,
Namespace: fnNamespace,
Namespace: userProvidedNS,
},
})
if err != nil {
@@ -155,6 +161,20 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
}
} else {
m = metav1.ObjectMeta{
Name: triggerName,
Namespace: fnNamespace,
}
htTrigger, err := opts.Client().V1().HTTPTrigger().Get(&m)
if err != nil && !ferror.IsNotFound(err) {
return err
}
if htTrigger != nil {
return errors.New("duplicate trigger exists, choose a different name or leave it empty for fission to auto-generate it")
}
err = util.CheckFunctionExistence(opts.Client(), functionList, fnNamespace)
if err != nil {
console.Warn(err.Error())
@@ -172,10 +192,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
host := input.String(flagkey.HtHost)
opts.trigger = &fv1.HTTPTrigger{
ObjectMeta: metav1.ObjectMeta{
Name: triggerName,
Namespace: fnNamespace,
},
ObjectMeta: m,
Spec: fv1.HTTPTriggerSpec{
Host: host,
RelativeURL: triggerUrl,
pkg/fission-cli/cmd/httptrigger/delete.go
+6 -2
View File
@@ -49,7 +49,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) error {
return opts.run(input)
}
func (opts *DeleteSubCommand) complete(input cli.Input) error {
func (opts *DeleteSubCommand) complete(input cli.Input) (err error) {
opts.triggerName = input.String(flagkey.HtName)
opts.functionName = input.String(flagkey.HtFnName)
if len(opts.triggerName) == 0 && len(opts.functionName) == 0 {
@@ -57,7 +57,11 @@ func (opts *DeleteSubCommand) complete(input cli.Input) error {
} else if len(opts.triggerName) > 0 && len(opts.functionName) > 0 {
return errors.Errorf("need either of --%v or --%v and not both arguments", flagkey.HtName, flagkey.HtFnName)
}
opts.namespace = input.String(flagkey.NamespaceTrigger)
_, opts.namespace, err = util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
return nil
}
pkg/fission-cli/cmd/httptrigger/get.go
+11 -5
View File
@@ -29,6 +29,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 GetSubCommand struct {
@@ -43,10 +44,15 @@ func (opts *GetSubCommand) do(input cli.Input) error {
return opts.run(input)
}
func (opts *GetSubCommand) run(input cli.Input) error {
func (opts *GetSubCommand) run(input cli.Input) (err error) {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
m := &metav1.ObjectMeta{
Name: input.String(flagkey.HtName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
}
ht, err := opts.Client().V1().HTTPTrigger().Get(m)
if err != nil {
@@ -60,7 +66,7 @@ func (opts *GetSubCommand) run(input cli.Input) error {
func printHtSummary(triggers []fv1.HTTPTrigger) {
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\t%v\n", "NAME", "METHOD", "URL", "FUNCTION(s)", "INGRESS", "HOST", "PATH", "TLS", "ANNOTATIONS")
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "METHOD", "URL", "FUNCTION(s)", "INGRESS", "HOST", "PATH", "TLS", "ANNOTATIONS", "NAMESPACE")
for _, trigger := range triggers {
function := ""
if trigger.Spec.FunctionReference.Type == fv1.FunctionReferenceTypeFunctionName {
@@ -93,8 +99,8 @@ func printHtSummary(triggers []fv1.HTTPTrigger) {
if len(trigger.Spec.Methods) > 0 {
methods = trigger.Spec.Methods
}
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
trigger.ObjectMeta.Name, methods, trigger.Spec.RelativeURL, function, trigger.Spec.CreateIngress, host, path, trigger.Spec.IngressConfig.TLS, ann)
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
trigger.ObjectMeta.Name, methods, trigger.Spec.RelativeURL, function, trigger.Spec.CreateIngress, host, path, trigger.Spec.IngressConfig.TLS, ann, trigger.ObjectMeta.Namespace)
}
w.Flush()
}
pkg/fission-cli/cmd/httptrigger/list.go
+15 -2
View File
@@ -23,6 +23,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 ListSubCommand struct {
@@ -37,8 +38,20 @@ func (opts *ListSubCommand) do(input cli.Input) error {
return opts.run(input)
}
func (opts *ListSubCommand) run(input cli.Input) error {
hts, err := opts.Client().V1().HTTPTrigger().List(input.String(flagkey.NamespaceTrigger))
func (opts *ListSubCommand) run(input cli.Input) (err error) {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
var hts []fv1.HTTPTrigger
if input.Bool(flagkey.AllNamespaces) {
hts, err = opts.Client().V1().HTTPTrigger().List("")
} else {
hts, err = opts.Client().V1().HTTPTrigger().List(namespace)
}
if err != nil {
return errors.Wrap(err, "error listing HTTP triggers")
}
pkg/fission-cli/cmd/httptrigger/update.go
+6 -2
View File
@@ -48,9 +48,13 @@ func (opts *UpdateSubCommand) do(input cli.Input) error {
return opts.run(input)
}
func (opts *UpdateSubCommand) complete(input cli.Input) error {
func (opts *UpdateSubCommand) complete(input cli.Input) (err error) {
htName := input.String(flagkey.HtName)
triggerNamespace := input.String(flagkey.NamespaceTrigger)
_, triggerNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceTrigger)
if err != nil {
return errors.Wrap(err, "error in deleting function ")
}
ht, err := opts.Client().V1().HTTPTrigger().Get(&metav1.ObjectMeta{
Name: htName,