Skip to content

Commit

Permalink
Merge pull request #4 from truefoundry/cloud-integration-feature
Browse files Browse the repository at this point in the history
Cloud integration feature
  • Loading branch information
dunefro committed Mar 12, 2024
2 parents 19ab44a + 7f1b26e commit e594daa
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 18 deletions.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ No resources.
| <a name="input_blob_storage_override_name"></a> [blob\_storage\_override\_name](#input\_blob\_storage\_override\_name) | S3 bucket name. Only used if s3\_enable\_override is enabled | `string` | `""` | no |
| <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Name of the cluster | `string` | n/a | yes |
| <a name="input_feature_blob_storage_enabled"></a> [feature\_blob\_storage\_enabled](#input\_feature\_blob\_storage\_enabled) | Enable blob storage feature in the platform | `bool` | `true` | no |
| <a name="input_feature_cloud_integration_enabled"></a> [feature\_cloud\_integration\_enabled](#input\_feature\_cloud\_integration\_enabled) | Enable cloud integration feature in the platform | `bool` | `true` | no |
| <a name="input_feature_docker_registry_enabled"></a> [feature\_docker\_registry\_enabled](#input\_feature\_docker\_registry\_enabled) | Enable docker registry feature in the platform | `bool` | `true` | no |
| <a name="input_feature_secrets_enabled"></a> [feature\_secrets\_enabled](#input\_feature\_secrets\_enabled) | Enable secrets manager feature in the platform | `bool` | `true` | no |
| <a name="input_project"></a> [project](#input\_project) | GCP Project | `string` | n/a | yes |
Expand All @@ -44,10 +45,10 @@ No resources.

| Name | Description |
|------|-------------|
| <a name="output_bucket"></a> [bucket](#output\_bucket) | n/a |
| <a name="output_bucket_name"></a> [bucket\_name](#output\_bucket\_name) | n/a |
| <a name="output_bucket_url"></a> [bucket\_url](#output\_bucket\_url) | n/a |
| <a name="output_serviceaccount_keys"></a> [serviceaccount\_keys](#output\_serviceaccount\_keys) | n/a |
| <a name="output_serviceaccount_name"></a> [serviceaccount\_name](#output\_serviceaccount\_name) | n/a |
| <a name="output_serviceaccount_roles"></a> [serviceaccount\_roles](#output\_serviceaccount\_roles) | n/a |
| <a name="output_artifact_registry_url"></a> [artifact\_registry\_url](#output\_artifact\_registry\_url) | Artifact registry URL to connect |
| <a name="output_bucket_name"></a> [bucket\_name](#output\_bucket\_name) | Name of the bucket |
| <a name="output_bucket_url"></a> [bucket\_url](#output\_bucket\_url) | URL of the bucket |
| <a name="output_serviceaccount_keys"></a> [serviceaccount\_keys](#output\_serviceaccount\_keys) | Service account keys |
| <a name="output_serviceaccount_name"></a> [serviceaccount\_name](#output\_serviceaccount\_name) | Name of the service account |
| <a name="output_serviceaccount_roles"></a> [serviceaccount\_roles](#output\_serviceaccount\_roles) | Roles assigned to the TrueFoundry paltform GCP service account |
<!-- END_TF_DOCS -->
4 changes: 3 additions & 1 deletion locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ locals {
"terraform-module" = "truefoundry-google-platform-features"
"terraform" = "true"
"cluster-name" = var.cluster_name
"truefoundry" = "managed"
},
var.tags
)
Expand All @@ -13,6 +14,7 @@ locals {
var.feature_docker_registry_enabled ? ["${var.project}=>roles/artifactregistry.admin"] : [],
var.feature_secrets_enabled ? ["${var.project}=>roles/secretmanager.admin"] : [],
var.feature_blob_storage_enabled ? ["${var.project}=>roles/iam.serviceAccountTokenCreator"] : [],
var.feature_blob_storage_enabled ? ["${var.project}=>roles/storage.admin"] : []
var.feature_blob_storage_enabled ? ["${var.project}=>roles/storage.admin"] : [],
var.feature_cloud_integration_enabled ? ["${var.project}=>roles/container.clusterViewer", "${var.project}=>roles/container.viewer"] : []
)
}
31 changes: 20 additions & 11 deletions output.tf
Original file line number Diff line number Diff line change
@@ -1,29 +1,38 @@
################################################################################
# Buket
################################################################################

output "bucket" {
value = var.feature_blob_storage_enabled ? module.blob_storage[0].bucket : null
}
output "bucket_name" {
value = var.feature_blob_storage_enabled ? module.blob_storage[0].name : ""
value = var.feature_blob_storage_enabled ? module.blob_storage[0].name : ""
description = "Name of the bucket"
}
output "bucket_url" {
value = var.feature_blob_storage_enabled ? module.blob_storage[0].url : ""
value = var.feature_blob_storage_enabled ? module.blob_storage[0].url : ""
description = "URL of the bucket"
}

################################################################################
# Docker registry (artifact registry)
################################################################################
output "artifact_registry_url" {
value = var.feature_docker_registry_enabled ? "${var.region}-docker.pkg.dev/${var.project}" : ""
description = "Artifact registry URL to connect"
}

################################################################################
# IAM serviceaccount
################################################################################

output "serviceaccount_name" {
value = module.service_accounts.service_accounts_map
value = module.service_accounts.service_accounts_map
description = "Name of the service account"
}
output "serviceaccount_keys" {
value = module.service_accounts.keys
sensitive = true
value = module.service_accounts.keys
sensitive = true
description = "Service account keys"
}

output "serviceaccount_roles" {
value = local.serviceaccount_roles

value = local.serviceaccount_roles
description = "Roles assigned to the TrueFoundry paltform GCP service account"
}
9 changes: 9 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,13 @@ variable "feature_docker_registry_enabled" {
description = "Enable docker registry feature in the platform"
type = bool
default = true
}

################################################################################
# Cloud integration
################################################################################
variable "feature_cloud_integration_enabled" {
description = "Enable cloud integration feature in the platform"
type = bool
default = true
}

0 comments on commit e594daa

Please sign in to comment.