diff --git a/daemonjob-controller/templates/bin/_sync-hook.py.tpl b/daemonjob-controller/templates/bin/_sync-hook.py.tpl index 3c5b97d42..546f0dd06 100644 --- a/daemonjob-controller/templates/bin/_sync-hook.py.tpl +++ b/daemonjob-controller/templates/bin/_sync-hook.py.tpl @@ -32,6 +32,7 @@ def is_job_finished(job): def new_daemon(job): + pause_image = {{ .Values.images.tags.pause | quote }} daemon = copy.deepcopy(job) daemon['apiVersion'] = 'apps/v1' daemon['kind'] = 'DaemonSet' @@ -45,7 +46,7 @@ def new_daemon(job): job['spec']['template']['spec']['containers']) daemon['spec']['template']['spec']['containers'] = [ {'name': "pause", 'image': job['spec'].get( - 'pauseImage', 'gcr.io/google_containers/pause'), + 'pauseImage', pause_image), 'resources': {'requests': {'cpu': '10m'}}}] daemon['spec']['selector'] = {'matchLabels': copy.deepcopy( job['spec']['template']['metadata']['labels'])} diff --git a/daemonjob-controller/templates/crd.yaml b/daemonjob-controller/templates/crd.yaml index 48fcfc8c1..2127d120a 100644 --- a/daemonjob-controller/templates/crd.yaml +++ b/daemonjob-controller/templates/crd.yaml @@ -343,8 +343,11 @@ spec: type: string configMap: type: object - additionalProperties: - type: string + properties: + name: + type: string + defaultMode: + type: integer restartPolicy: type: string tty: diff --git a/daemonjob-controller/values.yaml b/daemonjob-controller/values.yaml index 6ac2a8bd1..4ad6b71f0 100644 --- a/daemonjob-controller/values.yaml +++ b/daemonjob-controller/values.yaml @@ -19,6 +19,7 @@ release_group: null images: tags: python: docker.io/python:3.6-slim + pause: gcr.io/google_containers/pause:latest image_repo_sync: docker.io/docker:17.07.0 pullPolicy: IfNotPresent local_registry: