Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
},
Expand Down Expand Up @@ -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",
},
},
},
Expand Down
Loading