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.

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

Reintroduce docker image path output in AR module #2433

Merged
merged 1 commit into from
Jul 20, 2024
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
2 changes: 1 addition & 1 deletion blueprints/gke/patterns/autopilot-cluster/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ output "created_resources" {
vpc_id = module.vpc[0].id
},
!var.registry_create ? {} : {
registry = module.registry[0].image_path
registry = module.registry[0].docker_image_path
},
!local.cluster_create ? {} : {
cluster = module.cluster[0].id
Expand Down
7 changes: 4 additions & 3 deletions modules/artifact-registry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ module "registry-docker" {

| name | description | sensitive |
|---|---|:---:|
| [id](outputs.tf#L17) | Fully qualified repository id. | |
| [name](outputs.tf#L22) | Repository name. | |
| [repository](outputs.tf#L27) | Repository object. | |
| [docker_image_path](outputs.tf#L17) | Repository path for Docker images. | |
| [id](outputs.tf#L27) | Fully qualified repository id. | |
| [name](outputs.tf#L32) | Repository name. | |
| [repository](outputs.tf#L37) | Repository object. | |
<!-- END TFDOC -->
10 changes: 10 additions & 0 deletions modules/artifact-registry/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@
* limitations under the License.
*/

output "docker_image_path" {
description = "Repository path for Docker images."
value = join("/", [
"${var.location}-${local.format_string}.pkg.dev",
var.project_id,
var.name
])
depends_on = [google_artifact_registry_repository.registry]
}

output "id" {
description = "Fully qualified repository id."
value = google_artifact_registry_repository.registry.id
Expand Down