Skip to content

Commit e35b7b8

Browse files
authored
Merge pull request #240 from chhsiao1981/image-pull-secrets
k8smgr: add image_pull_secrets in V1PodSpec
2 parents 88f8168 + d704514 commit e35b7b8

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

pman/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def __init__(self):
6767
if self.CONTAINER_ENV == 'kubernetes':
6868
self.JOB_NAMESPACE = env('JOB_NAMESPACE', 'default')
6969
self.NODE_SELECTOR = env.dict('NODE_SELECTOR', {})
70+
image_pull_secrets = env('IMAGE_PULL_SECRETS', '')
71+
self.IMAGE_PULL_SECRETS = None if not image_pull_secrets else image_pull_secrets.split(',')
7072

7173
if self.CONTAINER_ENV == 'cromwell':
7274
self.CROMWELL_URL = env('CROMWELL_URL')

pman/kubernetesmgr.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,22 @@ def create_job(self, image, command, name, resources_dict, env_l, uid, gid,
224224

225225
node_selector = self.config.get('NODE_SELECTOR')
226226

227+
pod_spec_args = {
228+
'restart_policy': 'Never',
229+
'containers': [container],
230+
'volumes': [volume, *dshm_volume],
231+
}
232+
233+
if node_selector:
234+
pod_spec_args['node_selector'] = node_selector
235+
236+
image_pull_secrets = self.config.get('IMAGE_PULL_SECRETS')
237+
if image_pull_secrets:
238+
pod_spec_args['image_pull_secrets'] = image_pull_secrets
239+
227240
template = k_client.V1PodTemplateSpec(
228241
metadata=pod_template_metadata,
229-
spec=k_client.V1PodSpec(restart_policy='Never',
230-
containers=[container],
231-
volumes=[volume, *dshm_volume],
232-
node_selector=node_selector),
233-
242+
spec=k_client.V1PodSpec(**pod_spec_args),
234243
)
235244
# configure job's spec
236245
spec = k_client.V1JobSpec(

0 commit comments

Comments
 (0)