Skip to content
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

Add support for cloudrun ports #3748

Merged
merged 9 commits into from
Jul 28, 2020
Merged

Add support for cloudrun ports #3748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f7cbcea
Add support for cloudrun ports
dj80hd Jul 15, 2020
d14f645
Typo in comments
dj80hd Jul 16, 2020
53f0101
Add link to api docs to explain optional port parameters
dj80hd Jul 17, 2020
0511dd8
Use existing description convention
dj80hd Jul 17, 2020
548e6eb
Default protcol is TCP, not http
dj80hd Jul 20, 2020
acee485
Merge remote-tracking branch 'upstream/master'
dj80hd Jul 23, 2020
c61eb49
Set default_from_api to true for ports
dj80hd Jul 23, 2020
19c236c
Make container_port required
dj80hd Jul 23, 2020
ccb67fb
Update products/cloudrun/api.yaml
dj80hd Jul 28, 2020
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
18 changes: 18 additions & 0 deletions products/cloudrun/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,24 @@ objects:
references will never be expanded, regardless of whether the variable
exists or not.
Defaults to "".
- !ruby/object:Api::Type::Array
name: ports
description: |-
List of open ports in the container.
More Info:
https://cloud.google.com/run/docs/reference/rest/v1/RevisionSpec#ContainerPort
item_type: !ruby/object:Api::Type::NestedObject
properties:
- !ruby/object:Api::Type::String
name: name
slevenick marked this conversation as resolved.
Show resolved Hide resolved
description: Name of the port.
- !ruby/object:Api::Type::String
name: protocol
description: Protocol used on port. Defaults to TCP.
- !ruby/object:Api::Type::Integer
name: containerPort
description: Port number.
required: true
- !ruby/object:Api::Type::NestedObject
name: resources
description: |-
Expand Down
2 changes: 2 additions & 0 deletions products/cloudrun/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
default_from_api: true
spec.template.spec.containers: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
spec.template.spec.containers.ports: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
spec.template.spec.containers.resources: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
spec.template.spec.containers.resources.limits: !ruby/object:Overrides::Terraform::PropertyOverride
Expand Down
3 changes: 3 additions & 0 deletions third_party/terraform/tests/resource_cloud_run_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ resource "google_cloud_run_service" "default" {
containers {
image = "gcr.io/cloudrun/hello"
args = ["arrgs"]
ports {
container_port = 8080
}
}
container_concurrency = %s
timeout_seconds = %s
Expand Down