feat: added support for k8s_version field

Google APIs · copybara-github · commit 97cf70e32709 · 2022-02-23T11:15:08.000-08:00
docs: k8s_version field is not part of resource_options struct

Clients now generate the V1 or V1beta1 CRD based on Kubernetes server version.

PiperOrigin-RevId: 430496281
diff --git a/google/cloud/gkehub/v1alpha2/BUILD.bazel b/google/cloud/gkehub/v1alpha2/BUILD.bazel
@@ -73,13 +73,10 @@ java_gapic_library(
     service_yaml = "gkehub_v1alpha2.yaml",
     test_deps = [
         ":gkehub_java_grpc",
-        "//google/cloud/location:location_java_grpc",
     ],
     deps = [
         ":gkehub_java_proto",
         "//google/api:api_java_proto",
-        "//google/cloud/location:location_java_grpc",
-        "//google/cloud/location:location_java_proto",
     ],
 )
 
@@ -99,9 +96,6 @@ java_gapic_assembly_gradle_pkg(
         ":gkehub_java_grpc",
         ":gkehub_java_proto",
         ":gkehub_proto",
-        "//google/cloud/location:location_java_grpc",
-        "//google/cloud/location:location_java_proto",
-        "//google/cloud/location:location_proto",
     ],
 )
 
@@ -345,4 +339,20 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 # C++
 ##############################################################################
-# Put your C++ rules here
+load(
+    "@com_google_googleapis_imports//:imports.bzl",
+    "cc_grpc_library",
+    "cc_proto_library",
+)
+
+cc_proto_library(
+    name = "gkehub_cc_proto",
+    deps = [":gkehub_proto"],
+)
+
+cc_grpc_library(
+    name = "gkehub_cc_grpc",
+    srcs = [":gkehub_proto"],
+    grpc_only = True,
+    deps = [":gkehub_cc_proto"],
+)
diff --git a/google/cloud/gkehub/v1alpha2/membership.proto b/google/cloud/gkehub/v1alpha2/membership.proto
@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -305,6 +305,11 @@ message ResourceOptions {
   // This option should be set for clusters with Kubernetes apiserver versions
   // <1.16.
   bool v1beta1_crd = 2 [(google.api.field_behavior) = OPTIONAL];
+
+  // Major version of the Kubernetes cluster. This is only used to determine
+  // which version to use for the CustomResourceDefinition resources,
+  // `apiextensions/v1beta1` or`apiextensions/v1`.
+  string k8s_version = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // GkeCluster contains information specific to GKE clusters.
@@ -562,7 +567,8 @@ message DeleteMembershipRequest {
 message UpdateMembershipRequest {
   // Required. The Membership resource name in the format
   // `projects/*/locations/*/memberships/*`.
-  string name = 1 [(google.api.field_behavior) = REQUIRED];
+  string name = 1 [
+    (google.api.field_behavior) = REQUIRED];
 
   // Required. Mask of fields to update.
   google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
@@ -584,7 +590,8 @@ message UpdateMembershipRequest {
 message GenerateConnectManifestRequest {
   // Required. The Membership resource name the Agent will associate with, in the format
   // `projects/*/locations/*/memberships/*`.
-  string name = 1 [(google.api.field_behavior) = REQUIRED];
+  string name = 1 [
+    (google.api.field_behavior) = REQUIRED];
 
   // Optional. Namespace for GKE Connect agent resources. Defaults to `gke-connect`.
   //
