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

Update create.go to handle namespace isolation (#3130)

Browse Source
This commit is contained in:
sofsms
2025-01-03 23:28:02 +05:30
committed by GitHub
parent 3f0e4f5e81
commit 6cf15f6cec
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/environment/create.go
+11 -12
View File
@@ -64,16 +64,6 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
// run write the resource to a spec file or create a fission CRD with remote fission server. // run write the resource to a spec file or create a fission CRD with remote fission server.
// It also prints warning/error if necessary. // It also prints warning/error if necessary.
func (opts *CreateSubCommand) run(input cli.Input) (err error) { func (opts *CreateSubCommand) run(input cli.Input) (err error) {
m := opts.env.ObjectMeta
envList, err := opts.Client().FissionClientSet.CoreV1().Environments(m.Namespace).List(input.Context(), metav1.ListOptions{})
if err != nil {
return err
} else if len(envList.Items) > 0 {
console.Verbose(2, "%d environment(s) are present in the %s namespace. "+
"These environments are not isolated from each other; use separate namespaces if you need isolation.",
len(envList.Items), m.Namespace)
}
userDefinedNS, currentNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment) userDefinedNS, currentNS, err := opts.GetResourceNamespace(input, flagkey.NamespaceEnvironment)
if err != nil { if err != nil {
@@ -82,6 +72,15 @@ func (opts *CreateSubCommand) run(input cli.Input) (err error) {
// we use user provided NS in spec. While creating actual record we use the current context's NS. // we use user provided NS in spec. While creating actual record we use the current context's NS.
opts.env.ObjectMeta.Namespace = userDefinedNS opts.env.ObjectMeta.Namespace = userDefinedNS
envList, err := opts.Client().FissionClientSet.CoreV1().Environments(opts.env.ObjectMeta.Namespace).List(input.Context(), metav1.ListOptions{})
if err != nil {
return err
} else if len(envList.Items) > 0 {
console.Verbose(2, "%d environment(s) are present in the %s namespace. "+
"These environments are not isolated from each other; use separate namespaces if you need isolation.",
len(envList.Items), opts.env.ObjectMeta.Namespace)
}
// if we're writing a spec, don't call the API // if we're writing a spec, don't call the API
// save to spec file or display the spec to console // save to spec file or display the spec to console
if input.Bool(flagkey.SpecDry) { if input.Bool(flagkey.SpecDry) {
@@ -99,7 +98,7 @@ func (opts *CreateSubCommand) run(input cli.Input) (err error) {
return fv1.AggregateValidationErrors("Environment", err) return fv1.AggregateValidationErrors("Environment", err)
} }
specFile := fmt.Sprintf("env-%v.yaml", m.Name) specFile := fmt.Sprintf("env-%v.yaml", opts.env.ObjectMeta.Name)
err = spec.SpecSave(*opts.env, specFile, false) err = spec.SpecSave(*opts.env, specFile, false)
if err != nil { if err != nil {
return errors.Wrap(err, "error saving environment spec") return errors.Wrap(err, "error saving environment spec")
@@ -114,7 +113,7 @@ func (opts *CreateSubCommand) run(input cli.Input) (err error) {
return errors.Wrap(err, "error creating resource") return errors.Wrap(err, "error creating resource")
} }
fmt.Printf("environment '%v' created\n", m.Name) fmt.Printf("environment '%v' created\n", opts.env.ObjectMeta.Name)
return nil return nil
} }