From 15d36c968888b60d6f778062950974e5a00d8690 Mon Sep 17 00:00:00 2001
From: "Johannes M. Scheuermann" <joh.scheuer@gmail.com>
Date: Tue, 26 Mar 2019 21:45:14 +0100
Subject: [PATCH] Use optional parameter for method

---
 kubernetes/e2e_test/test_utils.py    |  4 +-
 kubernetes/utils/__init__.py         |  3 +-
 kubernetes/utils/create_from_yaml.py | 60 +---------------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/kubernetes/e2e_test/test_utils.py b/kubernetes/e2e_test/test_utils.py
index ddb41dad1..f3adaf7c2 100644
--- a/kubernetes/e2e_test/test_utils.py
+++ b/kubernetes/e2e_test/test_utils.py
@@ -333,7 +333,7 @@ class TestUtils(unittest.TestCase):
         Should be able to create an apps/v1beta1 deployment.
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
-        utils.create_namespaced_from_yaml(
+        utils.create_from_yaml(
             k8s_client, self.path_prefix + "apps-deployment.yaml", namespace=self.test_namespace)
         app_api = client.AppsV1beta1Api(k8s_client)
         dep = app_api.read_namespaced_deployment(name="nginx-app",
@@ -349,7 +349,7 @@ class TestUtils(unittest.TestCase):
         specified in the multi-resource file
         """
         k8s_client = client.api_client.ApiClient(configuration=self.config)
-        utils.create_namespaced_from_yaml(
+        utils.create_from_yaml(
             k8s_client, self.path_prefix + "multi-resource-with-list.yaml", namespace=self.test_namespace)
         core_api = client.CoreV1Api(k8s_client)
         app_api = client.AppsV1beta1Api(k8s_client)
diff --git a/kubernetes/utils/__init__.py b/kubernetes/utils/__init__.py
index dee72861e..2b8597c2f 100644
--- a/kubernetes/utils/__init__.py
+++ b/kubernetes/utils/__init__.py
@@ -14,5 +14,4 @@
 
 from __future__ import absolute_import
 
-from .create_from_yaml import (FailToCreateError, create_from_yaml,
-                               create_namespaced_from_yaml)
+from .create_from_yaml import FailToCreateError, create_from_yaml
diff --git a/kubernetes/utils/create_from_yaml.py b/kubernetes/utils/create_from_yaml.py
index fce1b939c..c14850d80 100644
--- a/kubernetes/utils/create_from_yaml.py
+++ b/kubernetes/utils/create_from_yaml.py
@@ -22,49 +22,6 @@ from kubernetes import client
 
 
 def create_from_yaml(
-        k8s_client,
-        yaml_file,
-        verbose=False,
-        **kwargs):
-    """
-    Perform an action from a yaml file. Pass True for verbose to
-    print confirmation information.
-    Input:
-    yaml_file: string. Contains the path to yaml file.
-    k8s_client: an ApiClient object, initialized with the client args.
-    verbose: If True, print confirmation from the create action.
-        Default is False.
-
-    Returns:
-    An k8s api object or list of apis objects created from YAML.
-    When a single object is generated, return type is dependent
-    on output_list.
-
-    Throws a FailToCreateError exception if creation of any object
-    fails with helpful messages from the server.
-
-    Available parameters for creating <kind>:
-    :param async_req bool
-    :param bool include_uninitialized: If true, partially initialized
-        resources are included in the response.
-    :param str pretty: If 'true', then the output is pretty printed.
-    :param str dry_run: When present, indicates that modifications
-        should not be persisted. An invalid or unrecognized dryRun
-        directive will result in an error response and no further
-        processing of the request.
-        Valid values are: - All: all dry run stages will be processed
-    """
-
-    create_namespaced_from_yaml(
-        k8s_client,
-        yaml_file,
-        verbose,
-        namespace="default",
-        **kwargs
-    )
-
-
-def create_namespaced_from_yaml(
         k8s_client,
         yaml_file,
         verbose=False,
@@ -118,14 +75,14 @@ def create_namespaced_from_yaml(
                         yml_object["apiVersion"] = yml_document["apiVersion"]
                         yml_object["kind"] = kind
                     try:
-                        create_namespaced_from_yaml_single_item(
+                        create_from_yaml_single_item(
                             k8s_client, yml_object, verbose, namespace, **kwargs)
                     except client.rest.ApiException as api_exception:
                         api_exceptions.append(api_exception)
             else:
                 # This is a single object. Call the single item method
                 try:
-                    create_namespaced_from_yaml_single_item(
+                    create_from_yaml_single_item(
                         k8s_client, yml_document, verbose, namespace, **kwargs)
                 except client.rest.ApiException as api_exception:
                     api_exceptions.append(api_exception)
@@ -135,19 +92,6 @@ def create_namespaced_from_yaml(
 
 
 def create_from_yaml_single_item(
-        k8s_client,
-        yml_object,
-        verbose=False,
-        **kwargs):
-    create_namespaced_from_yaml_single_item(
-        k8s_client,
-        yml_object,
-        verbose,
-        namespace="default",
-        **kwargs)
-
-
-def create_namespaced_from_yaml_single_item(
         k8s_client,
         yml_object,
         verbose=False,