diff --git a/iac/tf/cluster/main-helm.tf b/iac/tf/cluster/main-helm.tf index e940f121..811ebc0d 100644 --- a/iac/tf/cluster/main-helm.tf +++ b/iac/tf/cluster/main-helm.tf @@ -26,4 +26,20 @@ module "sealed-secrets" { ns_name = var.ns-shared-services release_suffix = var.resource-suffix -} */ \ No newline at end of file +} + +module "jupyterhub" { + source = "../modules/jupyterhub" + + ns_name = var.tbd + release_suffix = var.resource-suffix +} + +module "reana" { + source = "../modules/reana" + + ns_name = var.tbd + release_suffix = var.resource-suffix +} + +*/ \ No newline at end of file diff --git a/iac/tf/modules/jupyterhub/main.tf b/iac/tf/modules/jupyterhub/main.tf index fa55112d..4f298ff6 100644 --- a/iac/tf/modules/jupyterhub/main.tf +++ b/iac/tf/modules/jupyterhub/main.tf @@ -1,8 +1,8 @@ -resource "helm_release" "-chart" { - name = "sealed-secrets-${var.release-suffix}" - repository = "" - chart = "" - version = "" +resource "helm_release" "jupyterhub-chart" { + name = "jupyterhub-${var.release-suffix}" + repository = "https://jupyterhub.github.io/helm-chart/" + chart = "jupyterhub" + version = "2.0.0" namespace = "${var.ns-name}" values = [ diff --git a/iac/tf/modules/jupyterhub/variables.tf b/iac/tf/modules/jupyterhub/variables.tf index bba279a8..4a955bd6 100644 --- a/iac/tf/modules/jupyterhub/variables.tf +++ b/iac/tf/modules/jupyterhub/variables.tf @@ -1,9 +1,9 @@ variable "ns-name" { - description = "The namespace to use for sealed-secrets" + description = "The namespace to use for jupyterhub" type = string } variable "release-suffix" { - description = "The suffix added to the sealed-secrets release" + description = "The suffix added to the jupyterhub release" type = string } \ No newline at end of file diff --git a/iac/tf/modules/reana/main.tf b/iac/tf/modules/reana/main.tf index 84a6c99b..9f4480d1 100644 --- a/iac/tf/modules/reana/main.tf +++ b/iac/tf/modules/reana/main.tf @@ -1,6 +1,6 @@ resource "helm_release" "reana-chart" { name = "reana-${var.release-suffix}" - repository = "" + repository = "https://reanahub.github.io/reana" chart = "reana" version = "0.9.0-alpha.7" namespace = "${var.ns-name}" diff --git a/iac/tf/modules/reana/variables.tf b/iac/tf/modules/reana/variables.tf index bba279a8..834d0206 100644 --- a/iac/tf/modules/reana/variables.tf +++ b/iac/tf/modules/reana/variables.tf @@ -1,9 +1,9 @@ variable "ns-name" { - description = "The namespace to use for sealed-secrets" + description = "The namespace to use for reana" type = string } variable "release-suffix" { - description = "The suffix added to the sealed-secrets release" + description = "The suffix added to the reana release" type = string } \ No newline at end of file