Skip to content
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.

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

Tweaking NFS settings and enabling for UToronto on Azure #888

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions config/hubs/utoronto.cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@ hubs:
auth0:
enabled: false
config: &utorontoHubConfig
azureFile:
enabled: true
nfs:
enabled: false
shareCreator:
enabled: false
pv:
serverIp: 2i2cutorontohubstorage.file.core.windows.net/homes
jupyterhub:
custom:
homepage:
Expand Down
4 changes: 3 additions & 1 deletion terraform/azure/projects/utoronto.tfvars
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
tenant_id = "78aac226-2f03-4b4d-9037-b46d56c55210"
subscription_id = "ead3521a-d994-4a44-a68d-b16e35642d5b"
resourcegroup_name = "2i2c-utoronto-cluster"

ssh_pub_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQJ4h39UYNi1wybxAH+jCFkNK2aqRcuhDkQSMx0Hak5xkbt3KnT3cOwAgUP1Vt/SjhltSTuxpOHxiAKCRnjwRk60SxKhUNzPHih2nkfYTmBBjmLfdepDPSke/E0VWvTDIEXz/L8vW8aI0QGPXnXyqzEDO9+U1buheBlxB0diFAD3vEp2SqBOw+z7UgrGxXPdP+2b3AV+X6sOtd6uSzpV8Qvdh+QAkd4r7h9JrkFvkrUzNFAGMjlTb0Lz7qAlo4ynjEwzVN2I1i7cVDKgsGz9ZG/8yZfXXx+INr9jYtYogNZ63ajKR/dfjNPovydhuz5zQvQyxpokJNsTqt1CiWEUNj georgiana@georgiana"

global_container_registry_name = "2i2cutorontohubregistry"
global_storage_account_name = "2i2cutorontohubstorage"
global_storage_account_name = "2i2cutorontohubstorage"
storage_protocol = "NFS"

location = "canadacentral"

Expand Down
8 changes: 6 additions & 2 deletions terraform/azure/storage.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ resource "azurerm_storage_account" "homes" {
name = var.global_storage_account_name
resource_group_name = azurerm_resource_group.jupyterhub.name
location = azurerm_resource_group.jupyterhub.location
account_tier = "Standard"
account_kind = "StorageV2"
account_tier = var.storage_protocol != "NFS" ? "Standard" : "Premium"
account_kind = var.storage_protocol != "NFS" ? "StorageV2" : "FileStorage"
account_replication_type = "LRS"
}

Expand All @@ -14,6 +14,10 @@ resource "azurerm_storage_share" "homes" {
enabled_protocol = var.storage_protocol
}

output "azure_fileshare_url" {
value = azurerm_storage_share.homes.url
}

resource "kubernetes_namespace" "homes" {
metadata {
name = "azure-file"
Expand Down