fix(deps): [google-cloud-container] Exclude google-auth 2.24.0 and 2.…

…25.0 (#12362) - [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE fix(deps): Exclude google-auth 2.24.0 and 2.25.0 feat: add secondary boot disks field to NodePool API feat: add API to enable Provisioning Request API on existing nodepools docs: Update comment for field `enable_confidential_storage` in message `google.container.v1beta1.NodeConfig` END_COMMIT_OVERRIDE chore: Update gapic-generator-python to v1.14.4 PiperOrigin-RevId: 611561820 Source-Link: googleapis/googleapis@87ef1fe Source-Link: googleapis/googleapis-gen@1973161 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiMTk3MzE2MTM3NTk0YWFmYWQ5NGRlYTMxMjI2NTI4ZmJjYzM5MzEwYyJ9 BEGIN_NESTED_COMMIT feat: [google-cloud-container] add secondary boot disks field to NodePool API PiperOrigin-RevId: 610868066 Source-Link: googleapis/googleapis@13c6878 Source-Link: googleapis/googleapis-gen@bc7f831 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiYmM3ZjgzMWFjMDA2NTU4NDI3Njg5ZjE2MWJkMDBjMmVkMmI2ZmFkOSJ9 END_NESTED_COMMIT BEGIN_NESTED_COMMIT feat: [google-cloud-container] add API to enable Provisioning Request API on existing nodepools --- docs: A comment for field `enable_confidential_storage` in message `.google.container.v1beta1.NodeConfig` is changed PiperOrigin-RevId: 609809689 Source-Link: googleapis/googleapis@8df1cd6 Source-Link: googleapis/googleapis-gen@f9f58f7 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiZjlmNThmNzAxNDA0OGJmZDJjMWFkYWM5MjFlZTIzZjIwY2ZiNjJhYiJ9 END_NESTED_COMMIT --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Mar 4, 2024 · 43e63be · 43e63be
1 parent 4450f4c
commit 43e63be
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 11 deletions.
diff --git a/packages/google-cloud-container/google/cloud/container/gapic_version.py b/packages/google-cloud-container/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.41.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1/gapic_version.py b/packages/google-cloud-container/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.41.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1beta1/__init__.py
@@ -159,6 +159,7 @@
     ResourceUsageExportConfig,
     RollbackNodePoolUpgradeRequest,
     SandboxConfig,
+    SecondaryBootDisk,
     SecurityBulletinEvent,
     SecurityPostureConfig,
     ServerConfig,
@@ -346,6 +347,7 @@
     "ResourceUsageExportConfig",
     "RollbackNodePoolUpgradeRequest",
     "SandboxConfig",
+    "SecondaryBootDisk",
     "SecurityBulletinEvent",
     "SecurityPostureConfig",
     "ServerConfig",

diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/gapic_version.py b/packages/google-cloud-container/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.41.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/types/__init__.py b/packages/google-cloud-container/google/cloud/container_v1beta1/types/__init__.py
@@ -153,6 +153,7 @@
     ResourceUsageExportConfig,
     RollbackNodePoolUpgradeRequest,
     SandboxConfig,
+    SecondaryBootDisk,
     SecurityBulletinEvent,
     SecurityPostureConfig,
     ServerConfig,
@@ -334,6 +335,7 @@
     "ResourceUsageExportConfig",
     "RollbackNodePoolUpgradeRequest",
     "SandboxConfig",
+    "SecondaryBootDisk",
     "SecurityBulletinEvent",
     "SecurityPostureConfig",
     "ServerConfig",

diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1beta1/types/cluster_service.py
@@ -210,6 +210,7 @@
         "Fleet",
         "ResourceManagerTags",
         "EnterpriseConfig",
+        "SecondaryBootDisk",
     },
 )
 
@@ -723,10 +724,10 @@ class NodeConfig(proto.Message):
             A map of resource manager tag keys and values
             to be attached to the nodes.
         enable_confidential_storage (bool):
-            Optional. Enable confidential storage on Hyperdisk.
-            boot_disk_kms_key is required when
-            enable_confidential_storage is true. This is only available
-            for private preview.
+            Optional. Reserved for future use.
+        secondary_boot_disks (MutableSequence[google.cloud.container_v1beta1.types.SecondaryBootDisk]):
+            List of secondary boot disks attached to the
+            nodes.
     """
 
     machine_type: str = proto.Field(
@@ -906,6 +907,11 @@ class NodeConfig(proto.Message):
         proto.BOOL,
         number=46,
     )
+    secondary_boot_disks: MutableSequence["SecondaryBootDisk"] = proto.RepeatedField(
+        proto.MESSAGE,
+        number=48,
+        message="SecondaryBootDisk",
+    )
 
 
 class AdvancedMachineFeatures(proto.Message):
@@ -5142,6 +5148,9 @@ class UpdateNodePoolRequest(proto.Message):
             Engine firewalls using Network Firewall
             Policies. Existing tags will be replaced with
             new values.
+        queued_provisioning (google.cloud.container_v1beta1.types.NodePool.QueuedProvisioning):
+            Specifies the configuration of queued
+            provisioning.
     """
 
     project_id: str = proto.Field(
@@ -5272,6 +5281,11 @@ class UpdateNodePoolRequest(proto.Message):
         number=39,
         message="ResourceManagerTags",
     )
