From c25ed93f4b0ffcfad99818e47dfcaf1bafc7c851 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 11:14:36 -0500
Subject: [PATCH] feat: [google-cloud-container] add fields
 desired_in_transit_encryption_config and in_transit_encryption_config
 (#12211)

BEGIN_COMMIT_OVERRIDE
feat: Add fields desired_in_transit_encryption_config and
in_transit_encryption_config
docs: Remove Not GA comments for GetOpenIDConfig and GetJSONWebKeys
END_COMMIT_OVERRIDE

- [ ] Regenerate this pull request now.

docs: Remove Not GA comments for GetOpenIDConfig and GetJSONWebKeys in
v1alpha1/v1beta1/v1

PiperOrigin-RevId: 599973058

Source-Link:
https://github.com/googleapis/googleapis/commit/fa8b4175ee20190dc28921327f2a908c2d48abfd

Source-Link:
https://github.com/googleapis/googleapis-gen/commit/d0e5ef8ae6ee7e6eabcba0f28195d79f78056edf
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiZDBlNWVmOGFlNmVlN2U2ZWFiY2JhMGYyODE5NWQ3OWY3ODA1NmVkZiJ9

BEGIN_NESTED_COMMIT
docs: [google-cloud-container] Remove Not GA comments for
GetOpenIDConfig and GetJSONWebKeys in v1alpha1/v1beta1/v1
PiperOrigin-RevId: 599972979

Source-Link:
https://github.com/googleapis/googleapis/commit/812899904d7e617cd6c792f7a7c51c0985c1ff6f

Source-Link:
https://github.com/googleapis/googleapis-gen/commit/057f152f45ab81d4c5d42c678f1abde941ae3942
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWNvbnRhaW5lci8uT3dsQm90LnlhbWwiLCJoIjoiMDU3ZjE1MmY0NWFiODFkNGM1ZDQyYzY3OGYxYWJkZTk0MWFlMzk0MiJ9
END_NESTED_COMMIT

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .../google/cloud/container/__init__.py        |  2 +
 .../google/cloud/container/gapic_version.py   |  2 +-
 .../google/cloud/container_v1/__init__.py     |  2 +
 .../cloud/container_v1/gapic_version.py       |  2 +-
 .../services/cluster_manager/async_client.py  |  2 -
 .../services/cluster_manager/client.py        |  2 -
 .../cluster_manager/transports/grpc.py        |  2 -
 .../transports/grpc_asyncio.py                |  2 -
 .../cloud/container_v1/types/__init__.py      |  2 +
 .../container_v1/types/cluster_service.py     | 39 +++++++++++++++++++
 .../cloud/container_v1beta1/gapic_version.py  |  2 +-
 .../services/cluster_manager/async_client.py  |  2 -
 .../services/cluster_manager/client.py        |  2 -
 .../cluster_manager/transports/grpc.py        |  2 -
 .../transports/grpc_asyncio.py                |  2 -
 packages/google-cloud-container/noxfile.py    | 18 +++++++++
 .../snippet_metadata_google.container.v1.json |  2 +-
 ...pet_metadata_google.container.v1beta1.json |  2 +-
 18 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/packages/google-cloud-container/google/cloud/container/__init__.py b/packages/google-cloud-container/google/cloud/container/__init__.py
index b65c7490c983..b00fa3ce0c1d 100644
--- a/packages/google-cloud-container/google/cloud/container/__init__.py
+++ b/packages/google-cloud-container/google/cloud/container/__init__.py
@@ -88,6 +88,7 @@
     IdentityServiceConfig,
     ILBSubsettingConfig,
     IntraNodeVisibilityConfig,
+    InTransitEncryptionConfig,
     IPAllocationPolicy,
     IPv6AccessType,
     Jwk,
@@ -353,6 +354,7 @@
     "WorkloadMetadataConfig",
     "WorkloadPolicyConfig",
     "DatapathProvider",
+    "InTransitEncryptionConfig",
     "IPv6AccessType",
     "NodePoolUpdateStrategy",
     "PrivateIPv6GoogleAccess",
diff --git a/packages/google-cloud-container/google/cloud/container/gapic_version.py b/packages/google-cloud-container/google/cloud/container/gapic_version.py
index 52d75ce77c14..360a0d13ebdd 100644
--- 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.37.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1/__init__.py b/packages/google-cloud-container/google/cloud/container_v1/__init__.py
index fa4646278ff2..eda505d0b39a 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/__init__.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/__init__.py
@@ -83,6 +83,7 @@
     IdentityServiceConfig,
     ILBSubsettingConfig,
     IntraNodeVisibilityConfig,
+    InTransitEncryptionConfig,
     IPAllocationPolicy,
     IPv6AccessType,
     Jwk,
@@ -253,6 +254,7 @@
     "IPAllocationPolicy",
     "IPv6AccessType",
     "IdentityServiceConfig",
+    "InTransitEncryptionConfig",
     "IntraNodeVisibilityConfig",
     "Jwk",
     "K8sBetaAPIConfig",
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
index 52d75ce77c14..360a0d13ebdd 100644
--- 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.37.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py
index b15def4013d9..55e7b9d406df 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/async_client.py
@@ -2589,8 +2589,6 @@ async def get_json_web_keys(
     ) -> cluster_service.GetJSONWebKeysResponse:
         r"""Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         .. code-block:: python
 
diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py
index b26f67ff07ba..1178ec87d158 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/client.py
@@ -2756,8 +2756,6 @@ def get_json_web_keys(
     ) -> cluster_service.GetJSONWebKeysResponse:
         r"""Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         .. code-block:: python
 
diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py
index a6d5cba5b624..331dc8043cb1 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc.py
@@ -724,8 +724,6 @@ def get_json_web_keys(
 
         Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         Returns:
             Callable[[~.GetJSONWebKeysRequest],
diff --git a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py
index fc49c5efb387..f21edbb49f33 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/services/cluster_manager/transports/grpc_asyncio.py
@@ -753,8 +753,6 @@ def get_json_web_keys(
 
         Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         Returns:
             Callable[[~.GetJSONWebKeysRequest],
diff --git a/packages/google-cloud-container/google/cloud/container_v1/types/__init__.py b/packages/google-cloud-container/google/cloud/container_v1/types/__init__.py
index 235ab87c3357..a81b9c2e5769 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/types/__init__.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/types/__init__.py
@@ -77,6 +77,7 @@
     IdentityServiceConfig,
     ILBSubsettingConfig,
     IntraNodeVisibilityConfig,
+    InTransitEncryptionConfig,
     IPAllocationPolicy,
     IPv6AccessType,
     Jwk,
@@ -340,6 +341,7 @@
     "WorkloadMetadataConfig",
     "WorkloadPolicyConfig",
     "DatapathProvider",
+    "InTransitEncryptionConfig",
     "IPv6AccessType",
     "NodePoolUpdateStrategy",
     "PrivateIPv6GoogleAccess",
diff --git a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py
index f28e3ae34910..2719fa27281e 100644
--- a/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py
+++ b/packages/google-cloud-container/google/cloud/container_v1/types/cluster_service.py
@@ -33,6 +33,7 @@
         "NodePoolUpdateStrategy",
         "StackType",
         "IPv6AccessType",
+        "InTransitEncryptionConfig",
         "LinuxNodeConfig",
         "WindowsNodeConfig",
         "NodeKubeletConfig",
@@ -311,6 +312,24 @@ class IPv6AccessType(proto.Enum):
     EXTERNAL = 2
 
 
+class InTransitEncryptionConfig(proto.Enum):
+    r"""Options for in-transit encryption.
+
+    Values:
+        IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED (0):
+            Unspecified, will be inferred as default -
+            IN_TRANSIT_ENCRYPTION_UNSPECIFIED.
+        IN_TRANSIT_ENCRYPTION_DISABLED (1):
+            In-transit encryption is disabled.
+        IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT (2):
+            Data in-transit is encrypted using inter-node
+            transparent encryption.
+    """
+    IN_TRANSIT_ENCRYPTION_CONFIG_UNSPECIFIED = 0
+    IN_TRANSIT_ENCRYPTION_DISABLED = 1
+    IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT = 2
+
+
 class LinuxNodeConfig(proto.Message):
     r"""Parameters that can be configured on Linux nodes.
 
@@ -3407,6 +3426,10 @@ class ClusterUpdate(proto.Message):
             to all auto-provisioned node pools in autopilot
             clusters and node auto-provisioning enabled
             clusters.
+        desired_in_transit_encryption_config (google.cloud.container_v1.types.InTransitEncryptionConfig):
+            Specify the details of in-transit encryption.
+
+            This field is a member of `oneof`_ ``_desired_in_transit_encryption_config``.
     """
 
     desired_node_version: str = proto.Field(
@@ -3655,6 +3678,12 @@ class ClusterUpdate(proto.Message):
             message="ResourceManagerTags",
         )
     )
+    desired_in_transit_encryption_config: "InTransitEncryptionConfig" = proto.Field(
+        proto.ENUM,
+        number=137,
+        optional=True,
+        enum="InTransitEncryptionConfig",
+    )
 
 
 class AdditionalPodRangesConfig(proto.Message):
@@ -7482,6 +7511,10 @@ class NetworkConfig(proto.Message):
             this cluster.
 
             This field is a member of `oneof`_ ``_enable_fqdn_network_policy``.
+        in_transit_encryption_config (google.cloud.container_v1.types.InTransitEncryptionConfig):
+            Specify the details of in-transit encryption.
+
+            This field is a member of `oneof`_ ``_in_transit_encryption_config``.
     """
 
     class ClusterNetworkPerformanceConfig(proto.Message):
@@ -7577,6 +7610,12 @@ class Tier(proto.Enum):
         number=19,
         optional=True,
     )
+    in_transit_encryption_config: "InTransitEncryptionConfig" = proto.Field(
+        proto.ENUM,
+        number=20,
+        optional=True,
+        enum="InTransitEncryptionConfig",
+    )
 
 
 class GatewayAPIConfig(proto.Message):
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
index 52d75ce77c14..360a0d13ebdd 100644
--- 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.37.0"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py
index 23363f4e8e3b..36b422f16647 100644
--- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py
+++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/async_client.py
@@ -2505,8 +2505,6 @@ async def get_json_web_keys(
     ) -> cluster_service.GetJSONWebKeysResponse:
         r"""Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         .. code-block:: python
 
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py
index 8649f3e449bb..9ea3f6fe55c7 100644
--- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py
+++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/client.py
@@ -2672,8 +2672,6 @@ def get_json_web_keys(
     ) -> cluster_service.GetJSONWebKeysResponse:
         r"""Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         .. code-block:: python
 
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py
index 0fae52c969e2..a00ec6cc74db 100644
--- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py
+++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc.py
@@ -724,8 +724,6 @@ def get_json_web_keys(
 
         Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         Returns:
             Callable[[~.GetJSONWebKeysRequest],
diff --git a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py
index 2276c5c22ab2..cd9801945510 100644
--- a/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py
+++ b/packages/google-cloud-container/google/cloud/container_v1beta1/services/cluster_manager/transports/grpc_asyncio.py
@@ -753,8 +753,6 @@ def get_json_web_keys(
 
         Gets the public component of the cluster signing keys
         in JSON Web Key format.
-        This API is not yet intended for general use, and is not
-        available for all clusters.
 
         Returns:
             Callable[[~.GetJSONWebKeysRequest],
diff --git a/packages/google-cloud-container/noxfile.py b/packages/google-cloud-container/noxfile.py
index 7d3551347c78..1e6cd48d0529 100644
--- a/packages/google-cloud-container/noxfile.py
+++ b/packages/google-cloud-container/noxfile.py
@@ -282,6 +282,15 @@ def docs(session):
 
     session.install("-e", ".")
     session.install(
+        # We need to pin to specific versions of the `sphinxcontrib-*` packages
+        # which still support sphinx 4.x.
+        # See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
+        # and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
+        "sphinxcontrib-applehelp==1.0.4",
+        "sphinxcontrib-devhelp==1.0.2",
+        "sphinxcontrib-htmlhelp==2.0.1",
+        "sphinxcontrib-qthelp==1.0.3",
+        "sphinxcontrib-serializinghtml==1.1.5",
         "sphinx==4.5.0",
         "alabaster",
         "recommonmark",
@@ -308,6 +317,15 @@ def docfx(session):
 
     session.install("-e", ".")
     session.install(
+        # We need to pin to specific versions of the `sphinxcontrib-*` packages
+        # which still support sphinx 4.x.
+        # See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
+        # and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
+        "sphinxcontrib-applehelp==1.0.4",
+        "sphinxcontrib-devhelp==1.0.2",
+        "sphinxcontrib-htmlhelp==2.0.1",
+        "sphinxcontrib-qthelp==1.0.3",
+        "sphinxcontrib-serializinghtml==1.1.5",
         "gcp-sphinx-docfx-yaml",
         "alabaster",
         "recommonmark",
diff --git a/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json b/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json
index a9c8f27fcd89..477de1eee441 100644
--- a/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json
+++ b/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-container",
-    "version": "2.37.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {
diff --git a/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json b/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json
index c7c925316dd5..afdb562b267e 100644
--- a/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json
+++ b/packages/google-cloud-container/samples/generated_samples/snippet_metadata_google.container.v1beta1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-container",
-    "version": "2.37.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {