Skip to content

Adds GRPC probe support to google_cloud_run_v2_service resource #7172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yanweiguo wants to merge 1 commit into from
Closed

Adds GRPC probe support to google_cloud_run_v2_service resource #7172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 47 additions & 5 deletions mmv1/products/cloudrunv2/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,9 +977,12 @@ objects:
- !ruby/object:Api::Type::NestedObject
name: "httpGet"
description: |-
HTTPGet specifies the http request to perform.
HTTPGet specifies the http request to perform. Exactly one of httpGet or grpc must be specified.
send_empty_value: true
allow_empty_object: true
# exactly_one_of:
# - template.0.containers.0.livenessProbe.0.httpGet
# - template.0.containers.0.livenessProbe.0.grpc
properties:
- !ruby/object:Api::Type::String
name: "path"
Expand Down Expand Up @@ -1014,7 +1017,25 @@ objects:
- !ruby/object:Api::Type::Integer
name: port
description: |-
Port number to access on the container. Must be in the range 1 to 65535. If not specified, defaults to 8080.
Port number to access on the container. Must be in the range 1 to 65535.
- !ruby/object:Api::Type::NestedObject
name: "grpc"
description: |-
GRPC specifies an action involving a gRPC port. Exactly one of httpGet or grpc must be specified.
send_empty_value: true
allow_empty_object: true
# exactly_one_of:
# - template.0.containers.0.livenessProbe.0.httpGet
# - template.0.containers.0.livenessProbe.0.grpc
properties:
- !ruby/object:Api::Type::Integer
name: port
description: |-
Port number of the gRPC service. Must be in the range 1 to 65535.
- !ruby/object:Api::Type::String
name: service
description: |-
Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). If this is not specified, the default behavior is defined by gRPC.
- !ruby/object:Api::Type::NestedObject
name: "startupProbe"
description: |-
Expand Down Expand Up @@ -1043,12 +1064,13 @@ objects:
- !ruby/object:Api::Type::NestedObject
name: "httpGet"
description: |-
HTTPGet specifies the http request to perform. Exactly one of HTTPGet or TCPSocket must be specified.
HTTPGet specifies the http request to perform. Exactly one of httpGet, tcpSocket, or grpc must be specified.
send_empty_value: true
allow_empty_object: true
# exactly_one_of:
# - template.0.containers.0.startupProbe.0.httpGet
# - template.0.containers.0.startupProbe.0.tcpSocket
# - template.0.containers.0.startupProbe.0.grpc
properties:
- !ruby/object:Api::Type::String
name: "path"
Expand All @@ -1075,17 +1097,37 @@ objects:
- !ruby/object:Api::Type::NestedObject
name: "tcpSocket"
description: |-
TCPSocket specifies an action involving a TCP port. Exactly one of HTTPGet or TCPSocket must be specified.
TCPSocket specifies an action involving a TCP port. Exactly one of httpGet, tcpSocket, or grpc must be specified.
send_empty_value: true
allow_empty_object: true
# exactly_one_of:
# - template.0.containers.0.startupProbe.0.httpGet
# - template.0.containers.0.startupProbe.0.tcpSocket
# - template.0.containers.0.startupProbe.0.grpc
properties:
- !ruby/object:Api::Type::Integer
name: port
description: |-
Port number to access on the container. Must be in the range 1 to 65535. If not specified, defaults to 8080.
Port number to access on the container. Must be in the range 1 to 65535.
- !ruby/object:Api::Type::NestedObject
name: "grpc"
description: |-
GRPC specifies an action involving a gRPC port. Exactly one of httpGet, tcpSocket, or grpc must be specified.
send_empty_value: true
allow_empty_object: true
# exactly_one_of:
# - template.0.containers.0.startupProbe.0.httpGet
# - template.0.containers.0.startupProbe.0.tcpSocket
# - template.0.containers.0.startupProbe.0.grpc
properties:
- !ruby/object:Api::Type::Integer
name: port
description: |-
Port number of the gRPC service. Must be in the range 1 to 65535.
- !ruby/object:Api::Type::String
name: service
description: |-
Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). If this is not specified, the default behavior is defined by gRPC.
- !ruby/object:Api::Type::Array
name: "volumes"
description: |-
Expand Down
4 changes: 4 additions & 0 deletions mmv1/products/cloudrunv2/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
default_from_api: true
template.containers.startupProbe.tcpSocket.port: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
template.containers.startupProbe.grpc.port: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
template.containers.livenessProbe.grpc.port: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
template.scaling: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
traffic: !ruby/object:Overrides::Terraform::PropertyOverride
Expand Down