Skip to content

Commit 4da62cf

Browse files
committed
Move config and watch into a base folder to prepare for multi-repo client-python
1 parent c1ad663 commit 4da62cf

File tree

12 files changed

+19
-7
lines changed

12 files changed

+19
-7
lines changed

kubernetes/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414

1515
import kubernetes.client
16-
import kubernetes.config
17-
import kubernetes.watch
16+
from kubernetes.base import config
17+
from kubernetes.base import watch

kubernetes/base/__init__.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright 2016 The Kubernetes Authors.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
File renamed without changes.

kubernetes/config/kube_config.py renamed to kubernetes/base/config/kube_config.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ def list_kube_config_contexts(config_file=None):
290290
loader = _get_kube_config_loader_for_yaml_file(config_file)
291291
return loader.list_contexts(), loader.current_context
292292

293-
294293
def load_kube_config(config_file=None, context=None,
295294
client_configuration=configuration):
296295
"""Loads authentication and cluster information from kube-config file
@@ -310,7 +309,6 @@ def load_kube_config(config_file=None, context=None,
310309
config_file, active_context=context,
311310
client_configuration=client_configuration).load_and_set()
312311

313-
314312
def new_client_from_config(config_file=None, context=None):
315313
"""Loads configuration the same as load_kube_config but returns an ApiClient
316314
to be used with any API object. This will allow the caller to concurrently
File renamed without changes.
File renamed without changes.
File renamed without changes.

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
url="https://github.com/kubernetes-incubator/client-python",
5050
keywords=["Swagger", "OpenAPI", "Kubernetes"],
5151
install_requires=REQUIRES,
52-
packages=['kubernetes', 'kubernetes.client', 'kubernetes.config',
53-
'kubernetes.watch', 'kubernetes.client.apis',
54-
'kubernetes.client.models'],
52+
packages=['kubernetes', 'kubernetes.client', 'kubernetes.base.config',
53+
'kubernetes.base.watch', 'kubernetes.client.apis',
54+
'kubernetes.client.models', 'kubernetes.base'],
5555
include_package_data=True,
5656
long_description="""\
5757
Python client for kubernetes http://kubernetes.io/

0 commit comments

Comments
 (0)