Skip to content
Snippets Groups Projects

Support Vault EE namespaces

Merged Aleksander Zak requested to merge aleksanderzak/gitlab-runner:vault_namespaces into main
4 unresolved threads
2 files
+ 59
0
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -431,6 +431,18 @@ func (s *executor) getContainerInfo(cmd common.ExecutorCommand) (string, []strin
return containerName, containerCommand
}
func (s *executor) initContainerResources() api.ResourceRequirements {
resources := api.ResourceRequirements{}
if s.configurationOverwrites != nil {
resources.Limits = s.configurationOverwrites.buildLimits
resources.Requests = s.configurationOverwrites.buildRequests
}
return resources
}
func (s *executor) buildPermissionsInitContainer(os string) (api.Container, error) {
pullPolicy, err := s.pullManager.GetPullPolicyFor(s.getHelperImage())
if err != nil {
@@ -442,6 +454,8 @@ func (s *executor) buildPermissionsInitContainer(os string) (api.Container, erro
Image: s.getHelperImage(),
VolumeMounts: s.getVolumeMounts(),
ImagePullPolicy: pullPolicy,
// let's use build container resources
Resources: s.initContainerResources(),
}
// The kubernetes executor uses both a helper container (for predefined stages) and a build
Loading