diff --git a/src/mlstacks/enums.py b/src/mlstacks/enums.py index b476dc94..fca1059a 100644 --- a/src/mlstacks/enums.py +++ b/src/mlstacks/enums.py @@ -22,7 +22,6 @@ class ComponentTypeEnum(str, Enum): ARTIFACT_STORE = "artifact_store" ORCHESTRATOR = "orchestrator" CONTAINER_REGISTRY = "container_registry" - SECRETS_MANAGER = "secrets_manager" DATA_VALIDATOR = "data_validator" EXPERIMENT_TRACKER = "experiment_tracker" MODEL_REGISTRY = "model_registry" diff --git a/src/mlstacks/terraform/aws-modular/output_file.tf b/src/mlstacks/terraform/aws-modular/output_file.tf index 381da617..576b204d 100644 --- a/src/mlstacks/terraform/aws-modular/output_file.tf +++ b/src/mlstacks/terraform/aws-modular/output_file.tf @@ -62,14 +62,6 @@ resource "local_file" "stack_file" { %{endif} %{endif} -%{if var.enable_secrets_manager} - secrets_manager: - id: ${uuid()} - flavor: aws - name: aws_secrets_manager - configuration: {"region_name": "${var.region}"} -%{endif} - %{if var.enable_experiment_tracker_mlflow} experiment_tracker: id: ${uuid()} diff --git a/src/mlstacks/terraform/aws-modular/outputs.tf b/src/mlstacks/terraform/aws-modular/outputs.tf index 7f04e874..cea5bf68 100644 --- a/src/mlstacks/terraform/aws-modular/outputs.tf +++ b/src/mlstacks/terraform/aws-modular/outputs.tf @@ -84,24 +84,6 @@ output "experiment_tracker_configuration" { }) : "" } - -# if secrets manager is enabled, set the secrets manager outputs to the secrets manager values -# otherwise, set the secrets manager outputs to empty strings -output "secrets_manager_id" { - value = var.enable_secrets_manager ? uuid() : "" -} -output "secrets_manager_flavor" { - value = var.enable_secrets_manager ? "aws" : "" -} -output "secrets_manager_name" { - value = var.enable_secrets_manager ? "aws_secrets_manager_${random_string.unique.result}" : "" -} -output "secrets_manager_configuration" { - value = var.enable_secrets_manager ? jsonencode({ - region_name = var.region - }) : "" -} - # if kserve is enabled, set the model deployer outputs to the kserve values # if seldon is enabled, set the model deployer outputs to the seldon values # otherwise, set the model deployer outputs to empty strings @@ -206,4 +188,4 @@ output "zenml-url" { } output "zenml-username" { value = var.enable_zenml ? module.zenml[0].username : null -} \ No newline at end of file +} diff --git a/src/mlstacks/terraform/aws-modular/variables.tf b/src/mlstacks/terraform/aws-modular/variables.tf index 73a84b7f..220ceb77 100644 --- a/src/mlstacks/terraform/aws-modular/variables.tf +++ b/src/mlstacks/terraform/aws-modular/variables.tf @@ -7,10 +7,6 @@ variable "enable_container_registry" { description = "Enable ECR deployment" default = false } -variable "enable_secrets_manager" { - description = "Enable Secret Manager deployment" - default = false -} variable "enable_orchestrator_kubeflow" { description = "Enable Kubeflow deployment" default = false diff --git a/src/mlstacks/terraform/gcp-modular/enable_services.tf b/src/mlstacks/terraform/gcp-modular/enable_services.tf index ca2812fb..835d41a4 100644 --- a/src/mlstacks/terraform/gcp-modular/enable_services.tf +++ b/src/mlstacks/terraform/gcp-modular/enable_services.tf @@ -3,18 +3,9 @@ data "google_project" "project" { project_id = var.project_id } -# You must have owner, editor, or service config editor roles +# You must have owner, editor, or service config editor roles # to be able to enable services. -# enable secret manager -resource "google_project_service" "secret_manager" { - count = var.enable_secrets_manager ? 1 : 0 - project = var.project_id - service = "secretmanager.googleapis.com" - - disable_on_destroy = false -} - # enable container registry resource "google_project_service" "container_registry" { count = var.enable_container_registry ? 1 : 0 diff --git a/src/mlstacks/terraform/gcp-modular/output_file.tf b/src/mlstacks/terraform/gcp-modular/output_file.tf index 2a86d029..d3a18ffe 100644 --- a/src/mlstacks/terraform/gcp-modular/output_file.tf +++ b/src/mlstacks/terraform/gcp-modular/output_file.tf @@ -77,15 +77,6 @@ resource "local_file" "stack_file" { configuration: {"project": "${var.project_id}", "region": "${var.region}", "service_account_path": "${local_file.sa_key_file[0].filename}"} %{endif} - -%{if var.enable_secrets_manager} - secrets_manager: - id: ${uuid()} - flavor: gcp - name: gcp_secrets_manager - configuration: {"project_id": "${var.project_id}"} -%{endif} - %{if var.enable_experiment_tracker_mlflow} experiment_tracker: id: ${uuid()} diff --git a/src/mlstacks/terraform/gcp-modular/outputs.tf b/src/mlstacks/terraform/gcp-modular/outputs.tf index 9fe18441..ae2276d7 100644 --- a/src/mlstacks/terraform/gcp-modular/outputs.tf +++ b/src/mlstacks/terraform/gcp-modular/outputs.tf @@ -100,23 +100,6 @@ output "experiment_tracker_configuration" { }) : "" } -# if secrets manager is enabled, set the secrets manager outputs to the secrets manager values -# otherwise, set the secrets manager outputs to empty strings -output "secrets_manager_id" { - value = var.enable_secrets_manager ? uuid() : "" -} -output "secrets_manager_flavor" { - value = var.enable_secrets_manager ? "gcp" : "" -} -output "secrets_manager_name" { - value = var.enable_secrets_manager ? "gcp_secrets_manager_${random_string.unique.result}" : "" -} -output "secrets_manager_configuration" { - value = var.enable_secrets_manager ? jsonencode({ - project_id = var.project_id - }) : "" -} - # if kserve is enabled, set the model deployer outputs to the kserve values # if seldon is enabled, set the model deployer outputs to the seldon values # otherwise, set the model deployer outputs to empty strings diff --git a/src/mlstacks/terraform/gcp-modular/variables.tf b/src/mlstacks/terraform/gcp-modular/variables.tf index f812995b..43e379a2 100644 --- a/src/mlstacks/terraform/gcp-modular/variables.tf +++ b/src/mlstacks/terraform/gcp-modular/variables.tf @@ -7,10 +7,6 @@ variable "enable_container_registry" { description = "Enable GCR deployment" default = false } -variable "enable_secrets_manager" { - description = "Enable Secret Manager deployment" - default = false -} variable "enable_orchestrator_kubeflow" { description = "Enable Kubeflow deployment" default = false diff --git a/src/mlstacks/terraform/k3d-modular/output_stack.tf b/src/mlstacks/terraform/k3d-modular/output_stack.tf index 1f96bfba..a17200d4 100644 --- a/src/mlstacks/terraform/k3d-modular/output_stack.tf +++ b/src/mlstacks/terraform/k3d-modular/output_stack.tf @@ -87,11 +87,6 @@ resource "local_file" "stack_file" { kubernetes_namespace: "${local.seldon.workloads_namespace}" base_url: "http://${var.enable_model_deployer_seldon ? module.istio[0].ingress-ip-address : ""}" kubernetes_secret_name: "${var.seldon-secret-name}" - secrets_manager: - id: ${uuid()} - flavor: local - name: k3d-secrets-manager-${random_string.cluster_id.result} - configuration: {} %{endif} ADD filename = "./k3d_stack_${replace(substr(timestamp(), 0, 16), ":", "_")}.yaml"