d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Jeremy Rickard
2018-08-07 08:51:41 -06:00
committed by GitHub
parent 0b475e8dce a1677ce5e0
commit 0929376f9c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
providers/azure/aci.go
View File

@@ -676,9 +676,11 @@ func (p *ACIProvider) getContainers(pod *v1.Pod) ([]aci.Container, error) {
c.EnvironmentVariables = make([]aci.EnvironmentVariable, 0, len(container.Env)) c.EnvironmentVariables = make([]aci.EnvironmentVariable, 0, len(container.Env))
for _, e := range container.Env { for _, e := range container.Env {
if e.Value != "" {
envVar := getACIEnvVar(e) envVar := getACIEnvVar(e)
c.EnvironmentVariables = append(c.EnvironmentVariables, envVar) c.EnvironmentVariables = append(c.EnvironmentVariables, envVar)
} }
}
// NOTE(robbiezhang): ACI CPU request must be times of 10m // NOTE(robbiezhang): ACI CPU request must be times of 10m
cpuRequest := 1.00 cpuRequest := 1.00
@@ -1116,7 +1118,7 @@ func filterServiceAccountSecretVolume(osType string, containerGroup *aci.Contain
func getACIEnvVar(e v1.EnvVar) aci.EnvironmentVariable { func getACIEnvVar(e v1.EnvVar) aci.EnvironmentVariable {
var envVar aci.EnvironmentVariable var envVar aci.EnvironmentVariable
// If the variable is a secret, use SecureValue // If the variable is a secret, use SecureValue
if e.ValueFrom.SecretKeyRef != nil { if e.ValueFrom != nil && e.ValueFrom.SecretKeyRef != nil {
envVar = aci.EnvironmentVariable{ envVar = aci.EnvironmentVariable{
Name: e.Name, Name: e.Name,
SecureValue: e.Value, SecureValue: e.Value,