diff --git a/terraform/terraform-dependencies/main.tf b/terraform/terraform-dependencies/main.tf index 99479b5c..c4a6cc9c 100644 --- a/terraform/terraform-dependencies/main.tf +++ b/terraform/terraform-dependencies/main.tf @@ -1,8 +1,7 @@ data "google_client_config" "default" {} # Add Vulcano Gang scheduler plugin using all default values. -resource "helm_release" "vulcano_scheduler" { - +resource "helm_release" "volcano_scheduler" { name = var.vulcano_scheduler_information.release_name repository = var.vulcano_scheduler_repo_url chart = var.vulcano_scheduler_information.chart_name @@ -34,7 +33,7 @@ data "kustomization_overlay" "training_operator" { resource "kustomization_resource" "training_operator" { # Before we can install the training operator, we need to have the vulcano_scheduler up and running. # See also the patch that we apply to the training operator through kustomize. - depends_on = [helm_release.vulcano_scheduler] + depends_on = [helm_release.volcano_scheduler] for_each = data.kustomization_overlay.training_operator.ids manifest = data.kustomization_overlay.training_operator.manifests[each.value] } diff --git a/terraform/terraform-dependencies/patches/training-operator-patch.yaml b/terraform/terraform-dependencies/patches/training-operator-patch.yaml index dc81eb40..4f2b9531 100644 --- a/terraform/terraform-dependencies/patches/training-operator-patch.yaml +++ b/terraform/terraform-dependencies/patches/training-operator-patch.yaml @@ -9,5 +9,5 @@ spec: - name: training-operator command: - /manager - - --gang-scheduler-name=vulcano + - --gang-scheduler-name=volcano diff --git a/terraform/terraform-dependencies/variables.tf b/terraform/terraform-dependencies/variables.tf index c062ed75..793951eb 100644 --- a/terraform/terraform-dependencies/variables.tf +++ b/terraform/terraform-dependencies/variables.tf @@ -1,3 +1,9 @@ +variable "minikube" { + description = "Boolean indicating whether or not we are going to deploy on minikube (or other local deployment)" + default = true + type = bool +} + variable "kubernetes_config_path" { description = "Path of Kubernetes configuration file (change for non-default kubectl setup)" default = "~/.kube/config" @@ -81,16 +87,16 @@ variable "vulcano_scheduler_information" { version = string }) default = { - release_name = "vulcano" - chart_name = "vulcano" - namespace = "vulcano-system" - version = "v1.7.0" + release_name = "volcano" + chart_name = "volcano" + namespace = "volcano-system" + version = "v1.8.0" } } variable "vulcano_scheduler_repo_url" { description = "Repository URL to locate the utilized helm charts for Vulcano Scheduler Plugin." type = string - default = "https://github.com/volcano-sh/helm-charts" + default = "https://volcano-sh.github.io/helm-charts" }