internet/kubernetes.core
3
0
Fork 0
mirror of https://github.com/ansible-collections/kubernetes.core.git synced 2026-03-27 05:43:02 +00:00
Code Issues Projects Releases Wiki Activity

Remove distutils from connection plugin (#456)

Browse Source 
Remove distutils from connection plugin

Depends-On: ansible/ansible-zuul-jobs#1527
SUMMARY

distutils.spawn.find_executable is deprecated and shutils.which is a
suitable replacement.

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Gonéri Le Bouder <goneri@lebouder.net>
Reviewed-by: Joseph Torcasso <None>
This commit is contained in:
Mike Graves
2022-05-11 14:56:27 -04:00
committed by GitHub
parent 77dd2496d0
commit 531a9fe3ac
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/456-replace-distutils.yml Normal file
View File

@@ -0,0 +1,2 @@
minor_changes:
- kubectl.py - replace distutils.spawn.find_executable with shutil.which in the kubectl connection plugin (https://github.com/ansible-collections/kubernetes.core/pull/456).

13
plugins/connection/kubectl.py
View File

@@ -171,9 +171,9 @@ DOCUMENTATION = r"""
aliases: [ kubectl_verify_ssl ] aliases: [ kubectl_verify_ssl ]
""" """
import distutils.spawn
import os import os
import os.path import os.path
import shutil
import subprocess import subprocess
from ansible.parsing.yaml.loader import AnsibleLoader from ansible.parsing.yaml.loader import AnsibleLoader
@@ -219,14 +219,9 @@ class Connection(ConnectionBase):
# Note: kubectl runs commands as the user that started the container. # Note: kubectl runs commands as the user that started the container.
# It is impossible to set the remote user for a kubectl connection. # It is impossible to set the remote user for a kubectl connection.
cmd_arg = "{0}_command".format(self.transport) cmd_arg = "{0}_command".format(self.transport)
if cmd_arg in kwargs: self.transport_cmd = kwargs.get(cmd_arg, shutil.which(self.transport))
self.transport_cmd = kwargs[cmd_arg] if not self.transport_cmd:
else: raise AnsibleError("{0} command not found in PATH".format(self.transport))
self.transport_cmd = distutils.spawn.find_executable(self.transport)
if not self.transport_cmd:
raise AnsibleError(
"{0} command not found in PATH".format(self.transport)
)
def _build_exec_cmd(self, cmd): def _build_exec_cmd(self, cmd):
"""Build the local kubectl exec command to run cmd on remote_host""" """Build the local kubectl exec command to run cmd on remote_host"""