feat: [google-cloud-gke-hub] add k8s_git_version field (#14421)

BEGIN_COMMIT_OVERRIDE
feat: add k8s_git_version field
docs: correct comment for k8s_version field
The new field k8s_git_version captures the full Kubernetes version
string for a membership.
END_COMMIT_OVERRIDE

- [ ] Regenerate this pull request now.

docs: correct comment for `k8s_version` field

The new field `k8s_git_version` captures the full Kubernetes version
string for a membership.

PiperOrigin-RevId: 805935629

Source-Link:
googleapis/googleapis@780e612

Source-Link:
googleapis/googleapis-gen@d0c6d1d
Copy-Tag:
eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWdrZS1odWIvLk93bEJvdC55YW1sIiwiaCI6ImQwYzZkMWRmNGY0NjAyNWVjMDE2MGE0YWNmZTI0ZThlYWYzNjFkYWIifQ==

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

packages/google-cloud-gke-hub/google/cloud/gkehub_v1/types/membership.py

@@ -315,10 +315,15 @@ class ResourceOptions(proto.Message):
             This option should be set for clusters with Kubernetes
             apiserver versions <1.16.
         k8s_version (str):
-            Optional. Major version of the Kubernetes cluster. This is
-            only used to determine which version to use for the
+            Optional. Major and minor version of the Kubernetes cluster.
+            This is only used to determine which version to use for the
             CustomResourceDefinition resources,
             ``apiextensions/v1beta1`` or\ ``apiextensions/v1``.
+        k8s_git_version (str):
+            Optional. Git version of the Kubernetes
+            cluster. This is only used to gate the Connect
+            Agent migration to svc.id.goog on GDC-SO
+            1.33.100 patch and above.
     """
 
     connect_version: str = proto.Field(
@@ -333,6 +338,10 @@ class ResourceOptions(proto.Message):
         proto.STRING,
         number=3,
     )
+    k8s_git_version: str = proto.Field(
+        proto.STRING,
+        number=4,
+    )
 
 
 class ResourceManifest(proto.Message):

packages/google-cloud-gke-hub/google/cloud/gkehub_v1beta1/types/membership.py

@@ -418,10 +418,15 @@ class ResourceOptions(proto.Message):
             This option should be set for clusters with Kubernetes
             apiserver versions <1.16.
         k8s_version (str):
-            Optional. Major version of the Kubernetes cluster. This is
-            only used to determine which version to use for the
+            Optional. Major and minor version of the Kubernetes cluster.
+            This is only used to determine which version to use for the
             CustomResourceDefinition resources,
             ``apiextensions/v1beta1`` or\ ``apiextensions/v1``.
+        k8s_git_version (str):
+            Optional. Git version of the Kubernetes
+            cluster. This is only used to gate the Connect
+            Agent migration to svc.id.goog on GDC-SO
+            1.33.100 patch and above.
     """
 
     connect_version: str = proto.Field(
@@ -436,6 +441,10 @@ class ResourceOptions(proto.Message):
         proto.STRING,
         number=3,
     )
+    k8s_git_version: str = proto.Field(
+        proto.STRING,
+        number=4,
+    )
 
 
 class ResourceManifest(proto.Message):

packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1/test_gke_hub.py

@@ -8178,6 +8178,7 @@ def test_create_membership_rest_call_success(request_type):
                     "connect_version": "connect_version_value",
                     "v1beta1_crd": True,
                     "k8s_version": "k8s_version_value",
+                    "k8s_git_version": "k8s_git_version_value",
                 },
             },
             "google_managed": True,
@@ -8860,6 +8861,7 @@ def test_update_membership_rest_call_success(request_type):
                     "connect_version": "connect_version_value",
                     "v1beta1_crd": True,
                     "k8s_version": "k8s_version_value",
+                    "k8s_git_version": "k8s_git_version_value",
                 },
             },
             "google_managed": True,

packages/google-cloud-gke-hub/tests/unit/gapic/gkehub_v1beta1/test_gke_hub_membership_service.py

@@ -6303,6 +6303,7 @@ def test_create_membership_rest_call_success(request_type):
                     "connect_version": "connect_version_value",
                     "v1beta1_crd": True,
                     "k8s_version": "k8s_version_value",
+                    "k8s_git_version": "k8s_git_version_value",
                 },
             },
         },
@@ -6682,6 +6683,7 @@ def test_update_membership_rest_call_success(request_type):
                     "connect_version": "connect_version_value",
                     "v1beta1_crd": True,
                     "k8s_version": "k8s_version_value",
+                    "k8s_git_version": "k8s_git_version_value",
                 },
             },
         },