feature: Added commandline flags to set env var on the runtime and builder containers (#2369)

This commit is contained in:
Pradeep Lakshmi Narasimha
2022-03-16 14:38:29 +05:30
committed by GitHub
parent 26d0a89fd5
commit 9024f6e695
6 changed files with 100 additions and 3 deletions
+2 -3
View File
@@ -35,9 +35,8 @@ func Commands() *cobra.Command {
flag.EnvPoolsize, flag.EnvBuilderImage, flag.EnvBuildCmd,
flag.RunTimeMinCPU, flag.RunTimeMaxCPU, flag.RunTimeMinMemory, flag.RunTimeMaxMemory,
flag.EnvTerminationGracePeriod, flag.EnvVersion, flag.EnvImagePullSecret, flag.EnvKeepArchive,
flag.NamespaceEnvironment, flag.EnvExternalNetwork,
flag.Labels, flag.Annotation,
flag.SpecSave, flag.SpecDry},
flag.NamespaceEnvironment, flag.EnvExternalNetwork, flag.Labels, flag.Annotation,
flag.SpecSave, flag.SpecDry, flag.EnvBuilder, flag.EnvRuntime},
})
getCmd := &cobra.Command{
+13
View File
@@ -21,6 +21,7 @@ import (
"github.com/hashicorp/go-multierror"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/core/v1"
@@ -143,6 +144,12 @@ func createEnvironmentFromCmd(input cli.Input) (*fv1.Environment, error) {
}
}
builderEnvParams := input.StringSlice(flagkey.EnvBuilder)
builderEnvList := util.GetEnvVarFromStringSlice(builderEnvParams)
runtimeEnvParams := input.StringSlice(flagkey.EnvRuntime)
runtimeEnvList := util.GetEnvVarFromStringSlice(runtimeEnvParams)
resourceReq, err := util.GetResourceReqs(input, nil)
if err != nil {
e = multierror.Append(e, err)
@@ -165,10 +172,16 @@ func createEnvironmentFromCmd(input cli.Input) (*fv1.Environment, error) {
Version: envVersion,
Runtime: fv1.Runtime{
Image: envImg,
Container: &apiv1.Container{
Env: runtimeEnvList,
},
},
Builder: fv1.Builder{
Image: envBuilderImg,
Command: envBuildCmd,
Container: &apiv1.Container{
Env: builderEnvList,
},
},
Poolsize: poolsize,
Resources: *resourceReq,