Merge pull request #67 from UCL-ARC/cdkharris/pu-dev-server-back-up

feat: Put a small dev server back up

terraform/README.md

@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.9.8 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >1.9.8 |
 | <a name="requirement_harvester"></a> [harvester](#requirement\_harvester) | 0.6.4 |
 
 ## Providers
@@ -16,6 +16,7 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_jupyter-dev"></a> [jupyter-dev](#module\_jupyter-dev) | ./modules/jupyter | n/a |
 | <a name="module_online-storage-pilot"></a> [online-storage-pilot](#module\_online-storage-pilot) | ./modules/online-storage | n/a |
 | <a name="module_ssrc-jupyter-pilot"></a> [ssrc-jupyter-pilot](#module\_ssrc-jupyter-pilot) | ./modules/jupyter | n/a |
 

terraform/dev.tf

@@ -0,0 +1,34 @@
+module "jupyter-dev" {
+  source = "./modules/jupyter"
+
+  vm_count = 1
+
+  vcpu       = 2
+  ram_gb     = "8Gi"
+  os_disk_gb = "30Gi"
+
+  vm_prefix = "jupyter-dev"
+
+  namespace    = "ssrc-ns"
+  network_name = "ssrc-net"
+
+  public_key_openssh = var.public_key_openssh
+
+  # renovate: datasource=github-releases depName=jupyterhub/zero-to-jupyterhub-k8s versioning=loose
+  z2jupyterhub_version = "3.3.8" # https://github.com/jupyterhub/zero-to-jupyterhub-k8s/tags
+  # renovate: datasource=github-releases depName=k3s-io/k3s versioning=loose
+  k3s_version = "v1.31.2+k3s1" # https://github.com/k3s-io/k3s/releases/
+  # renovate: datasource=github-releases depName=projectcalico/calico versioning=loose
+  calico_version = "v3.29.0" # https://github.com/projectcalico/calico/releases
+
+  aad_client_id     = var.aad_client_id
+  aad_client_secret = var.aad_client_secret
+  aad_tenant_id     = var.aad_tenant_id
+
+  jupyter_image = "jupyter/datascience-notebook"
+  # renovate: datasource=docker depName=jupyter/datascience-notebook versioning=loose
+  jupyter_image_version = "x86_64-ubuntu-22.04"
+
+  condenser_ingress_isEnabled     = true
+  condenser_ingress_test_hostname = "jupyter-dev"
+}

terraform/modules/jupyter/README.md

@@ -5,7 +5,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | 1.9.8 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >1.9.8 |
 | <a name="requirement_harvester"></a> [harvester](#requirement\_harvester) | 0.6.4 |
 
 ## Providers

terraform/modules/jupyter/versions.tf

@@ -1,6 +1,6 @@
 terraform {
 
-  required_version = "1.9.8"
+  required_version = ">1.9.8"
 
   required_providers {
     harvester = {

terraform/versions.tf

@@ -1,6 +1,6 @@
 terraform {
 
-  required_version = "1.9.8"
+  required_version = ">1.9.8"
 
   required_providers {
     harvester = {