Support wait_for_jobs flag for helm release upgrade/install (#1140) (#1214)

* Support wait_for_jobs flag for helm release upgrade/install

* Update plugins/modules/helm.py



* Apply suggestion from @abikouo

* fix(helm): correct wait_for_jobs implementation and add changelog

- Fix double-append of --wait-for-jobs flag
- Fix version check to run before appending the flag
- Fetch helm_version before use to avoid undefined variable
- Fix YAML indentation for version_added in docs
- Add changelog fragment



* test: add integration tests for wait_for_jobs

- Test that --wait-for-jobs is appended when wait=true and wait_for_jobs=true
- Test that wait_for_jobs fails with appropriate message on helm < 3.5.0
- Test that wait_for_jobs is ignored when wait is not set
- Add test-chart-job helm chart containing a simple Job resource



* fix: harden test Job pod spec

Disable service account token automounting and add memory limit to
the test Job container.



* fix: add resource requests and pin image version in test Job

Add CPU, memory, and ephemeral-storage requests. Pin busybox image
to version 1.37.



* style: apply linter formatting to helm argument_spec



* Update sanity ignore file

* fix: quote Helm template expression to pass yamllint sanity



* Fix linters errors

---------





(cherry picked from commit e475d06403)

Co-authored-by: Daniel Simko <danosimko1@gmail.com>
Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
Co-authored-by: Yuriy Novostavskiy <yuriy@novostavskiy.kyiv.ua>
Co-authored-by: aubin bikouo <abikouo@redhat.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
patchback[bot]
2026-08-11 12:11:51 -04:00
committed by GitHub
co-authored by Daniel Simko Bikouo Aubin Yuriy Novostavskiy aubin bikouo Claude Opus 4.6
parent 569bae6593
commit 7b17313ace
14 changed files with 178 additions and 39 deletions
@@ -31,3 +31,4 @@ test_namespace:
- "helm-insecure-{{ helm_version | replace('.', '-') }}"
- "helm-test-take-ownership-{{ helm_version | replace('.', '-') }}"
- "helm-skip-schema-validation-{{ helm_version | replace('.', '-') }}"
- "helm-wait-for-jobs-{{ helm_version | replace('.', '-') }}"
@@ -0,0 +1,6 @@
apiVersion: v2
name: test-chart-job
description: A chart with a Job for testing wait_for_jobs
type: application
version: 0.1.0
appVersion: "default"
@@ -0,0 +1,21 @@
apiVersion: batch/v1
kind: Job
metadata:
name: "{{ .Release.Name }}-job"
spec:
backoffLimit: 0
template:
spec:
automountServiceAccountToken: false
restartPolicy: Never
containers:
- name: test
image: "busybox:1.37"
command: ["sh", "-c", "echo done"]
resources:
requests:
cpu: "50m"
memory: "32Mi"
ephemeral-storage: "16Mi"
limits:
memory: "64Mi"
@@ -49,6 +49,9 @@
- name: Test helm skip_schema_validation
include_tasks: test_skip_schema_validation.yml
- name: Test helm wait_for_jobs
include_tasks: test_helm_wait_for_jobs.yml
always:
- name: Remove helm-diff plugin
helm_plugin:
@@ -0,0 +1,59 @@
---
- name: Test helm wait_for_jobs
vars:
helm_namespace: "{{ test_namespace[15] }}"
chart_local: "{{ role_path }}/files/test-chart-job"
block:
- name: Install chart with wait and wait_for_jobs
helm:
binary_path: "{{ helm_binary }}"
chart_ref: "{{ chart_local }}"
release_name: test-wait-for-jobs
release_namespace: "{{ helm_namespace }}"
create_namespace: true
wait: true
wait_for_jobs: true
wait_timeout: "120s"
register: install
ignore_errors: true
- name: Validate wait_for_jobs with helm >= 3.5.0 works
assert:
that:
- install is changed
- "'--wait' in install.command"
- "'--wait-for-jobs' in install.command"
when: "helm_version is ansible.builtin.version('v3.5.0', '>=')"
- name: Validate wait_for_jobs with helm < 3.5.0 fails
assert:
that:
- install is failed
- "'wait_for_jobs requires helm >= 3.5.0' in install.msg"
when: "helm_version is ansible.builtin.version('v3.5.0', '<')"
- name: Install chart with wait_for_jobs but without wait
helm:
binary_path: "{{ helm_binary }}"
chart_ref: "{{ chart_local }}"
release_name: test-wait-for-jobs-no-wait
release_namespace: "{{ helm_namespace }}"
create_namespace: true
wait_for_jobs: true
register: install_no_wait
- name: Validate wait_for_jobs is ignored without wait
assert:
that:
- install_no_wait is changed
- "'--wait-for-jobs' not in install_no_wait.command"
- "'--wait' not in install_no_wait.command"
always:
- name: Remove helm namespace
k8s:
api_version: v1
kind: Namespace
name: "{{ helm_namespace }}"
state: absent