From 75b91d1853be67ddf556d419fe4bc147552bb43e Mon Sep 17 00:00:00 2001 From: Romi Asad <54517168+Romi1495@users.noreply.github.com> Date: Mon, 3 Aug 2026 10:08:40 -0500 Subject: [PATCH] Fix deprecated imports (#284) * Imports replaced * Added changelog fragment * Changing chanelog fragment category to minor_changes --- changelogs/fragments/fix-deprecated-text-imports.yml | 2 ++ plugins/module_utils/k8s.py | 2 +- plugins/module_utils/openshift_adm_prune_auth.py | 2 +- plugins/module_utils/openshift_adm_prune_deployments.py | 2 +- plugins/module_utils/openshift_adm_prune_images.py | 2 +- plugins/module_utils/openshift_builds.py | 2 +- plugins/module_utils/openshift_common.py | 2 +- plugins/module_utils/openshift_groups.py | 2 +- plugins/module_utils/openshift_process.py | 2 +- plugins/modules/openshift_adm_migrate_template_instances.py | 2 +- plugins/modules/openshift_route.py | 2 +- 11 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 changelogs/fragments/fix-deprecated-text-imports.yml diff --git a/changelogs/fragments/fix-deprecated-text-imports.yml b/changelogs/fragments/fix-deprecated-text-imports.yml new file mode 100644 index 0000000..6d9aa46 --- /dev/null +++ b/changelogs/fragments/fix-deprecated-text-imports.yml @@ -0,0 +1,2 @@ +minor_changes: + - Replace deprecated ``ansible.module_utils._text`` imports with ``ansible.module_utils.common.text.converters`` to fix compatibility with ansible-core 2.24+ (https://github.com/openshift/community.okd/issues/275). diff --git a/plugins/module_utils/k8s.py b/plugins/module_utils/k8s.py index 9c8f47f..6d8eae4 100644 --- a/plugins/module_utils/k8s.py +++ b/plugins/module_utils/k8s.py @@ -21,7 +21,7 @@ try: except ImportError: pass -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native try: from kubernetes.dynamic.exceptions import ( diff --git a/plugins/module_utils/openshift_adm_prune_auth.py b/plugins/module_utils/openshift_adm_prune_auth.py index f286405..d1a16e5 100644 --- a/plugins/module_utils/openshift_adm_prune_auth.py +++ b/plugins/module_utils/openshift_adm_prune_auth.py @@ -4,7 +4,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule, diff --git a/plugins/module_utils/openshift_adm_prune_deployments.py b/plugins/module_utils/openshift_adm_prune_deployments.py index 315de4b..c570244 100644 --- a/plugins/module_utils/openshift_adm_prune_deployments.py +++ b/plugins/module_utils/openshift_adm_prune_deployments.py @@ -6,7 +6,7 @@ __metaclass__ = type from datetime import datetime, timezone -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule, diff --git a/plugins/module_utils/openshift_adm_prune_images.py b/plugins/module_utils/openshift_adm_prune_images.py index 3be36bb..b97e315 100644 --- a/plugins/module_utils/openshift_adm_prune_images.py +++ b/plugins/module_utils/openshift_adm_prune_images.py @@ -7,7 +7,7 @@ __metaclass__ = type from datetime import datetime, timezone, timedelta import copy -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.parsing.convert_bool import boolean from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( diff --git a/plugins/module_utils/openshift_builds.py b/plugins/module_utils/openshift_builds.py index 51ebfc2..099a5f5 100644 --- a/plugins/module_utils/openshift_builds.py +++ b/plugins/module_utils/openshift_builds.py @@ -7,7 +7,7 @@ __metaclass__ = type from datetime import datetime, timezone, timedelta import time -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule, diff --git a/plugins/module_utils/openshift_common.py b/plugins/module_utils/openshift_common.py index b818b7a..4d128f6 100644 --- a/plugins/module_utils/openshift_common.py +++ b/plugins/module_utils/openshift_common.py @@ -7,7 +7,7 @@ __metaclass__ = type import traceback from abc import abstractmethod -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native try: from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import ( diff --git a/plugins/module_utils/openshift_groups.py b/plugins/module_utils/openshift_groups.py index 473a14f..ca21849 100644 --- a/plugins/module_utils/openshift_groups.py +++ b/plugins/module_utils/openshift_groups.py @@ -11,7 +11,7 @@ __metaclass__ = type from datetime import datetime from ansible.module_utils.parsing.convert_bool import boolean -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.basic import missing_required_lib from ansible_collections.community.okd.plugins.module_utils.openshift_ldap import ( diff --git a/plugins/module_utils/openshift_process.py b/plugins/module_utils/openshift_process.py index 3996aed..82aa8eb 100644 --- a/plugins/module_utils/openshift_process.py +++ b/plugins/module_utils/openshift_process.py @@ -6,7 +6,7 @@ __metaclass__ = type import os -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule, diff --git a/plugins/modules/openshift_adm_migrate_template_instances.py b/plugins/modules/openshift_adm_migrate_template_instances.py index 0033e14..9765ce0 100644 --- a/plugins/modules/openshift_adm_migrate_template_instances.py +++ b/plugins/modules/openshift_adm_migrate_template_instances.py @@ -233,7 +233,7 @@ result: """ # ENDREMOVE (downstream) -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule, diff --git a/plugins/modules/openshift_route.py b/plugins/modules/openshift_route.py index 8e95b43..ea746c0 100644 --- a/plugins/modules/openshift_route.py +++ b/plugins/modules/openshift_route.py @@ -308,7 +308,7 @@ duration: import copy -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.community.okd.plugins.module_utils.openshift_common import ( AnsibleOpenshiftModule,