Skip to content
This repository was archived by the owner on Jul 17, 2023. It is now read-only.

Commit c10f8a3

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: added support for k8s_version field (#204)
* feat: added support for k8s_version field 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 Source-Link: googleapis/googleapis@97cf70e Source-Link: https://github.com/googleapis/googleapis-gen/commit/9e753429777968b43e5661c25ef38565b5e231bf Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWU3NTM0Mjk3Nzc5NjhiNDNlNTY2MWMyNWVmMzg1NjViNWUyMzFiZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Clients now generate the V1 or V1beta1 CRD based on Kubernetes server version. PiperOrigin-RevId: 430569173 Source-Link: googleapis/googleapis@3c17193 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ae784406e300bf1c56d50111338b9272fb0473b5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU3ODQ0MDZlMzAwYmYxYzU2ZDUwMTExMzM4YjkyNzJmYjA0NzNiNSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> * feat: added support for k8s_version field docs: k8s_version field is not part of resource_options struct
1 parent dbcb8a4 commit c10f8a3

39 files changed

Lines changed: 1600 additions & 1017 deletions

‎grpc-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub/v1beta1/GkeHubMembershipServiceGrpc.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
*
2323
* <pre>
2424
* The GKE Hub MembershipService handles the registration of many Kubernetes
25-
* clusters to Google Cloud, represented with the [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
25+
* clusters to Google Cloud, represented with the
26+
* [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
2627
* GKE Hub is currently only available in the global region.
2728
* **Membership management may be non-trivial:** it is recommended to use one
2829
* of the Google-provided client libraries or tools where possible when working
@@ -476,7 +477,8 @@ public GkeHubMembershipServiceFutureStub newStub(
476477
*
477478
* <pre>
478479
* The GKE Hub MembershipService handles the registration of many Kubernetes
479-
* clusters to Google Cloud, represented with the [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
480+
* clusters to Google Cloud, represented with the
481+
* [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
480482
* GKE Hub is currently only available in the global region.
481483
* **Membership management may be non-trivial:** it is recommended to use one
482484
* of the Google-provided client libraries or tools where possible when working
@@ -684,7 +686,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
684686
*
685687
* <pre>
686688
* The GKE Hub MembershipService handles the registration of many Kubernetes
687-
* clusters to Google Cloud, represented with the [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
689+
* clusters to Google Cloud, represented with the
690+
* [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
688691
* GKE Hub is currently only available in the global region.
689692
* **Membership management may be non-trivial:** it is recommended to use one
690693
* of the Google-provided client libraries or tools where possible when working
@@ -860,7 +863,8 @@ public void generateExclusivityManifest(
860863
*
861864
* <pre>
862865
* The GKE Hub MembershipService handles the registration of many Kubernetes
863-
* clusters to Google Cloud, represented with the [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
866+
* clusters to Google Cloud, represented with the
867+
* [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
864868
* GKE Hub is currently only available in the global region.
865869
* **Membership management may be non-trivial:** it is recommended to use one
866870
* of the Google-provided client libraries or tools where possible when working
@@ -1009,7 +1013,8 @@ public com.google.cloud.gkehub.v1beta1.ValidateExclusivityResponse validateExclu
10091013
*
10101014
* <pre>
10111015
* The GKE Hub MembershipService handles the registration of many Kubernetes
1012-
* clusters to Google Cloud, represented with the [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
1016+
* clusters to Google Cloud, represented with the
1017+
* [Membership][google.cloud.gkehub.v1beta1.Membership] resource.
10131018
* GKE Hub is currently only available in the global region.
10141019
* **Membership management may be non-trivial:** it is recommended to use one
10151020
* of the Google-provided client libraries or tools where possible when working

‎proto-google-cloud-gkehub-v1alpha2/src/main/java/com/google/cloud/gkehub/v1alpha2/MembershipProto.java‎

Lines changed: 113 additions & 113 deletions
Large diffs are not rendered by default.

‎proto-google-cloud-gkehub-v1alpha2/src/main/java/com/google/cloud/gkehub/v1alpha2/ResourceOptions.java‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ private ResourceOptions(com.google.protobuf.GeneratedMessageV3.Builder<?> builde
3939

4040
private ResourceOptions() {
4141
connectVersion_ = "";
42+
k8SVersion_ = "";
4243
}
4344

4445
@java.lang.Override
@@ -82,6 +83,13 @@ private ResourceOptions(
8283
v1Beta1Crd_ = input.readBool();
8384
break;
8485
}
86+
case 26:
87+
{
88+
java.lang.String s = input.readStringRequireUtf8();
89+
90+
k8SVersion_ = s;
91+
break;
92+
}
8593
default:
8694
{
8795
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -190,6 +198,59 @@ public boolean getV1Beta1Crd() {
190198
return v1Beta1Crd_;
191199
}
192200

201+
public static final int K8S_VERSION_FIELD_NUMBER = 3;
202+
private volatile java.lang.Object k8SVersion_;
203+
/**
204+
*
205+
*
206+
* <pre>
207+
* Major version of the Kubernetes cluster. This is only used to determine
208+
* which version to use for the CustomResourceDefinition resources,
209+
* `apiextensions/v1beta1` or`apiextensions/v1`.
210+
* </pre>
211+
*
212+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
213+
*
214+
* @return The k8sVersion.
215+
*/
216+
@java.lang.Override
217+
public java.lang.String getK8SVersion() {
218+
java.lang.Object ref = k8SVersion_;
219+
if (ref instanceof java.lang.String) {
220+
return (java.lang.String) ref;
221+
} else {
222+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
223+
java.lang.String s = bs.toStringUtf8();
224+
k8SVersion_ = s;
225+
return s;
226+
}
227+
}
228+
/**
229+
*
230+
*
231+
* <pre>
232+
* Major version of the Kubernetes cluster. This is only used to determine
233+
* which version to use for the CustomResourceDefinition resources,
234+
* `apiextensions/v1beta1` or`apiextensions/v1`.
235+
* </pre>
236+
*
237+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
238+
*
239+
* @return The bytes for k8sVersion.
240+
*/
241+
@java.lang.Override
242+
public com.google.protobuf.ByteString getK8SVersionBytes() {
243+
java.lang.Object ref = k8SVersion_;
244+
if (ref instanceof java.lang.String) {
245+
com.google.protobuf.ByteString b =
246+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
247+
k8SVersion_ = b;
248+
return b;
249+
} else {
250+
return (com.google.protobuf.ByteString) ref;
251+
}
252+
}
253+
193254
private byte memoizedIsInitialized = -1;
194255

195256
@java.lang.Override
@@ -210,6 +271,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
210271
if (v1Beta1Crd_ != false) {
211272
output.writeBool(2, v1Beta1Crd_);
212273
}
274+
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(k8SVersion_)) {
275+
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, k8SVersion_);
276+
}
213277
unknownFields.writeTo(output);
214278
}
215279

@@ -225,6 +289,9 @@ public int getSerializedSize() {
225289
if (v1Beta1Crd_ != false) {
226290
size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, v1Beta1Crd_);
227291
}
292+
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(k8SVersion_)) {
293+
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, k8SVersion_);
294+
}
228295
size += unknownFields.getSerializedSize();
229296
memoizedSize = size;
230297
return size;
@@ -243,6 +310,7 @@ public boolean equals(final java.lang.Object obj) {
243310

244311
if (!getConnectVersion().equals(other.getConnectVersion())) return false;
245312
if (getV1Beta1Crd() != other.getV1Beta1Crd()) return false;
313+
if (!getK8SVersion().equals(other.getK8SVersion())) return false;
246314
if (!unknownFields.equals(other.unknownFields)) return false;
247315
return true;
248316
}
@@ -258,6 +326,8 @@ public int hashCode() {
258326
hash = (53 * hash) + getConnectVersion().hashCode();
259327
hash = (37 * hash) + V1BETA1_CRD_FIELD_NUMBER;
260328
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getV1Beta1Crd());
329+
hash = (37 * hash) + K8S_VERSION_FIELD_NUMBER;
330+
hash = (53 * hash) + getK8SVersion().hashCode();
261331
hash = (29 * hash) + unknownFields.hashCode();
262332
memoizedHashCode = hash;
263333
return hash;
@@ -407,6 +477,8 @@ public Builder clear() {
407477

408478
v1Beta1Crd_ = false;
409479

480+
k8SVersion_ = "";
481+
410482
return this;
411483
}
412484

@@ -436,6 +508,7 @@ public com.google.cloud.gkehub.v1alpha2.ResourceOptions buildPartial() {
436508
new com.google.cloud.gkehub.v1alpha2.ResourceOptions(this);
437509
result.connectVersion_ = connectVersion_;
438510
result.v1Beta1Crd_ = v1Beta1Crd_;
511+
result.k8SVersion_ = k8SVersion_;
439512
onBuilt();
440513
return result;
441514
}
@@ -493,6 +566,10 @@ public Builder mergeFrom(com.google.cloud.gkehub.v1alpha2.ResourceOptions other)
493566
if (other.getV1Beta1Crd() != false) {
494567
setV1Beta1Crd(other.getV1Beta1Crd());
495568
}
569+
if (!other.getK8SVersion().isEmpty()) {
570+
k8SVersion_ = other.k8SVersion_;
571+
onChanged();
572+
}
496573
this.mergeUnknownFields(other.unknownFields);
497574
onChanged();
498575
return this;
@@ -699,6 +776,122 @@ public Builder clearV1Beta1Crd() {
699776
return this;
700777
}
701778

779+
private java.lang.Object k8SVersion_ = "";
780+
/**
781+
*
782+
*
783+
* <pre>
784+
* Major version of the Kubernetes cluster. This is only used to determine
785+
* which version to use for the CustomResourceDefinition resources,
786+
* `apiextensions/v1beta1` or`apiextensions/v1`.
787+
* </pre>
788+
*
789+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
790+
*
791+
* @return The k8sVersion.
792+
*/
793+
public java.lang.String getK8SVersion() {
794+
java.lang.Object ref = k8SVersion_;
795+
if (!(ref instanceof java.lang.String)) {
796+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
797+
java.lang.String s = bs.toStringUtf8();
798+
k8SVersion_ = s;
799+
return s;
800+
} else {
801+
return (java.lang.String) ref;
802+
}
803+
}
804+
/**
805+
*
806+
*
807+
* <pre>
808+
* Major version of the Kubernetes cluster. This is only used to determine
809+
* which version to use for the CustomResourceDefinition resources,
810+
* `apiextensions/v1beta1` or`apiextensions/v1`.
811+
* </pre>
812+
*
813+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
814+
*
815+
* @return The bytes for k8sVersion.
816+
*/
817+
public com.google.protobuf.ByteString getK8SVersionBytes() {
818+
java.lang.Object ref = k8SVersion_;
819+
if (ref instanceof String) {
820+
com.google.protobuf.ByteString b =
821+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
822+
k8SVersion_ = b;
823+
return b;
824+
} else {
825+
return (com.google.protobuf.ByteString) ref;
826+
}
827+
}
828+
/**
829+
*
830+
*
831+
* <pre>
832+
* Major version of the Kubernetes cluster. This is only used to determine
833+
* which version to use for the CustomResourceDefinition resources,
834+
* `apiextensions/v1beta1` or`apiextensions/v1`.
835+
* </pre>
836+
*
837+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
838+
*
839+
* @param value The k8sVersion to set.
840+
* @return This builder for chaining.
841+
*/
842+
public Builder setK8SVersion(java.lang.String value) {
843+
if (value == null) {
844+
throw new NullPointerException();
845+
}
846+
847+
k8SVersion_ = value;
848+
onChanged();
849+
return this;
850+
}
851+
/**
852+
*
853+
*
854+
* <pre>
855+
* Major version of the Kubernetes cluster. This is only used to determine
856+
* which version to use for the CustomResourceDefinition resources,
857+
* `apiextensions/v1beta1` or`apiextensions/v1`.
858+
* </pre>
859+
*
860+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
861+
*
862+
* @return This builder for chaining.
863+
*/
864+
public Builder clearK8SVersion() {
865+
866+
k8SVersion_ = getDefaultInstance().getK8SVersion();
867+
onChanged();
868+
return this;
869+
}
870+
/**
871+
*
872+
*
873+
* <pre>
874+
* Major version of the Kubernetes cluster. This is only used to determine
875+
* which version to use for the CustomResourceDefinition resources,
876+
* `apiextensions/v1beta1` or`apiextensions/v1`.
877+
* </pre>
878+
*
879+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
880+
*
881+
* @param value The bytes for k8sVersion to set.
882+
* @return This builder for chaining.
883+
*/
884+
public Builder setK8SVersionBytes(com.google.protobuf.ByteString value) {
885+
if (value == null) {
886+
throw new NullPointerException();
887+
}
888+
checkByteStringIsUtf8(value);
889+
890+
k8SVersion_ = value;
891+
onChanged();
892+
return this;
893+
}
894+
702895
@java.lang.Override
703896
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
704897
return super.setUnknownFields(unknownFields);

‎proto-google-cloud-gkehub-v1alpha2/src/main/java/com/google/cloud/gkehub/v1alpha2/ResourceOptionsOrBuilder.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,33 @@ public interface ResourceOptionsOrBuilder
6767
* @return The v1beta1Crd.
6868
*/
6969
boolean getV1Beta1Crd();
70+
71+
/**
72+
*
73+
*
74+
* <pre>
75+
* Major version of the Kubernetes cluster. This is only used to determine
76+
* which version to use for the CustomResourceDefinition resources,
77+
* `apiextensions/v1beta1` or`apiextensions/v1`.
78+
* </pre>
79+
*
80+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
81+
*
82+
* @return The k8sVersion.
83+
*/
84+
java.lang.String getK8SVersion();
85+
/**
86+
*
87+
*
88+
* <pre>
89+
* Major version of the Kubernetes cluster. This is only used to determine
90+
* which version to use for the CustomResourceDefinition resources,
91+
* `apiextensions/v1beta1` or`apiextensions/v1`.
92+
* </pre>
93+
*
94+
* <code>string k8s_version = 3 [(.google.api.field_behavior) = OPTIONAL];</code>
95+
*
96+
* @return The bytes for k8sVersion.
97+
*/
98+
com.google.protobuf.ByteString getK8SVersionBytes();
7099
}

‎proto-google-cloud-gkehub-v1alpha2/src/main/proto/google/cloud/gkehub/v1alpha2/membership.proto‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2021 Google LLC
1+
// Copyright 2022 Google LLC
22
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
@@ -305,6 +305,11 @@ message ResourceOptions {
305305
// This option should be set for clusters with Kubernetes apiserver versions
306306
// <1.16.
307307
bool v1beta1_crd = 2 [(google.api.field_behavior) = OPTIONAL];
308+
309+
// Major version of the Kubernetes cluster. This is only used to determine
310+
// which version to use for the CustomResourceDefinition resources,
311+
// `apiextensions/v1beta1` or`apiextensions/v1`.
312+
string k8s_version = 3 [(google.api.field_behavior) = OPTIONAL];
308313
}
309314

310315
// GkeCluster contains information specific to GKE clusters.
@@ -562,7 +567,8 @@ message DeleteMembershipRequest {
562567
message UpdateMembershipRequest {
563568
// Required. The Membership resource name in the format
564569
// `projects/*/locations/*/memberships/*`.
565-
string name = 1 [(google.api.field_behavior) = REQUIRED];
570+
string name = 1 [
571+
(google.api.field_behavior) = REQUIRED];
566572

567573
// Required. Mask of fields to update.
568574
google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
@@ -584,7 +590,8 @@ message UpdateMembershipRequest {
584590
message GenerateConnectManifestRequest {
585591
// Required. The Membership resource name the Agent will associate with, in the format
586592
// `projects/*/locations/*/memberships/*`.
587-
string name = 1 [(google.api.field_behavior) = REQUIRED];
593+
string name = 1 [
594+
(google.api.field_behavior) = REQUIRED];
588595

589596
// Optional. Namespace for GKE Connect agent resources. Defaults to `gke-connect`.
590597
//

0 commit comments

Comments
 (0)