public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#560 Fixed envFrom not propagating to master pod (#564) 

* Fixed envFrom not propagate to master pod
This commit is contained in:
MKajzik 2021-05-11 15:58:56 +02:00 committed by GitHub
parent 81374d0857
commit 8a42cdc1ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/configuration/base/resources/pod.go
View File

@ -257,6 +257,7 @@ func NewJenkinsMasterContainer(jenkins *v1alpha2.Jenkins) corev1.Container {
}, },
SecurityContext: jenkinsContainer.SecurityContext, SecurityContext: jenkinsContainer.SecurityContext,
Env: envs, Env: envs,
EnvFrom: jenkinsContainer.EnvFrom,
Resources: jenkinsContainer.Resources, Resources: jenkinsContainer.Resources,
VolumeMounts: append(GetJenkinsMasterContainerBaseVolumeMounts(jenkins), jenkinsContainer.VolumeMounts...), VolumeMounts: append(GetJenkinsMasterContainerBaseVolumeMounts(jenkins), jenkinsContainer.VolumeMounts...),
} }