+    queued_provisioning: "NodePool.QueuedProvisioning" = proto.Field(
+        proto.MESSAGE,
+        number=42,
+        message="NodePool.QueuedProvisioning",
+    )
 
 
 class SetNodePoolAutoscalingRequest(proto.Message):
@@ -10372,4 +10386,41 @@ class ClusterTier(proto.Enum):
     )
 
 
+class SecondaryBootDisk(proto.Message):
+    r"""SecondaryBootDisk represents a persistent disk attached to a
+    node with special configurations based on its mode.
+
+    Attributes:
+        mode (google.cloud.container_v1beta1.types.SecondaryBootDisk.Mode):
+            Disk mode (container image cache, etc.)
+        disk_image (str):
+            Fully-qualified resource ID for an existing
+            disk image.
+    """
+
+    class Mode(proto.Enum):
+        r"""Mode specifies how the secondary boot disk will be used.
+        This triggers mode-specified logic in the control plane.
+
+        Values:
+            MODE_UNSPECIFIED (0):
+                MODE_UNSPECIFIED is when mode is not set.
+            CONTAINER_IMAGE_CACHE (1):
+                CONTAINER_IMAGE_CACHE is for using the secondary boot disk
+                as a container image cache.
+        """
+        MODE_UNSPECIFIED = 0
+        CONTAINER_IMAGE_CACHE = 1
+
+    mode: Mode = proto.Field(
+        proto.ENUM,
+        number=1,
+        enum=Mode,
+    )
+    disk_image: str = proto.Field(
+        proto.STRING,
+        number=2,
+    )
+
+
 __all__ = tuple(sorted(__protobuf__.manifest))
diff --git a/...oogle-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json b/...oogle-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-container",
-    "version": "2.41.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/...-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json b/...-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-container",
-    "version": "2.41.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/packages/google-cloud-container/scripts/fixup_container_v1beta1_keywords.py b/packages/google-cloud-container/scripts/fixup_container_v1beta1_keywords.py
@@ -73,7 +73,7 @@ class containerCallTransformer(cst.CSTTransformer):
         'start_ip_rotation': ('project_id', 'zone', 'cluster_id', 'name', 'rotate_credentials', ),
         'update_cluster': ('project_id', 'zone', 'cluster_id', 'update', 'name', ),
         'update_master': ('project_id', 'zone', 'cluster_id', 'master_version', 'name', ),
-        'update_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_version', 'image_type', 'locations', 'workload_metadata_config', 'name', 'upgrade_settings', 'tags', 'taints', 'labels', 'linux_node_config', 'kubelet_config', 'node_network_config', 'gcfs_config', 'confidential_nodes', 'gvnic', 'etag', 'fast_socket', 'logging_config', 'resource_labels', 'windows_node_config', 'machine_type', 'disk_type', 'disk_size_gb', 'resource_manager_tags', ),
+        'update_node_pool': ('project_id', 'zone', 'cluster_id', 'node_pool_id', 'node_version', 'image_type', 'locations', 'workload_metadata_config', 'name', 'upgrade_settings', 'tags', 'taints', 'labels', 'linux_node_config', 'kubelet_config', 'node_network_config', 'gcfs_config', 'confidential_nodes', 'gvnic', 'etag', 'fast_socket', 'logging_config', 'resource_labels', 'windows_node_config', 'machine_type', 'disk_type', 'disk_size_gb', 'resource_manager_tags', 'queued_provisioning', ),
     }
 
     def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode:

diff --git a/packages/google-cloud-container/setup.py b/packages/google-cloud-container/setup.py
@@ -40,7 +40,9 @@
 
 dependencies = [
     "google-api-core[grpc] >= 1.34.1, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*",
-    "google-auth >= 2.14.1, <3.0.0dev",
+    # Exclude incompatible versions of `google-auth`
+    # See https://github.com/googleapis/google-cloud-python/issues/12364
+    "google-auth >= 2.14.1, <3.0.0dev,!=2.24.0,!=2.25.0",
     "proto-plus >= 1.22.3, <2.0.0dev",
     "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
 ]