Adding conda-store terraform charts along with postgres/minio charts

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/conda-store/config/conda-store-config.py

@@ -0,0 +1,48 @@
+import logging
+
+from conda_store_server.storage import S3Storage
+from conda_store_server.server.auth import DummyAuthentication
+
+# ==================================
+#      conda-store settings
+# ==================================
+c.CondaStore.storage_class = S3Storage
+c.CondaStore.store_directory = "/opt/conda-store/"
+c.CondaStore.environment_directory = "/opt/environments/"
+c.CondaStore.database_url = "postgresql+psycopg2://admin:password@postgres/conda-store"
+c.CondaStore.default_uid = 1000
+c.CondaStore.default_gid = 100
+c.CondaStore.default_permissions = "775"
+
+c.S3Storage.internal_endpoint = "minio:9000"
+c.S3Storage.external_endpoint = "localhost:30900"
+c.S3Storage.access_key = "admin"
+c.S3Storage.secret_key = "password"
+c.S3Storage.region = "us-east-1"  # minio region default
+c.S3Storage.bucket_name = "conda-store"
+c.S3Storage.secure = False
+
+# ==================================
+#        server settings
+# ==================================
+c.CondaStoreServer.log_level = logging.INFO
+c.CondaStoreServer.enable_ui = True
+c.CondaStoreServer.enable_api = True
+c.CondaStoreServer.enable_registry = True
+c.CondaStoreServer.enable_metrics = True
+c.CondaStoreServer.address = "0.0.0.0"
+c.CondaStoreServer.port = 5000
+# This MUST start with `/`
+c.CondaStoreServer.url_prefix = "/"
+
+
+# ==================================
+#         auth settings
+# ==================================
+c.CondaStoreServer.authentication_class = DummyAuthentication
+
+# ==================================
+#         worker settings
+# ==================================
+c.CondaStoreWorker.log_level = logging.INFO
+c.CondaStoreWorker.watch_paths = ["/opt/environments"]

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/conda-store/output.tf

@@ -1,9 +1,9 @@
 output "endpoint" {
   description = "Endpoint dns name of conda-store nfs server"
-  value       = "${var.name}-nfs.${var.namespace}.svc.cluster.local"
+  value       = "${kubernetes_service.nfs.metadata.0.name}.${var.namespace}.svc.cluster.local"
 }
 
 output "endpoint_ip" {
   description = "IP Address of conda-store nfs server"
-  value       = kubernetes_service.main.spec.0.cluster_ip
+  value       = kubernetes_service.nfs.spec.0.cluster_ip
 }

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/conda-store/server.tf

@@ -0,0 +1,97 @@
+resource "kubernetes_config_map" "conda-store-config" {
+  metadata {
+    name      = "conda-store-config"
+    namespace = var.namespace
+  }
+
+  "conda-store-config.py" = file("${path.module}/config/conda-store-config.py")
+}
+
+
+resource "kubernetes_service" "server" {
+  metadata {
+    name      = "${var.name}-conda-store-server"
+    namespace = var.namespace
+  }
+
+  spec {
+    selector = {
+      role = "${var.name}-conda-store-server"
+    }
+
+    port {
+      name = "conda-store-server"
+      port = 5000
+    }
+  }
+}
+
+
+resource "kubernetes_deployment" "main" {
+  metadata {
+    name      = "${var.name}-conda-store-server"
+    namespace = var.namespace
+    labels = {
+      role = "${var.name}-conda-store-server"
+    }
+  }
+
+  spec {
+    replicas = 1
+
+    selector {
+      match_labels = {
+        role = "${var.name}-conda-store-server"
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          role = "${var.name}-conda-store-server"
+        }
+      }
+
+      spec {
+        affinity {
+          node_affinity {
+            required_during_scheduling_ignored_during_execution {
+              node_selector_term {
+                match_expressions {
+                  key      = var.node-group.key
+                  operator = "In"
+                  values = [
+                    var.node-group.value
+                  ]
+                }
+              }
+            }
+          }
+        }
+
+        container {
+          name  = "conda-store-server"
+          image = "${var.conda-store-image.name}:${var.conda-store-image.tag}"
+
+          command = [
+            - "conda-store-server"
+            - "--config"
+            - "/etc/conda-store/conda_store_config.py"
+          ]
+
+          volume_mount {
+            name       = "config"
+            mount_path = "/etc/conda-store"
+          }
+        }
+
+        volume {
+          name = "config"
+          config_map {
+            name = kubernetes_config_map.conda-store-config.metadata.0.name
+          }
+        }
+      }
+    }
+  }
+}

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/conda-store/main.tf → qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/conda-store/worker.tf

