Skip to content

Remove jupyterhub ec2 #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: staging
Choose a base branch
from
Open

Remove jupyterhub ec2 #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eb8f37
Use fixed ami for jupyterhub_metabolism instance
danifr Oct 22, 2025
a1409d1
Remove jupyterhub EC2 based service
danifr Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions cs/jupyterhub/ec2_instance.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,12 @@ data "aws_key_pair" "coreservices" {
include_public_key = true
}

data "aws_ami" "jupyterhub_os" {
most_recent = false
filter {
name = "name"
values = ["${var.jupyterhub_ec2_operating_system}"]
}
filter {
name = "owner-alias"
values = ["amazon"]
}
filter {
name = "architecture"
values = ["x86_64"]
}
filter {
name = "virtualization-type"
values = ["hvm"]
}
owners = ["amazon"]
}

data "aws_secretsmanager_secret_version" "jupyterhub_secrets" {
secret_id = var.jupyterhub_secrets_arn
}

resource "aws_instance" "jupyterhub_server" {
ami = data.aws_ami.jupyterhub_os.id
ami = var.jupyterhub_ec2_operating_system
instance_type = var.jupyterhub_ec2_type
subnet_id = var.jupyterhub_private_subnet
key_name = var.aws_coreservices_ssh_key_id
Expand Down
144 changes: 0 additions & 144 deletions cs/jupyterhub/jupyterhub_config.sh.tpl
View file
Open in desktop

This file was deleted.

23 changes: 1 addition & 22 deletions cs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,14 @@ module "jupyterhub_metabolism" {
jupyterhub_base_path = "/jupyterhub_metabolism"
jupyterhub_secrets_arn = var.jupyterhub_secrets_arn
jupyterhub_ec2_config_template = "jupyterhub_metabolism_config.sh.tpl"
jupyterhub_ec2_operating_system = "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250516"
jupyterhub_ec2_operating_system = "ami-0a7d80731ae1b2435"
jupyterhub_sg_name = "jupyterhub-metabolism-sg"
jupyterhub_sg_efs_name = "jupyterhub-metabolism-homedirs"
jupyterhub_target_group_name = "jupyterhub-metabolism-tg"
jupyterhub_admin_users = ["NataliBZ", "AurelienJaquier", "danielaegassan", "chr-pok", "dkeller9", "ilkilic", "james-isbister", "darshanmandge", "lidakanari", "mwolfr", "romani79", "danifr"]
jupyterhub_listener_rule_priority = 350
}

module "jupyterhub" {
source = "./jupyterhub"
aws_coreservices_ssh_key_id = var.aws_coreservices_ssh_key_id
vpc_id = var.vpc_id
private_alb_https_listener_arn = var.private_alb_https_listener_arn
primary_domain = var.domain_name
jupyterhub_private_subnet = module.networking.jupyterhub_private_subnet
jupyterhub_ec2_type = var.jupyterhub_ec2_type
jupyterhub_nginx_port = 80
jupyterhub_port = 8080
jupyterhub_base_path = "/jupyterhub"
jupyterhub_secrets_arn = var.jupyterhub_secrets_arn
jupyterhub_ec2_config_template = "jupyterhub_config.sh.tpl"
jupyterhub_ec2_operating_system = "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250530"
jupyterhub_sg_name = "jupyterhub-svc-sg"
jupyterhub_sg_efs_name = "jupyterhub-svc-homedirs"
jupyterhub_target_group_name = "jupyterhub-svc-tg"
jupyterhub_admin_users = ["NataliBZ", "AurelienJaquier", "danielaegassan", "chr-pok", "dkeller9", "ilkilic", "james-isbister", "darshanmandge", "lidakanari", "mwolfr", "romani79", "danifr"]
jupyterhub_listener_rule_priority = 351
}

module "keycloak" {
source = "./keycloak"
private_subnets = module.networking.keycloak_private_subnets
Expand Down