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

PodSpec support in environment builder (#1369)

Browse Source
This commit is contained in:
Vivek Singh
2019-11-03 23:05:02 +08:00
committed by Ta-Ching Chen
parent 3b6749dce9
commit e1a64dd0c1
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/spec/spec.go
+1 -1
View File
@@ -426,7 +426,7 @@ func (fr *FissionResources) Validate(flags cli.Input) error {
environments := make(map[string]struct{})
for _, e := range fr.Environments {
environments[fmt.Sprintf("%s:%s", e.Metadata.Name, e.Metadata.Namespace)] = struct{}{}
if (e.Spec.Runtime.Container != nil) && (e.Spec.Runtime.PodSpec != nil) {
if ((e.Spec.Runtime.Container != nil) && (e.Spec.Runtime.PodSpec != nil)) || ((e.Spec.Builder.Container != nil) && (e.Spec.Builder.PodSpec != nil)) {
log.Warn("You have provided both - container spec and pod spec and while merging the pod spec will take precedence.")
}
// Unlike CLI can change the environment version silently,