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/function/command.go
+2 -3
View File
@@ -49,8 +49,7 @@ func Commands() *cobra.Command {
flag.RunTimeMinCPU, flag.RunTimeMaxCPU, flag.RunTimeMinMemory,
flag.RunTimeMaxMemory, flag.ReplicasMin,
flag.ReplicasMax, flag.RunTimeTargetCPU,
flag.NamespaceFunction, flag.NamespaceEnvironment, flag.SpecSave, flag.SpecDry},
flag.NamespaceFunction, flag.SpecSave, flag.SpecDry},
})
getCmd := &cobra.Command{
@@ -121,7 +120,7 @@ func Commands() *cobra.Command {
RunE: wrapper.Wrapper(List),
}
wrapper.SetFlags(listCmd, flag.FlagSet{
Optional: []flag.Flag{flag.NamespaceFunction},
Optional: []flag.Flag{flag.NamespaceFunction, flag.AllNamespaces},
})
logsCmd := &cobra.Command{
pkg/fission-cli/cmd/function/create.go
+59 -36
View File
@@ -64,14 +64,17 @@ func (opts *CreateSubCommand) do(input cli.Input) error {
func (opts *CreateSubCommand) complete(input cli.Input) error {
fnName := input.String(flagkey.FnName)
fnNamespace := input.String(flagkey.NamespaceFunction)
envNamespace := input.String(flagkey.NamespaceEnvironment)
userProvidedNS, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error retrieving namespace information")
}
// user wants a spec, create a yaml file with package and function
toSpec := false
if input.Bool(flagkey.SpecSave) {
toSpec = true
opts.specFile = fmt.Sprintf("function-%v.yaml", fnName)
opts.specFile = fmt.Sprintf("function-%s.yaml", fnName)
}
specDir := util.GetSpecDir(input)
specIgnore := util.GetSpecIgnore(input)
@@ -80,7 +83,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
// check for unique function names within a namespace
fn, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: fnNamespace,
})
if err != nil && !ferror.IsNotFound(err) {
return err
@@ -135,17 +138,19 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
fr, err := spec.ReadSpecs(specDir, specIgnore, false)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("error reading spec in '%v'", specDir))
return errors.Wrap(err, fmt.Sprintf("error reading spec in '%s'", specDir))
}
obj := fr.SpecExists(&fv1.Package{
obj := fr.SpecExists(&fv1.Package{ // In case of spec I might or might not have the `fnNamespace`, how will I get pkg objectMeta here.
ObjectMeta: metav1.ObjectMeta{
Name: pkgName,
Namespace: fnNamespace,
Namespace: userProvidedNS,
},
}, true, false)
if obj == nil {
return errors.Errorf("please create package %v spec file before referencing it", pkgName)
return errors.Errorf("please create package %s spec file with namespace %s before referencing it", pkgName, userProvidedNS)
}
pkg = obj.(*fv1.Package)
pkgMetadata = &pkg.ObjectMeta
} else {
@@ -155,7 +160,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
Name: pkgName,
})
if err != nil {
return errors.Wrap(err, fmt.Sprintf("read package in '%v' in Namespace: %s. Package needs to be present in the same namespace as function", pkgName, fnNamespace))
return errors.Wrap(err, fmt.Sprintf("read package in '%s' in Namespace: %s. Package needs to be present in the same namespace as function", pkgName, fnNamespace))
}
pkgMetadata = &pkg.ObjectMeta
}
@@ -164,7 +169,6 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
if envName != input.String(flagkey.FnEnvironmentName) {
console.Warn("Function's environment is different than package's environment, package's environment will be used for creating function")
}
envNamespace = pkg.Spec.Environment.Namespace
} else {
// need to specify environment for creating new package
envName = input.String(flagkey.FnEnvironmentName)
@@ -176,29 +180,29 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
fr, err := spec.ReadSpecs(specDir, specIgnore, false)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("error reading spec in '%v'", specDir))
return errors.Wrap(err, fmt.Sprintf("error reading spec in '%s'", specDir))
}
exists, err := fr.ExistsInSpecs(fv1.Environment{
ObjectMeta: metav1.ObjectMeta{
Name: envName,
Namespace: envNamespace,
Namespace: userProvidedNS,
},
})
if err != nil {
return err
}
if !exists {
console.Warn(fmt.Sprintf("Function '%v' references unknown Environment '%v', please create it before applying spec",
console.Warn(fmt.Sprintf("Function '%s' references unknown Environment '%s', please create it before applying spec",
fnName, envName))
}
} else {
_, err := opts.Client().V1().Environment().Get(&metav1.ObjectMeta{
Namespace: envNamespace,
Namespace: fnNamespace,
Name: envName,
})
if err != nil {
if e, ok := err.(ferror.Error); ok && e.Code == ferror.ErrorNotFound {
console.Warn(fmt.Sprintf("Environment \"%v\" does not exist. Please create the environment before executing the function. \nFor example: `fission env create --name %v --envns %v --image <image>`\n", envName, envName, envNamespace))
console.Warn(fmt.Sprintf("Environment \"%s\" does not exist. Please create the environment before executing the function. \nFor example: `fission env create --name %s --envns %s --image <image>`\n", envName, envName, fnNamespace))
} else {
return errors.Wrap(err, "error retrieving environment information")
}
@@ -228,8 +232,8 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
pkgName := generatePackageName(fnName, id.String())
// create new package in the same namespace as the function.
pkgMetadata, err = _package.CreatePackage(input, opts.Client(), pkgName, fnNamespace, envName, envNamespace,
srcArchiveFiles, deployArchiveFiles, buildcmd, specDir, opts.specFile, noZip)
pkgMetadata, err = _package.CreatePackage(input, opts.Client(), pkgName, fnNamespace, envName,
srcArchiveFiles, deployArchiveFiles, buildcmd, specDir, opts.specFile, noZip, userProvidedNS)
if err != nil {
return errors.Wrap(err, "error creating package")
}
@@ -253,15 +257,22 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
return errors.Wrapf(err, "error checking secret %s", secretName)
}
}
newSecret := fv1.SecretReference{
Name: secretName,
Namespace: fnNamespace,
}
secrets = append(secrets, newSecret)
}
} else {
for _, secretName := range secretNames {
newSecret := fv1.SecretReference{
Name: secretName,
Namespace: userProvidedNS,
}
secrets = append(secrets, newSecret)
}
}
for _, secretName := range secretNames {
newSecret := fv1.SecretReference{
Name: secretName,
Namespace: fnNamespace,
}
secrets = append(secrets, newSecret)
}
}
if len(cfgMapNames) > 0 {
@@ -279,14 +290,20 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
return errors.Wrapf(err, "error checking configmap %s", cfgMapName)
}
}
newCfgMap := fv1.ConfigMapReference{
Name: cfgMapName,
Namespace: fnNamespace,
}
cfgmaps = append(cfgmaps, newCfgMap)
}
}
for _, cfgMapName := range cfgMapNames {
newCfgMap := fv1.ConfigMapReference{
Name: cfgMapName,
Namespace: fnNamespace,
} else {
for _, cfgMapName := range cfgMapNames {
newCfgMap := fv1.ConfigMapReference{
Name: cfgMapName,
Namespace: userProvidedNS,
}
cfgmaps = append(cfgmaps, newCfgMap)
}
cfgmaps = append(cfgmaps, newCfgMap)
}
}
@@ -314,7 +331,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
opts.function.Spec.Environment = fv1.EnvironmentReference{
Name: envName,
Namespace: envNamespace,
Namespace: fnNamespace,
}
opts.function.Spec.Package = fv1.FunctionPackageRef{
FunctionName: entrypoint,
@@ -325,6 +342,12 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
},
}
if toSpec {
opts.function.ObjectMeta.Namespace = userProvidedNS
opts.function.Spec.Package.PackageRef.Namespace = userProvidedNS
opts.function.Spec.Environment.Namespace = userProvidedNS
}
return nil
}
@@ -336,12 +359,12 @@ func generatePackageName(fnName string, id string) string {
lastIndexOfChar int
)
if lenFnName+lenId <= 62 {
return fmt.Sprintf("%v-%v", fnName, id)
return fmt.Sprintf("%s-%s", fnName, id)
}
lastIndexOfChar = lenFnName - (lenFnName + lenId - 62)
pkgName := fmt.Sprintf("%v-%v", fnName[:lastIndexOfChar], id)
console.Info(fmt.Sprintf("Generated package %v from function to acceptable character limit", pkgName))
pkgName := fmt.Sprintf("%v-%s", fnName[:lastIndexOfChar], id)
console.Info(fmt.Sprintf("Generated package %s from function to acceptable character limit", pkgName))
return pkgName
}
@@ -367,7 +390,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return errors.Wrap(err, "error creating function")
}
fmt.Printf("function '%v' created\n", opts.function.ObjectMeta.Name)
fmt.Printf("function '%s' created\n", opts.function.ObjectMeta.Name)
// Allow the user to specify an HTTP trigger while creating a function.
triggerUrl := input.String(flagkey.HtUrl)
@@ -416,7 +439,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return errors.Wrap(err, "error creating HTTP trigger")
}
fmt.Printf("route created: %v %v -> %v\n", methods, triggerUrl, opts.function.ObjectMeta.Name)
fmt.Printf("route created: %s %s -> %s\n", methods, triggerUrl, opts.function.ObjectMeta.Name)
return nil
}
pkg/fission-cli/cmd/function/delete.go
+9 -4
View File
@@ -37,19 +37,24 @@ func Delete(input cli.Input) error {
}
func (opts *DeleteSubCommand) do(input cli.Input) 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.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
}
err := opts.Client().V1().Function().Delete(m)
err = opts.Client().V1().Function().Delete(m)
if err != nil {
if input.Bool(flagkey.IgnoreNotFound) && util.IsNotFound(err) {
return nil
}
return errors.Wrap(err, fmt.Sprintf("delete function '%v'", m.Name))
return errors.Wrap(err, fmt.Sprintf("delete function '%s'", m.Name))
}
fmt.Printf("function '%v' deleted\n", m.Name)
fmt.Printf("function '%s' deleted\n", m.Name)
return nil
}
pkg/fission-cli/cmd/function/get.go
+6 -1
View File
@@ -25,6 +25,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 {
@@ -36,9 +37,13 @@ func Get(input cli.Input) error {
}
func (opts *GetSubCommand) do(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in get function ")
}
fn, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
})
if err != nil {
return errors.Wrap(err, "error getting function")
pkg/fission-cli/cmd/function/getmeta.go
+7 -1
View File
@@ -25,6 +25,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 GetMetaSubCommand struct {
@@ -36,9 +37,14 @@ func GetMeta(input cli.Input) error {
}
func (opts *GetMetaSubCommand) do(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in getting meta function ")
}
fn, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
})
if err != nil {
return errors.Wrap(err, "error getting function")
pkg/fission-cli/cmd/function/list.go
+16 -5
View File
@@ -24,9 +24,11 @@ import (
"github.com/pkg/errors"
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 {
@@ -38,16 +40,24 @@ func List(input cli.Input) error {
}
func (opts *ListSubCommand) do(input cli.Input) error {
ns := input.String(flagkey.NamespaceFunction)
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in listing function ")
}
fns, err := opts.Client().V1().Function().List(ns)
var fns []v1.Function
if input.Bool(flagkey.AllNamespaces) {
fns, err = opts.Client().V1().Function().List("")
} else {
fns, err = opts.Client().V1().Function().List(namespace)
}
if err != nil {
return errors.Wrap(err, "error listing functions")
}
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\t%v\t%v\n", "NAME", "ENV", "EXECUTORTYPE", "MINSCALE", "MAXSCALE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "SECRETS", "CONFIGMAPS")
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n", "NAME", "ENV", "EXECUTORTYPE", "MINSCALE", "MAXSCALE", "MINCPU", "MAXCPU", "MINMEMORY", "MAXMEMORY", "SECRETS", "CONFIGMAPS", "NAMESPACE")
for _, f := range fns {
secrets := f.Spec.Secrets
configMaps := f.Spec.ConfigMaps
@@ -59,7 +69,7 @@ func (opts *ListSubCommand) do(input cli.Input) error {
configMapList = append(configMapList, configMap.Name)
}
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\t%v\n",
f.ObjectMeta.Name, f.Spec.Environment.Name,
f.Spec.InvokeStrategy.ExecutionStrategy.ExecutorType,
f.Spec.InvokeStrategy.ExecutionStrategy.MinScale,
@@ -69,7 +79,8 @@ func (opts *ListSubCommand) do(input cli.Input) error {
f.Spec.Resources.Requests.Memory().String(),
f.Spec.Resources.Limits.Memory().String(),
strings.Join(secretsList, ","),
strings.Join(configMapList, ","))
strings.Join(configMapList, ","),
f.ObjectMeta.Namespace)
}
w.Flush()
pkg/fission-cli/cmd/function/log.go
+6 -1
View File
@@ -40,6 +40,11 @@ func Log(input cli.Input) error {
}
func (opts *LogSubCommand) do(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in logs for function ")
}
dbType := input.String(flagkey.FnLogDBType)
fnPod := input.String(flagkey.FnLogPod)
kubeContext := input.String(flagkey.KubeContext)
@@ -53,7 +58,7 @@ func (opts *LogSubCommand) do(input cli.Input) error {
f, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
})
if err != nil {
return errors.Wrap(err, "error getting function")
pkg/fission-cli/cmd/function/pods.go
+9 -3
View File
@@ -28,6 +28,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"
"github.com/fission/fission/pkg/utils"
)
@@ -41,10 +42,15 @@ func ListPods(input cli.Input) error {
func (opts *ListPodsSubCommand) do(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in finding pod for function ")
}
// validate function
_, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
_, err = opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
})
if err != nil {
return errors.Wrap(err, "error getting function")
@@ -53,7 +59,7 @@ func (opts *ListPodsSubCommand) do(input cli.Input) error {
m := &metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Labels: map[string]string{
v1.FUNCTION_NAMESPACE: input.String(flagkey.NamespaceFunction),
v1.FUNCTION_NAMESPACE: namespace,
},
}
pkg/fission-cli/cmd/function/run_container.go
+6 -2
View File
@@ -55,7 +55,11 @@ func (opts *RunContainerSubCommand) do(input cli.Input) error {
func (opts *RunContainerSubCommand) complete(input cli.Input) error {
fnName := input.String(flagkey.FnName)
fnNamespace := input.String(flagkey.NamespaceFunction)
_, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in running container for function ")
}
// user wants a spec, create a yaml file with package and function
toSpec := false
@@ -68,7 +72,7 @@ func (opts *RunContainerSubCommand) complete(input cli.Input) error {
// check for unique function names within a namespace
fn, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: fnNamespace,
})
if err != nil && !ferror.IsNotFound(err) {
return err
pkg/fission-cli/cmd/function/test.go
+7 -1
View File
@@ -51,9 +51,15 @@ func Test(input cli.Input) error {
}
func (opts *TestSubCommand) do(input cli.Input) error {
_, namespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in testing function ")
}
m := &metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: namespace,
}
kubeContext := input.String(flagkey.KubeContext)
routerURL := os.Getenv("FISSION_ROUTER")
pkg/fission-cli/cmd/function/update.go
+5 -2
View File
@@ -51,11 +51,14 @@ func (opts *UpdateSubCommand) do(input cli.Input) error {
func (opts *UpdateSubCommand) complete(input cli.Input) error {
fnName := input.String(flagkey.FnName)
fnNamespace := input.String(flagkey.NamespaceFunction)
_, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in updating function ")
}
function, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: fnNamespace,
})
if err != nil {
return errors.Wrap(err, fmt.Sprintf("read function '%v'", fnName))
pkg/fission-cli/cmd/function/update_container.go
+6 -2
View File
@@ -52,11 +52,15 @@ func (opts *UpdateContainerSubCommand) do(input cli.Input) error {
func (opts *UpdateContainerSubCommand) complete(input cli.Input) error {
fnName := input.String(flagkey.FnName)
fnNamespace := input.String(flagkey.NamespaceFunction)
_, fnNamespace, err := util.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil {
return errors.Wrap(err, "error in updating container for function ")
}
function, err := opts.Client().V1().Function().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.FnName),
Namespace: input.String(flagkey.NamespaceFunction),
Namespace: fnNamespace,
})
if err != nil {
return errors.Wrap(err, fmt.Sprintf("read function '%v'", fnName))