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

Added warning when package env and environment env mismatched (#996)

Browse Source 
Fix issue #946
This commit is contained in:
Vishal
2018-11-26 19:05:00 +08:00
committed by Ta-Ching Chen
parent c476f54a6c
commit 152c899e8b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fission/function.go
+10 -1
View File
@@ -165,6 +165,9 @@ func fnCreate(c *cli.Context) error {
util.CheckErr(err, fmt.Sprintf("read package in '%v' in Namespace: %s. Package needs to be present in the same namespace as function", pkgName, fnNamespace)) util.CheckErr(err, fmt.Sprintf("read package in '%v' in Namespace: %s. Package needs to be present in the same namespace as function", pkgName, fnNamespace))
pkgMetadata = &pkg.Metadata pkgMetadata = &pkg.Metadata
envName = pkg.Spec.Environment.Name envName = pkg.Spec.Environment.Name
if envName != c.String("env") {
log.Warn("Function's environment is different than package's environment, package's environment will be used for creating function")
}
envNamespace = pkg.Spec.Environment.Namespace envNamespace = pkg.Spec.Environment.Namespace
} else { } else {
// need to specify environment for creating new package // need to specify environment for creating new package
@@ -499,7 +502,7 @@ func fnUpdate(c *cli.Context) error {
log.Fatal("Package is used by multiple functions, use --force to force update") log.Fatal("Package is used by multiple functions, use --force to force update")
} }
pkgMetadata, err = updatePackage(client, pkg, envName, envNamespace, srcArchiveName, deployArchiveName, buildcmd, false) pkgMetadata, err = updatePackage(client, pkg, pkg.Spec.Environment.Name, pkg.Spec.Environment.Namespace, srcArchiveName, deployArchiveName, buildcmd, false)
util.CheckErr(err, fmt.Sprintf("update package '%v'", pkgName)) util.CheckErr(err, fmt.Sprintf("update package '%v'", pkgName))
fmt.Printf("package '%v' updated\n", pkgMetadata.GetName()) fmt.Printf("package '%v' updated\n", pkgMetadata.GetName())
@@ -525,6 +528,12 @@ func fnUpdate(c *cli.Context) error {
ResourceVersion: pkgMetadata.ResourceVersion, ResourceVersion: pkgMetadata.ResourceVersion,
} }
if function.Spec.Environment.Name != pkg.Spec.Environment.Name {
log.Warn("Function's environment is different than package's environment, package's environment will be used for updating function")
function.Spec.Environment.Name = pkg.Spec.Environment.Name
function.Spec.Environment.Namespace = pkg.Spec.Environment.Namespace
}
function.Spec.Resources = getResourceReq(c, function.Spec.Resources) function.Spec.Resources = getResourceReq(c, function.Spec.Resources)
if c.IsSet("targetcpu") { if c.IsSet("targetcpu") {