Merge branch 'kubernetes-client:master' into master

Author: xg0719

kubernetes/base/config/exec_provider.py

@@ -57,11 +57,12 @@ def __init__(self, exec_config, cwd):
         self.cwd = cwd or None
 
     def run(self, previous_response=None):
+        is_interactive = sys.stdout.isatty()
         kubernetes_exec_info = {
             'apiVersion': self.api_version,
             'kind': 'ExecCredential',
             'spec': {
-                'interactive': sys.stdout.isatty()
+                'interactive': is_interactive
             }
         }
         if previous_response:
@@ -70,7 +71,8 @@ def run(self, previous_response=None):
         process = subprocess.Popen(
             self.args,
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stderr=sys.stderr if is_interactive else subprocess.PIPE,
+            stdin=sys.stdin if is_interactive else None,
             cwd=self.cwd,
             env=self.env,
             universal_newlines=True)

kubernetes/base/dynamic/discovery.py

@@ -45,7 +45,7 @@ def __init__(self, client, cache_file):
         default_cache_id = self.client.configuration.host
         if six.PY3:
             default_cache_id = default_cache_id.encode('utf-8')
-        default_cachefile_name = 'osrcp-{0}.json'.format(hashlib.md5(default_cache_id).hexdigest())
+        default_cachefile_name = 'osrcp-{0}.json'.format(hashlib.md5(default_cache_id, usedforsecurity=False).hexdigest())
         self.__cache_file = cache_file or os.path.join(tempfile.gettempdir(), default_cachefile_name)
         self.__init_cache()