diff --git a/library/common-test/tests/jobs/jobTempalte_test.yaml b/library/common-test/tests/jobs/jobTempalte_test.yaml index beb7ebe630..45f4255770 100644 --- a/library/common-test/tests/jobs/jobTempalte_test.yaml +++ b/library/common-test/tests/jobs/jobTempalte_test.yaml @@ -120,14 +120,14 @@ tests: - failedTemplate: errorMessage: Invalid option (invalid) for in (job-name). Valid options are NonIndexed and Indexed. Leave empty to use the default (NonIndexed) - - it: should fail without containers jobs - set: - jobs: - job-name: - enabled: true - asserts: - - failedTemplate: - errorMessage: At least one container in is required in (job-name). + # - it: should fail without containers jobs + # set: + # jobs: + # job-name: + # enabled: true + # asserts: + # - failedTemplate: + # errorMessage: At least one container in is required in (job-name). - it: should pass with default in job documentIndex: &jobDoc 3 diff --git a/library/common-test/values.yaml b/library/common-test/values.yaml index 2671514bc7..b6dfe60058 100644 --- a/library/common-test/values.yaml +++ b/library/common-test/values.yaml @@ -27,5 +27,5 @@ service: # containers: # containername: -# imageSelector: asdfas +# imageSelector: image # restartPolicy: Never diff --git a/library/common/1.0.0/templates/lib/job/_jobTemplate.tpl b/library/common/1.0.0/templates/lib/job/_jobTemplate.tpl index 6e2df23fdc..700d3035ca 100644 --- a/library/common/1.0.0/templates/lib/job/_jobTemplate.tpl +++ b/library/common/1.0.0/templates/lib/job/_jobTemplate.tpl @@ -27,13 +27,7 @@ completions: {{ . }} completionMode: {{ $job.completionMode | default $default.completionMode }} template: spec: - {{/*- with (include "ix.v1.common.controller.extraContainers" (dict "root" $root - "containerList" $job.containers - "type" "job") | trim) }} - containers: - {{- . | nindent 6 }} - {{- end -*/}} +{{/* TODO: create the pod/job spec */}} {{- end -}} -{{/* TODO: create the job spec (containers) */}} {{/* TODO: Unit Tests */}} diff --git a/library/common/1.0.0/templates/lib/job/_validateJob.tpl b/library/common/1.0.0/templates/lib/job/_validateJob.tpl index 8cd718966e..afbe34eb59 100644 --- a/library/common/1.0.0/templates/lib/job/_validateJob.tpl +++ b/library/common/1.0.0/templates/lib/job/_validateJob.tpl @@ -61,8 +61,8 @@ {{- end -}} {{- end -}} - {{- if not $job.containers -}} + {{/*- if not $job.containers -}} {{ fail (printf "At least one container in is required in (%s)." $name) }} {{- end -}} -{{- end -}} -{{/* TODO: Unit Tests */}} +{{- end -*/}} +{{/* TODO: Unit Tests / It's pods not containers */}}