Skip to content

Commit 13f847e

Browse files
mbohloolmbohlool
committed
Merge branch 'master' of github.com:kubernetes-incubator/client-python into release-2.0
Release 2.0.0b1
2 parents 66ceec4 + 1517bca commit 13f847e

File tree

798 files changed

+1819
-1832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

798 files changed

+1819
-1832
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# v1.0.1
2+
- Bugfix: urllib3 1.21 fails tests, Excluding version 1.21 from dependencies #197
3+
4+
# v2.0.0b1
5+
- Add support for attach API calls #180
6+
- Bugfix: token file should not be decoded #182
7+
- Inline primitive models (e.g. v1.Time and resource.Quantity) #179
8+
- Bugfix: urllib3 1.21 fails tests, Excluding version 1.21 from dependencies #197
9+
110
# v2.0.0a1
211
- Update to kubernetes 1.6 spec #169
312

‎README.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,43 @@ python -m examples.example1
7575

7676
All APIs and Models' documentation can be found at the [Generated client's README file](kubernetes/README.md)
7777

78+
## Compatibility
79+
80+
`client-python` follows [semver](http://semver.org/), so until the major version of
81+
client-python gets increased, your code will continue to work with explicitly
82+
supported versions of Kubernetes clusters.
83+
84+
#### Compatibility matrix
85+
86+
| | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 |
87+
|-------------------------|----------------|----------------|----------------|----------------|
88+
| client-python 1.0 | + | + | ✓ | - |
89+
| client-python 2.0 alpha | + | + | + | ✓ |
90+
| client-python HEAD | + | + | + | + |
91+
92+
Key:
93+
94+
* `✓` Exactly the same features / API objects in both client-python and the Kubernetes
95+
version.
96+
* `+` client-python has features or api objects that may not be present in the
97+
Kubernetes cluster, but everything they have in common will work.
98+
* `-` The Kubernetes cluster has features the client-python library can't use
99+
(additional API objects, etc).
100+
101+
See the [CHANGELOG](./CHANGELOG.md) for a detailed description of changes
102+
between client-python versions.
103+
104+
| Client version | Canonical source for OpenAPI spec | Maintenance status |
105+
|----------------|--------------------------------------|-------------------------------|
106+
| 1.0 Alpha/Beta | Kubernetes main repo, 1.5 branch | ✗ |
107+
| 1.0.x | Kubernetes main repo, 1.5 branch | ✓ |
108+
| 2.0 alpha | Kubernetes main repo, 1.6 branch | ✓ |
109+
110+
Key:
111+
112+
* `✓` Changes in main Kubernetes repo are manually ([should be automated](https://github.com/kubernetes-incubator/client-python/issues/177)) published to client-python when they are available.
113+
* `✗` No longer maintained; please upgrade.
114+
78115
## Community, Support, Discussion
79116

80117
You can reach the maintainers of this project at [SIG API Machinery](https://github.com/kubernetes/community/tree/master/sig-api-machinery). If you have any problem with the package or any suggestions, please file an [issue](https://github.com/kubernetes-incubator/client-python/issues).

‎devel/release.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ numbers (integers) and D is one of "a" for alpha or "b" for beta and n is the
4848
pre-release number. For a final release, "Dn" part should be omitted. Examples:
4949
1.0.0a1, 2.0.1b2, 1.5.1.
5050

51-
SPEC_VERSION: This would be the kubernetes OpenAPI spec version. It should be
52-
deprecated after kubernetes/kubernetes#37055 takes effect.
53-
5451
DEVELOPMENT_STATUS: Update it to one of the values of "Development Status"
5552
in [this list](https://pypi.python.org/pypi?%3Aaction=list_classifiers).
5653

‎kubernetes/README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ No description provided (generated by Swagger Codegen https://github.com/swagger
33

44
This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
55

6-
- API version: v1.6.1
7-
- Package version: 2.0.0a1
6+
- API version: v1.6.3
7+
- Package version: 2.0.0-snapshot
88
- Build package: io.swagger.codegen.languages.PythonClientCodegen
99

1010
## Requirements.
@@ -635,8 +635,6 @@ Class | Method | HTTP request | Description
635635
- [ExtensionsV1beta1Scale](docs/ExtensionsV1beta1Scale.md)
636636
- [ExtensionsV1beta1ScaleSpec](docs/ExtensionsV1beta1ScaleSpec.md)
637637
- [ExtensionsV1beta1ScaleStatus](docs/ExtensionsV1beta1ScaleStatus.md)
638-
- [IntstrIntOrString](docs/IntstrIntOrString.md)
639-
- [ResourceQuantity](docs/ResourceQuantity.md)
640638
- [RuntimeRawExtension](docs/RuntimeRawExtension.md)
641639
- [V1APIGroup](docs/V1APIGroup.md)
642640
- [V1APIGroupList](docs/V1APIGroupList.md)
@@ -817,7 +815,6 @@ Class | Method | HTTP request | Description
817815
- [V1SubjectAccessReviewStatus](docs/V1SubjectAccessReviewStatus.md)
818816
- [V1TCPSocketAction](docs/V1TCPSocketAction.md)
819817
- [V1Taint](docs/V1Taint.md)
820-
- [V1Time](docs/V1Time.md)
821818
- [V1TokenReview](docs/V1TokenReview.md)
822819
- [V1TokenReviewSpec](docs/V1TokenReviewSpec.md)
823820
- [V1TokenReviewStatus](docs/V1TokenReviewStatus.md)

‎kubernetes/client/__init__.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
77
8-
OpenAPI spec version: v1.6.1
8+
OpenAPI spec version: v1.6.3
99
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""
@@ -38,8 +38,6 @@
3838
from .models.extensions_v1beta1_scale import ExtensionsV1beta1Scale
3939
from .models.extensions_v1beta1_scale_spec import ExtensionsV1beta1ScaleSpec
4040
from .models.extensions_v1beta1_scale_status import ExtensionsV1beta1ScaleStatus
41-
from .models.intstr_int_or_string import IntstrIntOrString
42-
from .models.resource_quantity import ResourceQuantity
4341
from .models.runtime_raw_extension import RuntimeRawExtension
4442
from .models.v1_api_group import V1APIGroup
4543
from .models.v1_api_group_list import V1APIGroupList
@@ -220,7 +218,6 @@
220218
from .models.v1_subject_access_review_status import V1SubjectAccessReviewStatus
221219
from .models.v1_tcp_socket_action import V1TCPSocketAction
222220
from .models.v1_taint import V1Taint
223-
from .models.v1_time import V1Time
224221
from .models.v1_token_review import V1TokenReview
225222
from .models.v1_token_review_spec import V1TokenReviewSpec
226223
from .models.v1_token_review_status import V1TokenReviewStatus

‎kubernetes/client/api_client.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def request(self, method, url, query_params=None, headers=None,
346346
"""
347347
# FIXME(dims) : We need a better way to figure out which
348348
# calls end up using web sockets
349-
if url.endswith('/exec') and (method == "GET" or method == "POST"):
349+
if (url.endswith('/exec') or url.endswith('/attach')) and (method == "GET" or method == "POST"):
350350
return ws_client.websocket_call(self.config,
351351
url,
352352
query_params=query_params,
@@ -585,6 +585,8 @@ def __deserialize_date(self, string):
585585
:param string: str.
586586
:return: date.
587587
"""
588+
if not string:
589+
return None
588590
try:
589591
from dateutil.parser import parse
590592
return parse(string).date()
@@ -606,6 +608,8 @@ def __deserialize_datatime(self, string):
606608
:param string: str.
607609
:return: datetime.
608610
"""
611+
if not string:
612+
return None
609613
try:
610614
from dateutil.parser import parse
611615
return parse(string)

‎kubernetes/client/apis/apis_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
77
8-
OpenAPI spec version: v1.6.1
8+
OpenAPI spec version: v1.6.3
99
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""

‎kubernetes/client/apis/apps_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
77
8-
OpenAPI spec version: v1.6.1
8+
OpenAPI spec version: v1.6.3
99
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""

‎kubernetes/client/apis/apps_v1beta1_api.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
77
8-
OpenAPI spec version: v1.6.1
8+
OpenAPI spec version: v1.6.3
99
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""
@@ -1537,7 +1537,7 @@ def patch_namespaced_deployment(self, name, namespace, body, **kwargs):
15371537
for asynchronous request. (optional)
15381538
:param str name: name of the Deployment (required)
15391539
:param str namespace: object name and auth scope, such as for teams and projects (required)
1540-
:param V1Patch body: (required)
1540+
:param object body: (required)
15411541
:param str pretty: If 'true', then the output is pretty printed.
15421542
:return: AppsV1beta1Deployment
15431543
If the method is called asynchronously,
@@ -1565,7 +1565,7 @@ def patch_namespaced_deployment_with_http_info(self, name, namespace, body, **kw
15651565
for asynchronous request. (optional)
15661566
:param str name: name of the Deployment (required)
15671567
:param str namespace: object name and auth scope, such as for teams and projects (required)
1568-
:param V1Patch body: (required)
1568+
:param object body: (required)
15691569
:param str pretty: If 'true', then the output is pretty printed.
15701570
:return: AppsV1beta1Deployment
15711571
If the method is called asynchronously,
@@ -1660,7 +1660,7 @@ def patch_namespaced_deployment_status(self, name, namespace, body, **kwargs):
16601660
for asynchronous request. (optional)
16611661
:param str name: name of the Deployment (required)
16621662
:param str namespace: object name and auth scope, such as for teams and projects (required)
1663-
:param V1Patch body: (required)
1663+
:param object body: (required)
16641664
:param str pretty: If 'true', then the output is pretty printed.
16651665
:return: AppsV1beta1Deployment
16661666
If the method is called asynchronously,
@@ -1688,7 +1688,7 @@ def patch_namespaced_deployment_status_with_http_info(self, name, namespace, bod
16881688
for asynchronous request. (optional)
16891689
:param str name: name of the Deployment (required)
16901690
:param str namespace: object name and auth scope, such as for teams and projects (required)
1691-
:param V1Patch body: (required)
1691+
:param object body: (required)
16921692
:param str pretty: If 'true', then the output is pretty printed.
16931693
:return: AppsV1beta1Deployment
16941694
If the method is called asynchronously,
@@ -1783,7 +1783,7 @@ def patch_namespaced_scale_scale(self, name, namespace, body, **kwargs):
17831783
for asynchronous request. (optional)
17841784
:param str name: name of the Scale (required)
17851785
:param str namespace: object name and auth scope, such as for teams and projects (required)
1786-
:param V1Patch body: (required)
1786+
:param object body: (required)
17871787
:param str pretty: If 'true', then the output is pretty printed.
17881788
:return: AppsV1beta1Scale
17891789
If the method is called asynchronously,
@@ -1811,7 +1811,7 @@ def patch_namespaced_scale_scale_with_http_info(self, name, namespace, body, **k
18111811
for asynchronous request. (optional)
18121812
:param str name: name of the Scale (required)
18131813
:param str namespace: object name and auth scope, such as for teams and projects (required)
1814-
:param V1Patch body: (required)
1814+
:param object body: (required)
18151815
:param str pretty: If 'true', then the output is pretty printed.
18161816
:return: AppsV1beta1Scale
18171817
If the method is called asynchronously,
@@ -1906,7 +1906,7 @@ def patch_namespaced_stateful_set(self, name, namespace, body, **kwargs):
19061906
for asynchronous request. (optional)
19071907
:param str name: name of the StatefulSet (required)
19081908
:param str namespace: object name and auth scope, such as for teams and projects (required)
1909-
:param V1Patch body: (required)
1909+
:param object body: (required)
19101910
:param str pretty: If 'true', then the output is pretty printed.
19111911
:return: V1beta1StatefulSet
19121912
If the method is called asynchronously,
@@ -1934,7 +1934,7 @@ def patch_namespaced_stateful_set_with_http_info(self, name, namespace, body, **
19341934
for asynchronous request. (optional)
19351935
:param str name: name of the StatefulSet (required)
19361936
:param str namespace: object name and auth scope, such as for teams and projects (required)
1937-
:param V1Patch body: (required)
1937+
:param object body: (required)
19381938
:param str pretty: If 'true', then the output is pretty printed.
19391939
:return: V1beta1StatefulSet
19401940
If the method is called asynchronously,
@@ -2029,7 +2029,7 @@ def patch_namespaced_stateful_set_status(self, name, namespace, body, **kwargs):
20292029
for asynchronous request. (optional)
20302030
:param str name: name of the StatefulSet (required)
20312031
:param str namespace: object name and auth scope, such as for teams and projects (required)
2032-
:param V1Patch body: (required)
2032+
:param object body: (required)
20332033
:param str pretty: If 'true', then the output is pretty printed.
20342034
:return: V1beta1StatefulSet
20352035
If the method is called asynchronously,
@@ -2057,7 +2057,7 @@ def patch_namespaced_stateful_set_status_with_http_info(self, name, namespace, b
20572057
for asynchronous request. (optional)
20582058
:param str name: name of the StatefulSet (required)
20592059
:param str namespace: object name and auth scope, such as for teams and projects (required)
2060-
:param V1Patch body: (required)
2060+
:param object body: (required)
20612061
:param str pretty: If 'true', then the output is pretty printed.
20622062
:return: V1beta1StatefulSet
20632063
If the method is called asynchronously,

‎kubernetes/client/apis/authentication_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
77
8-
OpenAPI spec version: v1.6.1
8+
OpenAPI spec version: v1.6.3
99
1010
Generated by: https://github.com/swagger-api/swagger-codegen.git
1111
"""

0 commit comments

Comments
 (0)