From 9469892ee15846fe138c1d74fec76da05be244c9 Mon Sep 17 00:00:00 2001 From: Conner Crosby Date: Mon, 22 Apr 2024 09:29:47 -0400 Subject: [PATCH] Update deprecation version for merge_type=json --- plugins/modules/k8s.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/k8s.py b/plugins/modules/k8s.py index dbb1476086..f90d465d31 100644 --- a/plugins/modules/k8s.py +++ b/plugins/modules/k8s.py @@ -63,7 +63,7 @@ C(['strategic-merge', 'merge']), which is ideal for using the same parameters on resource kinds that combine Custom Resources and built-in resources. - mutually exclusive with C(apply) - - I(merge_type=json) is deprecated and will be removed in version 3.0.0. Please use M(kubernetes.core.k8s_json_patch) instead. + - I(merge_type=json) is deprecated and will be removed in version 4.0.0. Please use M(kubernetes.core.k8s_json_patch) instead. choices: - json - merge