Merge pull request #35 from cern-vre/reana_chart

Install REANA Helm Chart
vre-hub · Feb 13, 2023 · cd2b91d · cd2b91d
2 parents a976579 + 338a012
commit cd2b91d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 31 deletions.
diff --git a/iac/tf/cluster/.terraform.lock.hcl b/iac/tf/cluster/.terraform.lock.hcl
diff --git a/iac/tf/cluster/main-helm.tf b/iac/tf/cluster/main-helm.tf
@@ -91,13 +91,18 @@ resource "helm_release" "jupyterhub-chart" {
 
 # Reana
 
-/* module "reana" {
-  source = "../modules/reana"
-
-  ns-name         = var.ns-reana
-  release-suffix  = var.resource-suffix
-  storage-backend = "chepfs"
-  share-id        = data.openstack_sharedfilesystem_share_v2.share_1_reana.id
-  share-access-id = openstack_sharedfilesystem_share_access_v2.share_access_2.id
-  cephfs-type     = var.cephfs-type
-} */
+#  manual helm install due to tf helm error
+# helm install --devel reana-cvre reanahub/reana --wait --version 0.9.0 --values reana/values.yaml -n reana
+
+resource "helm_release" "reana-chart" {
+  name       = "reana-${var.resource-suffix}"
+  repository = "https://reanahub.github.io/reana/"
+  chart      = "reana"
+  version    = "0.9.0"
+  namespace  = var.ns-reana
+
+  values = [
+    "${file("reana/values.yaml")}"
+  ]
+
+}
diff --git a/iac/tf/cluster/main-k8s.tf b/iac/tf/cluster/main-k8s.tf
@@ -42,11 +42,11 @@ resource "kubernetes_namespace_v1" "ns_jupyterhub" {
   }
 }
 
-/* resource "kubernetes_namespace_v1" "ns_reana" {
+resource "kubernetes_namespace_v1" "ns_reana" {
   metadata {
     name = var.ns-reana
   }
-} */
+}
 
 # Secrets (locally created and enrypted with kubeseal and then applied as a ready manifest)
 

diff --git a/iac/tf/cluster/main-openstack.tf b/iac/tf/cluster/main-openstack.tf
@@ -6,9 +6,9 @@ data "openstack_containerinfra_clustertemplate_v1" "cluster_template" {
   name = var.cluster-template-name
 }
 
-data "openstack_sharedfilesystem_share_v2" "share_1_reana" {
+/* data "openstack_sharedfilesystem_share_v2" "share_1_reana" {
   name = var.reana-share-name
-}
+} */
 
 # Resources
 
@@ -50,7 +50,7 @@ resource "openstack_containerinfra_cluster_v1" "openstack_cluster" {
   }
 }
 
-/* resource "openstack_sharedfilesystem_share_v2" "share_1_reana" {
+resource "openstack_sharedfilesystem_share_v2" "share_1_reana" {
   name        = var.reana-share-name
   description = "Share for reana"
   share_proto = "CEPHFS"
@@ -63,4 +63,4 @@ resource "openstack_sharedfilesystem_share_access_v2" "share_access_2" {
   access_type  = "cephx"
   access_to    = var.reana-share-name
   access_level = "rw"
-} */
+}
diff --git a/iac/tf/cluster/providers.tf b/iac/tf/cluster/providers.tf
@@ -15,7 +15,7 @@ terraform {
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.7.1"
+      version = "2.8.0"
     }
   }
 }

diff --git a/iac/tf/cluster/reana/values.yaml b/iac/tf/cluster/reana/values.yaml
@@ -0,0 +1,12 @@
+shared_storage: # or `infrastructure_storage`
+  backend: cephfs
+  volume_size: 1000
+  access_modes: ReadWriteMany
+  cephfs:
+    provisioner: manila-provisioner
+    type: "Meyrin CephFS"
+    availability_zone: nova
+    os_secret_name: os-trustee
+    os_secret_namespace: kube-system
+    cephfs_os_share_id: 1c8a0cef-988b-4614-b072-33f75f9a084c
+    cephfs_os_share_access_id: b0a39b58-9b44-4961-b041-53978552970d