Skip to content

Commit

Permalink
update charts and add to main config #19 #21
Browse files Browse the repository at this point in the history
  • Loading branch information
goseind committed Dec 1, 2022
1 parent c1b7d2c commit 9fbf288
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 11 deletions.
18 changes: 17 additions & 1 deletion iac/tf/cluster/main-helm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,20 @@ module "sealed-secrets" {
ns_name = var.ns-shared-services
release_suffix = var.resource-suffix
} */
}
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
}
*/
10 changes: 5 additions & 5 deletions iac/tf/modules/jupyterhub/main.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resource "helm_release" "<chart-name>-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 = [
Expand Down
4 changes: 2 additions & 2 deletions iac/tf/modules/jupyterhub/variables.tf
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion iac/tf/modules/reana/main.tf
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions iac/tf/modules/reana/variables.tf
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 9fbf288

Please sign in to comment.