Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Passing Container env variables to Compile container #1030

Merged
andresmgot merged 1 commit into from
May 7, 2019
Merged

Passing Container env variables to Compile container #1030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/langruntime/langruntime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func (l *Langruntimes) UpdateDeployment(dpm *v1beta1.Deployment, volPath, runtim
}

// GetCompilationContainer returns a Container definition based on a runtime
func (l *Langruntimes) GetCompilationContainer(runtime, funcName string, installVolume v1.VolumeMount) (*v1.Container, error) {
func (l *Langruntimes) GetCompilationContainer(runtime, funcName string, env []v1.EnvVar, installVolume v1.VolumeMount) (*v1.Container, error) {
versionInf, err := l.findRuntimeVersion(runtime)
if err != nil {
return nil, err
Expand All @@ -328,11 +328,12 @@ func (l *Langruntimes) GetCompilationContainer(runtime, funcName string, install
return nil, nil
}

env := append(
parseEnv(imageInf.Env),
env = append(
env,
v1.EnvVar{Name: "KUBELESS_INSTALL_VOLUME", Value: installVolume.MountPath},
v1.EnvVar{Name: "KUBELESS_FUNC_NAME", Value: funcName},
)
env = append(env, parseEnv(imageInf.Env)...)
return &v1.Container{
Name: "compile",
Image: imageInf.Image,
Expand Down
10 changes: 5 additions & 5 deletions pkg/utils/kubelessutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,13 @@ func populatePodSpec(funcObj *kubelessApi.Function, lr *langruntime.Langruntimes

// ensure that the runtime is supported for installing dependencies
_, err := lr.GetRuntimeInfo(funcObj.Spec.Runtime)
envVars := []v1.EnvVar{}
if len(result.Containers) > 0 {
envVars = result.Containers[0].Env
}
if funcObj.Spec.Deps != "" && err != nil {
return fmt.Errorf("Unable to install dependencies for the runtime %s", funcObj.Spec.Runtime)
} else if funcObj.Spec.Deps != "" {
envVars := []v1.EnvVar{}
if len(result.Containers) > 0 {
envVars = result.Containers[0].Env
}
depsChecksum, err := getChecksum(funcObj.Spec.Deps)
if err != nil {
return fmt.Errorf("Unable to obtain dependencies checksum: %v", err)
Expand All @@ -404,7 +404,7 @@ func populatePodSpec(funcObj *kubelessApi.Function, lr *langruntime.Langruntimes

// add compilation init container if needed
_, funcName, _ := splitHandler(funcObj.Spec.Handler)
compContainer, err := lr.GetCompilationContainer(funcObj.Spec.Runtime, funcName, runtimeVolumeMount)
compContainer, err := lr.GetCompilationContainer(funcObj.Spec.Runtime, funcName, envVars, runtimeVolumeMount)
if err != nil {
return err
}
Expand Down