From c05b50c4ff57843ab4c9c59a3d0ffe1f21646e44 Mon Sep 17 00:00:00 2001 From: mbohlool Date: Thu, 19 Jan 2017 13:44:30 -0800 Subject: [PATCH] Bugfix: kubernetes/client/__init__.py was not updated resulting in not exported models --- kubernetes/.swagger-codegen-ignore | 1 - kubernetes/client/__init__.py | 42 +++++++++++++++++++++--------- scripts/update-client.sh | 5 +++- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/kubernetes/.swagger-codegen-ignore b/kubernetes/.swagger-codegen-ignore index 301f4d8ce..9f56934d6 100644 --- a/kubernetes/.swagger-codegen-ignore +++ b/kubernetes/.swagger-codegen-ignore @@ -5,7 +5,6 @@ test-requirements.txt setup.py .travis.yml tox.ini -client/__init__.py client/api_client.py client/configuration.py client/rest.py diff --git a/kubernetes/client/__init__.py b/kubernetes/client/__init__.py index fc490082d..4925844df 100644 --- a/kubernetes/client/__init__.py +++ b/kubernetes/client/__init__.py @@ -5,23 +5,12 @@ No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) - OpenAPI spec version: v1.5.0-snapshot + OpenAPI spec version: v1.5.1-660c2a2 Generated by: https://github.com/swagger-api/swagger-codegen.git - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. """ + from __future__ import absolute_import # import models into sdk package @@ -42,15 +31,21 @@ from .models.unversioned_status import UnversionedStatus from .models.unversioned_status_cause import UnversionedStatusCause from .models.unversioned_status_details import UnversionedStatusDetails from .models.unversioned_time import UnversionedTime +from .models.v1_aws_elastic_block_store_volume_source import V1AWSElasticBlockStoreVolumeSource from .models.v1_attached_volume import V1AttachedVolume +from .models.v1_azure_disk_volume_source import V1AzureDiskVolumeSource +from .models.v1_azure_file_volume_source import V1AzureFileVolumeSource from .models.v1_binding import V1Binding from .models.v1_capabilities import V1Capabilities +from .models.v1_ceph_fs_volume_source import V1CephFSVolumeSource +from .models.v1_cinder_volume_source import V1CinderVolumeSource from .models.v1_component_condition import V1ComponentCondition from .models.v1_component_status import V1ComponentStatus from .models.v1_component_status_list import V1ComponentStatusList from .models.v1_config_map import V1ConfigMap from .models.v1_config_map_key_selector import V1ConfigMapKeySelector from .models.v1_config_map_list import V1ConfigMapList +from .models.v1_config_map_volume_source import V1ConfigMapVolumeSource from .models.v1_container import V1Container from .models.v1_container_image import V1ContainerImage from .models.v1_container_port import V1ContainerPort @@ -62,6 +57,9 @@ from .models.v1_container_status import V1ContainerStatus from .models.v1_cross_version_object_reference import V1CrossVersionObjectReference from .models.v1_daemon_endpoint import V1DaemonEndpoint from .models.v1_delete_options import V1DeleteOptions +from .models.v1_downward_api_volume_file import V1DownwardAPIVolumeFile +from .models.v1_downward_api_volume_source import V1DownwardAPIVolumeSource +from .models.v1_empty_dir_volume_source import V1EmptyDirVolumeSource from .models.v1_endpoint_address import V1EndpointAddress from .models.v1_endpoint_port import V1EndpointPort from .models.v1_endpoint_subset import V1EndpointSubset @@ -73,6 +71,12 @@ from .models.v1_event import V1Event from .models.v1_event_list import V1EventList from .models.v1_event_source import V1EventSource from .models.v1_exec_action import V1ExecAction +from .models.v1_fc_volume_source import V1FCVolumeSource +from .models.v1_flex_volume_source import V1FlexVolumeSource +from .models.v1_flocker_volume_source import V1FlockerVolumeSource +from .models.v1_gce_persistent_disk_volume_source import V1GCEPersistentDiskVolumeSource +from .models.v1_git_repo_volume_source import V1GitRepoVolumeSource +from .models.v1_glusterfs_volume_source import V1GlusterfsVolumeSource from .models.v1_http_get_action import V1HTTPGetAction from .models.v1_http_header import V1HTTPHeader from .models.v1_handler import V1Handler @@ -80,11 +84,14 @@ from .models.v1_horizontal_pod_autoscaler import V1HorizontalPodAutoscaler from .models.v1_horizontal_pod_autoscaler_list import V1HorizontalPodAutoscalerList from .models.v1_horizontal_pod_autoscaler_spec import V1HorizontalPodAutoscalerSpec from .models.v1_horizontal_pod_autoscaler_status import V1HorizontalPodAutoscalerStatus +from .models.v1_host_path_volume_source import V1HostPathVolumeSource +from .models.v1_iscsi_volume_source import V1ISCSIVolumeSource from .models.v1_job import V1Job from .models.v1_job_condition import V1JobCondition from .models.v1_job_list import V1JobList from .models.v1_job_spec import V1JobSpec from .models.v1_job_status import V1JobStatus +from .models.v1_key_to_path import V1KeyToPath from .models.v1_lifecycle import V1Lifecycle from .models.v1_limit_range import V1LimitRange from .models.v1_limit_range_item import V1LimitRangeItem @@ -93,6 +100,7 @@ from .models.v1_limit_range_spec import V1LimitRangeSpec from .models.v1_load_balancer_ingress import V1LoadBalancerIngress from .models.v1_load_balancer_status import V1LoadBalancerStatus from .models.v1_local_object_reference import V1LocalObjectReference +from .models.v1_nfs_volume_source import V1NFSVolumeSource from .models.v1_namespace import V1Namespace from .models.v1_namespace_list import V1NamespaceList from .models.v1_namespace_spec import V1NamespaceSpec @@ -114,9 +122,11 @@ from .models.v1_persistent_volume_claim import V1PersistentVolumeClaim from .models.v1_persistent_volume_claim_list import V1PersistentVolumeClaimList from .models.v1_persistent_volume_claim_spec import V1PersistentVolumeClaimSpec from .models.v1_persistent_volume_claim_status import V1PersistentVolumeClaimStatus +from .models.v1_persistent_volume_claim_volume_source import V1PersistentVolumeClaimVolumeSource from .models.v1_persistent_volume_list import V1PersistentVolumeList from .models.v1_persistent_volume_spec import V1PersistentVolumeSpec from .models.v1_persistent_volume_status import V1PersistentVolumeStatus +from .models.v1_photon_persistent_disk_volume_source import V1PhotonPersistentDiskVolumeSource from .models.v1_pod import V1Pod from .models.v1_pod_condition import V1PodCondition from .models.v1_pod_list import V1PodList @@ -128,6 +138,8 @@ from .models.v1_pod_template_list import V1PodTemplateList from .models.v1_pod_template_spec import V1PodTemplateSpec from .models.v1_preconditions import V1Preconditions from .models.v1_probe import V1Probe +from .models.v1_quobyte_volume_source import V1QuobyteVolumeSource +from .models.v1_rbd_volume_source import V1RBDVolumeSource from .models.v1_replication_controller import V1ReplicationController from .models.v1_replication_controller_condition import V1ReplicationControllerCondition from .models.v1_replication_controller_list import V1ReplicationControllerList @@ -146,6 +158,7 @@ from .models.v1_scale_status import V1ScaleStatus from .models.v1_secret import V1Secret from .models.v1_secret_key_selector import V1SecretKeySelector from .models.v1_secret_list import V1SecretList +from .models.v1_secret_volume_source import V1SecretVolumeSource from .models.v1_security_context import V1SecurityContext from .models.v1_service import V1Service from .models.v1_service_account import V1ServiceAccount @@ -157,6 +170,7 @@ from .models.v1_service_status import V1ServiceStatus from .models.v1_tcp_socket_action import V1TCPSocketAction from .models.v1_volume import V1Volume from .models.v1_volume_mount import V1VolumeMount +from .models.v1_vsphere_virtual_disk_volume_source import V1VsphereVirtualDiskVolumeSource from .models.v1alpha1_certificate_signing_request import V1alpha1CertificateSigningRequest from .models.v1alpha1_certificate_signing_request_condition import V1alpha1CertificateSigningRequestCondition from .models.v1alpha1_certificate_signing_request_list import V1alpha1CertificateSigningRequestList @@ -187,6 +201,8 @@ from .models.v1beta1_deployment_spec import V1beta1DeploymentSpec from .models.v1beta1_deployment_status import V1beta1DeploymentStatus from .models.v1beta1_deployment_strategy import V1beta1DeploymentStrategy from .models.v1beta1_eviction import V1beta1Eviction +from .models.v1beta1_http_ingress_path import V1beta1HTTPIngressPath +from .models.v1beta1_http_ingress_rule_value import V1beta1HTTPIngressRuleValue from .models.v1beta1_horizontal_pod_autoscaler import V1beta1HorizontalPodAutoscaler from .models.v1beta1_horizontal_pod_autoscaler_list import V1beta1HorizontalPodAutoscalerList from .models.v1beta1_horizontal_pod_autoscaler_spec import V1beta1HorizontalPodAutoscalerSpec diff --git a/scripts/update-client.sh b/scripts/update-client.sh index f50a7fdf8..7453839ce 100755 --- a/scripts/update-client.sh +++ b/scripts/update-client.sh @@ -61,5 +61,8 @@ echo "--- updating version information..." sed -i'' "s/^CLIENT_VERSION = .*/CLIENT_VERSION = \\\"${CLIENT_VERSION}\\\"/" "${SCRIPT_ROOT}/../setup.py" sed -i'' "s/^PACKAGE_NAME = .*/PACKAGE_NAME = \\\"${PACKAGE_NAME}\\\"/" "${SCRIPT_ROOT}/../setup.py" sed -i'' "s/^DEVELOPMENT_STATUS = .*/DEVELOPMENT_STATUS = \\\"${DEVELOPMENT_STATUS}\\\"/" "${SCRIPT_ROOT}/../setup.py" - +sed -i'' "/^configuration = Configuration()$/d" "${CLIENT_ROOT}/client/__init__.py" +sed -i'' "/^from .configuration import Configuration$/d" "${CLIENT_ROOT}/client/__init__.py" +sed -i '${/^$/d;}' "${CLIENT_ROOT}/client/__init__.py" +echo "from .configuration import Configuration, ConfigurationObject, configuration" >> "${CLIENT_ROOT}/client/__init__.py" echo "---Done."