@@ -1,28 +1,12 @@
-resource "kubernetes_persistent_volume_claim" "main" {
-  metadata {
-    name      = "${var.name}-conda-store-storage"
-    namespace = var.namespace
-  }
-  wait_until_bound = true
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = var.nfs_capacity
-      }
-    }
-  }
-}
-
-resource "kubernetes_service" "main" {
+resource "kubernetes_service" "nfs" {
   metadata {
-    name      = "${var.name}-conda-store"
+    name      = "${var.name}-conda-store-nfs"
     namespace = var.namespace
   }
 
   spec {
     selector = {
-      role = "${var.name}-conda-store"
+      role = "${var.name}-conda-store-worker"
     }
 
     port {
@@ -43,12 +27,39 @@ resource "kubernetes_service" "main" {
 }
 
 
+resource "kubernetes_persistent_volume_claim" "main" {
+  metadata {
+    name      = "${var.name}-conda-store-storage"
+    namespace = var.namespace
+  }
+  wait_until_bound = true
+  spec {
+    access_modes = ["ReadWriteOnce"]
+    resources {
+      requests = {
+        storage = var.nfs_capacity
+      }
+    }
+  }
+}
+
+
+resource "kubernetes_config_map" "conda-store-environments" {
+  metadata {
+    name      = "conda-environments"
+    namespace = var.namespace
+  }
+
+  data = var.environments
+}
+
+
 resource "kubernetes_deployment" "main" {
   metadata {
-    name      = "${var.name}-conda-store"
+    name      = "${var.name}-conda-store-worker"
     namespace = var.namespace
     labels = {
-      role = "${var.name}-conda-store"
+      role = "${var.name}-conda-store-worker"
     }
   }
 
@@ -57,14 +68,14 @@ resource "kubernetes_deployment" "main" {
 
     selector {
       match_labels = {
-        role = "${var.name}-conda-store"
+        role = "${var.name}-conda-store-worker"
       }
     }
 
     template {
       metadata {
         labels = {
-          role = "${var.name}-conda-store"
+          role = "${var.name}-conda-store-worker"
         }
       }
 
@@ -86,27 +97,28 @@ resource "kubernetes_deployment" "main" {
         }
 
         container {
-          name  = "conda-store"
+          name  = "conda-store-worker"
           image = "${var.conda-store-image.name}:${var.conda-store-image.tag}"
 
           command = [
-            "python", "/opt/conda-store/conda-store.py",
-            "-e", "/opt/environments",
-            "-o", "/home/conda/environments",
-            "-s", "/home/conda/store",
-            "--uid", "0",
-            "--gid", "0",
-            "--permissions", "775"
+            - "conda-store-worker"
+            - "--config"
+            - "/etc/conda-store/conda_store_config.py"
           ]
 
           volume_mount {
-            name       = "conda-environments"
-            mount_path = "/opt/environments"
+            name       = "config"
+            mount_path = "/etc/conda-store"
+          }
+
+          volume_mount {
+            name       = "environments"
+            mount_path = "/opt/conda-store"
           }
 
           volume_mount {
-            mount_path = "/home/conda"
-            name       = "nfs-export-fast"
+            name       = "storage"
+            mount_path = "/opt/conda-store"
           }
         }
 
@@ -135,33 +147,31 @@ resource "kubernetes_deployment" "main" {
 
           volume_mount {
             mount_path = "/exports"
-            name       = "nfs-export-fast"
+            name       = "storage"
           }
         }
 
         volume {
-          name = "nfs-export-fast"
-          persistent_volume_claim {
-            claim_name = "${var.name}-conda-store-storage"
+          name = "config"
+          config_map {
+            name = kubernetes_config_map.conda-store-config.metadata.0.name
           }
         }
 
         volume {
-          name = "conda-environments"
+          name = "environments"
           config_map {
-            name = kubernetes_config_map.conda-environments.metadata.0.name
+            name = kubernetes_config_map.conda-store-environments.metadata.0.name
+          }
+        }
+
+        volume {
+          name = "storage"
+          persistent_volume_claim {
+            claim_name = persistent_volume_claim.main.metadata.0.name
           }
         }
       }
     }
   }
 }
-
-resource "kubernetes_config_map" "conda-environments" {
-  metadata {
-    name      = "conda-environments"
-    namespace = var.namespace
-  }
-
-  data = var.environments
-}

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/minio/main.tf

@@ -0,0 +1,12 @@
+resource "helm_release" "minio" {
+  name      = "minio"
+  namespace = var.namespace
+
+  repository = "https://charts.bitnami.com/bitnami"
+  chart      = "bitnami/minio"
+  version    = "9.2.4"
+
+  values = concat([
+    file("${path.module}/values.yaml"),
+  ], var.overrides)
+}

qhub/template/{{ cookiecutter.repo_directory }}/infrastructure/modules/kubernetes/services/postgresql/main.tf

@@ -0,0 +1,12 @@
+resource "helm_release" "postgresql" {
+  name      = "postgresql"
+  namespace = var.namespace
+
+  repository = "https://charts.bitnami.com/bitnami"
+  chart      = "bitnami/postgresql"
+  version    = "10.13.12"
+
+  values = concat([
+    file("${path.module}/values.yaml"),
+  ], var.overrides)
+}