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

Merge pull request #74 from jakalkhalili/master 

#70 Fix SecurityContext propagation
This commit is contained in:
Tomasz Sęk 2019-08-19 13:11:00 +02:00 committed by GitHub
parent 8f80fa5bbd 76e72702f2
commit 7d2177f8c4
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/controller/jenkins/configuration/base/resources/pod.go
View File

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