diff --git a/.coveragerc b/.coveragerc index d1af5fa4..113f6dbc 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,6 +5,7 @@ branch = True show_missing = True omit = google/cloud/container/__init__.py + google/cloud/container/gapic_version.py exclude_lines = # Re-enable the standard pragma pragma: NO COVER diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 889f77df..f0f3b24b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:c43f1d918bcf817d337aa29ff833439494a158a0831508fda4ec75dc4c0d0320 + digest: sha256:f946c75373c2b0040e8e318c5e85d0cf46bc6e61d0a01f3ef94d8de974ac6790 diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3253b5b1..c8e5b4d1 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.17.1" + ".": "2.17.2" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fef0348..0b924aa9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://pypi.org/project/google-cloud-container/#history +## [2.17.2](https://github.com/googleapis/python-container/compare/v2.17.1...v2.17.2) (2023-01-30) + + +### Documentation + +* Add references for available node image types ([76cfff8](https://github.com/googleapis/python-container/commit/76cfff85542aa1a8326efbfbc6d1c95b663e1452)) +* Clarified wording around the NodePoolUpdateStrategy default behavior ([76cfff8](https://github.com/googleapis/python-container/commit/76cfff85542aa1a8326efbfbc6d1c95b663e1452)) + ## [2.17.1](https://github.com/googleapis/python-container/compare/v2.17.0...v2.17.1) (2023-01-20) diff --git a/google/cloud/container/gapic_version.py b/google/cloud/container/gapic_version.py index c3950a4a..7f7a51c6 100644 --- a/google/cloud/container/gapic_version.py +++ b/google/cloud/container/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.17.1" # {x-release-please-version} +__version__ = "2.17.2" # {x-release-please-version} diff --git a/google/cloud/container_v1/__init__.py b/google/cloud/container_v1/__init__.py index e4a50957..b31f65cd 100644 --- a/google/cloud/container_v1/__init__.py +++ b/google/cloud/container_v1/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from google.cloud.container import gapic_version as package_version +from google.cloud.container_v1 import gapic_version as package_version __version__ = package_version.__version__ diff --git a/google/cloud/container_v1/gapic_version.py b/google/cloud/container_v1/gapic_version.py index c3950a4a..7f7a51c6 100644 --- a/google/cloud/container_v1/gapic_version.py +++ b/google/cloud/container_v1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.17.1" # {x-release-please-version} +__version__ = "2.17.2" # {x-release-please-version} diff --git a/google/cloud/container_v1/types/cluster_service.py b/google/cloud/container_v1/types/cluster_service.py index 3096d002..8258e9a3 100644 --- a/google/cloud/container_v1/types/cluster_service.py +++ b/google/cloud/container_v1/types/cluster_service.py @@ -240,7 +240,9 @@ class NodePoolUpdateStrategy(proto.Enum): Values: NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED (0): - Default value. + Default value if unset. GKE internally + defaults the update strategy to SURGE for + unspecified strategies. BLUE_GREEN (2): blue-green upgrade. SURGE (3): @@ -523,7 +525,9 @@ class NodeConfig(proto.Message): image_type (str): The image type to use for this node. Note that for a given image type, the latest version - of it will be used. + of it will be used. Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. labels (MutableMapping[str, str]): The map of Kubernetes labels (key/value pairs) to be applied to each node. These will @@ -3584,7 +3588,9 @@ class UpdateNodePoolRequest(proto.Message): master version image_type (str): Required. The desired image type for the node - pool. + pool. Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. name (str): The name (project, location, cluster, node pool) of the node pool to update. Specified in the format @@ -5885,6 +5891,9 @@ class AutoprovisioningNodePoolDefaults(proto.Message): https://cloud.google.com/compute/docs/disks/customer-managed-encryption image_type (str): The image type to use for NAP created node. + Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. """ oauth_scopes: MutableSequence[str] = proto.RepeatedField( diff --git a/google/cloud/container_v1beta1/__init__.py b/google/cloud/container_v1beta1/__init__.py index 7df69a67..a941eafb 100644 --- a/google/cloud/container_v1beta1/__init__.py +++ b/google/cloud/container_v1beta1/__init__.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from google.cloud.container import gapic_version as package_version +from google.cloud.container_v1beta1 import gapic_version as package_version __version__ = package_version.__version__ diff --git a/google/cloud/container_v1beta1/gapic_version.py b/google/cloud/container_v1beta1/gapic_version.py index c3950a4a..7f7a51c6 100644 --- a/google/cloud/container_v1beta1/gapic_version.py +++ b/google/cloud/container_v1beta1/gapic_version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__version__ = "2.17.1" # {x-release-please-version} +__version__ = "2.17.2" # {x-release-please-version} diff --git a/google/cloud/container_v1beta1/types/cluster_service.py b/google/cloud/container_v1beta1/types/cluster_service.py index c1f0fb6a..a8a06786 100644 --- a/google/cloud/container_v1beta1/types/cluster_service.py +++ b/google/cloud/container_v1beta1/types/cluster_service.py @@ -233,7 +233,9 @@ class NodePoolUpdateStrategy(proto.Enum): Values: NODE_POOL_UPDATE_STRATEGY_UNSPECIFIED (0): - Default value. + Default value if unset. GKE internally + defaults the update strategy to SURGE for + unspecified strategies. BLUE_GREEN (2): blue-green upgrade. SURGE (3): @@ -520,7 +522,9 @@ class NodeConfig(proto.Message): image_type (str): The image type to use for this node. Note that for a given image type, the latest version - of it will be used. + of it will be used. Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. labels (MutableMapping[str, str]): The map of Kubernetes labels (key/value pairs) to be applied to each node. These will @@ -4083,7 +4087,9 @@ class UpdateNodePoolRequest(proto.Message): master version image_type (str): Required. The desired image type for the node - pool. + pool. Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. locations (MutableSequence[str]): The desired list of Google Compute Engine `zones `__ @@ -6468,6 +6474,9 @@ class AutoprovisioningNodePoolDefaults(proto.Message): https://cloud.google.com/compute/docs/disks/customer-managed-encryption image_type (str): The image type to use for NAP created node. + Please see + https://cloud.google.com/kubernetes-engine/docs/concepts/node-images + for available image types. """ oauth_scopes: MutableSequence[str] = proto.RepeatedField( diff --git a/noxfile.py b/noxfile.py index e716318b..95e58c52 100644 --- a/noxfile.py +++ b/noxfile.py @@ -189,9 +189,9 @@ def unit(session): def install_systemtest_dependencies(session, *constraints): # Use pre-release gRPC for system tests. - # Exclude version 1.49.0rc1 which has a known issue. - # See https://github.com/grpc/grpc/pull/30642 - session.install("--pre", "grpcio!=1.49.0rc1") + # Exclude version 1.52.0rc1 which has a known issue. + # See https://github.com/grpc/grpc/issues/32163 + session.install("--pre", "grpcio!=1.52.0rc1") session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *constraints) @@ -346,9 +346,7 @@ def prerelease_deps(session): unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES session.install(*unit_deps_all) system_deps_all = ( - SYSTEM_TEST_STANDARD_DEPENDENCIES - + SYSTEM_TEST_EXTERNAL_DEPENDENCIES - + SYSTEM_TEST_EXTRAS + SYSTEM_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_EXTERNAL_DEPENDENCIES ) session.install(*system_deps_all) @@ -378,8 +376,8 @@ def prerelease_deps(session): # dependency of grpc "six", "googleapis-common-protos", - # Exclude version 1.49.0rc1 which has a known issue. See https://github.com/grpc/grpc/pull/30642 - "grpcio!=1.49.0rc1", + # Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163 + "grpcio!=1.52.0rc1", "grpcio-status", "google-api-core", "proto-plus", diff --git a/samples/generated_samples/snippet_metadata_google.container.v1.json b/samples/generated_samples/snippet_metadata_google.container.v1.json index 52406ca7..2f064bf9 100644 --- a/samples/generated_samples/snippet_metadata_google.container.v1.json +++ b/samples/generated_samples/snippet_metadata_google.container.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-container", - "version": "2.17.1" + "version": "2.17.2" }, "snippets": [ { diff --git a/samples/generated_samples/snippet_metadata_google.container.v1beta1.json b/samples/generated_samples/snippet_metadata_google.container.v1beta1.json index 0f1a2e4c..111c7f0e 100644 --- a/samples/generated_samples/snippet_metadata_google.container.v1beta1.json +++ b/samples/generated_samples/snippet_metadata_google.container.v1beta1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-container", - "version": "2.17.1" + "version": "2.17.2" }, "snippets": [ { diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt index b4e01827..4960adcb 100644 --- a/samples/snippets/requirements.txt +++ b/samples/snippets/requirements.txt @@ -1,3 +1,3 @@ -google-cloud-container==2.16.0 +google-cloud-container==2.17.1 backoff==2.2.1 pytest==7.2.1 \ No newline at end of file