Skip to content

Commit

Permalink
Moved Cloud Run secret support to ga (#5410)
Browse files Browse the repository at this point in the history
* Added support for the integration with Secret Manager in Cloud Run Managed.
The integration enables binding secret values to environment variables or
to the content of files.

* Revert "Added support for the integration with Secret Manager in Cloud Run Managed."

This reverts commit 2170b50.

* Moved Cloud Run secret support to ga.

Moves the support for environment variables and filesystem based secrets from
beta to ga since the feature is now generally available.

* Completely removed provider setup for secret examples for Cloud Run.

* Added back data block.
  • Loading branch information
jeremiele authored Nov 8, 2021
1 parent 8c1e239 commit 5ce1982
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 29 deletions.
3 changes: 0 additions & 3 deletions mmv1/products/cloudrun/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,6 @@ objects:
Defaults to "".
- !ruby/object:Api::Type::NestedObject
name: valueFrom
min_version: beta
description: |-
Source for the environment variable's value. Only supports secret_key_ref.
properties:
Expand Down Expand Up @@ -589,7 +588,6 @@ objects:
https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
- !ruby/object:Api::Type::Array
name: volumeMounts
min_version: beta
description: |-
Volume to mount into the container's filesystem.
Only supports SecretVolumeSources.
Expand Down Expand Up @@ -629,7 +627,6 @@ objects:
will use the project's default service account.
- !ruby/object:Api::Type::Array
name: volumes
min_version: beta
description: |-
Volume represents a named volume in a container.
item_type: !ruby/object:Api::Type::NestedObject
Expand Down
2 changes: 0 additions & 2 deletions mmv1/products/cloudrun/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
project: :PROJECT_NAME
- !ruby/object:Provider::Terraform::Examples
name: "cloud_run_service_secret_environment_variables"
min_version: beta
primary_resource_id: "default"
primary_resource_name: "fmt.Sprintf(\"tf-test-cloudrun-srv%s\", context[\"random_suffix\"])"
vars:
Expand All @@ -144,7 +143,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
- "autogenerate_revision_name"
- !ruby/object:Provider::Terraform::Examples
name: "cloud_run_service_secret_volumes"
min_version: beta
primary_resource_id: "default"
primary_resource_name: "fmt.Sprintf(\"tf-test-cloudrun-srv%s\", context[\"random_suffix\"])"
vars:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
data "google_project" "project" {
provider = google-beta
}

resource "google_secret_manager_secret" "secret" {
provider = google-beta

secret_id = "<%= ctx[:vars]['secret_id'] %>"
replication {
automatic = true
}
}

resource "google_secret_manager_secret_version" "secret-version-data" {
provider = google-beta

secret = google_secret_manager_secret.secret.name
secret_data = "secret-data"
}

resource "google_secret_manager_secret_iam_member" "secret-access" {
provider = google-beta

secret_id = google_secret_manager_secret.secret.id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${data.google_project.project.number}-compute@developer.gserviceaccount.com"
depends_on = [google_secret_manager_secret.secret]
}

resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta

name = "<%= ctx[:vars]['cloud_run_service_name'] %>"
location = "us-central1"

Expand All @@ -53,7 +44,6 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
metadata {
annotations = {
generated-by = "magic-modules"
"run.googleapis.com/launch-stage" = "BETA"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
data "google_project" "project" {
provider = google-beta
}

resource "google_secret_manager_secret" "secret" {
provider = google-beta

secret_id = "<%= ctx[:vars]['secret_id'] %>"
replication {
automatic = true
}
}

resource "google_secret_manager_secret_version" "secret-version-data" {
provider = google-beta

secret = google_secret_manager_secret.secret.name
secret_data = "secret-data"
}

resource "google_secret_manager_secret_iam_member" "secret-access" {
provider = google-beta

secret_id = google_secret_manager_secret.secret.id
role = "roles/secretmanager.secretAccessor"
member = "serviceAccount:${data.google_project.project.number}-compute@developer.gserviceaccount.com"
depends_on = [google_secret_manager_secret.secret]
}

resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta

name = "<%= ctx[:vars]['cloud_run_service_name'] %>"
location = "us-central1"

Expand Down Expand Up @@ -58,7 +49,6 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" {
metadata {
annotations = {
generated-by = "magic-modules"
"run.googleapis.com/launch-stage" = "BETA"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ resource "google_cloud_run_service" "default" {
`, name, project, concurrency, timeoutSeconds)
}

<% unless version == 'ga' %>
func TestAccCloudRunService_secretVolume(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -223,7 +222,6 @@ resource "google_cloud_run_service" "default" {
namespace = "%s"
annotations = {
generated-by = "magic-modules"
"run.googleapis.com/launch-stage" = "BETA"
}
}

Expand Down Expand Up @@ -343,7 +341,6 @@ resource "google_cloud_run_service" "default" {
namespace = "%s"
annotations = {
generated-by = "magic-modules"
"run.googleapis.com/launch-stage" = "BETA"
}
}

Expand All @@ -362,4 +359,3 @@ resource "google_cloud_run_service" "default" {
}
`, secretName1, secretName2, name, secretRef, project)
}
<% end -%>

0 comments on commit 5ce1982

Please sign in to comment.