terraform, azure and utoronto: fixes and aligning files with terraform state #3578

consideRatio · 2024-01-05T17:35:06Z

This PR represents changes to terraform files that I found relevant to do in order to get utoronto's terraform state to be possible to apply with minimal changes.

terraform plan -var-file=projects/utoronto.tfvars

azurerm_resource_group.jupyterhub: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster]
azurerm_virtual_network.jupyterhub: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.Network/virtualNetworks/k8s-network]
azurerm_container_registry.container_registry: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.ContainerRegistry/registries/2i2cutorontohubregistry]
azurerm_subnet.node_subnet: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.Network/virtualNetworks/k8s-network/subnets/k8s-nodes-subnet]
azurerm_storage_account.homes: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.Storage/storageAccounts/2i2cutorontohubstorage]
azurerm_kubernetes_cluster.jupyterhub: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.ContainerService/managedClusters/hub-cluster]
azurerm_storage_share.homes: Refreshing state... [id=https://2i2cutorontohubstorage.file.core.windows.net/homes]
azurerm_kubernetes_cluster_node_pool.user_pool["default"]: Refreshing state... [id=/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.ContainerService/managedClusters/hub-cluster/agentPools/nbdefault]
kubernetes_namespace.homes: Refreshing state... [id=azure-file]
kubernetes_secret.homes: Refreshing state... [id=azure-file/access-credentials]

Note: Objects have changed outside of Terraform

Terraform detected the following changes made outside of Terraform since the last "terraform apply" which may have affected this plan:

  # azurerm_kubernetes_cluster.jupyterhub has changed
  ~ resource "azurerm_kubernetes_cluster" "jupyterhub" {
        id                                  = "/subscriptions/ead3521a-d994-4a44-a68d-b16e35642d5b/resourceGroups/2i2c-utoronto-cluster/providers/Microsoft.ContainerService/managedClusters/hub-cluster"
      ~ kube_config_raw                     = (sensitive value)
        name                                = "hub-cluster"
        tags                                = {}
        # (21 unchanged attributes hidden)

        # (8 unchanged blocks hidden)
    }


Unless you have made equivalent changes to your configuration, or ignored the relevant attributes using ignore_changes, the following plan may include actions to undo or respond to these changes.

───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols:
  - destroy

Terraform will perform the following actions:

  # kubernetes_namespace.homes will be destroyed
  # (because kubernetes_namespace.homes is not in configuration)
  - resource "kubernetes_namespace" "homes" {
      - id = "azure-file" -> null

      - metadata {
          - annotations      = {} -> null
          - generation       = 0 -> null
          - labels           = {} -> null
          - name             = "azure-file" -> null
          - resource_version = "1418" -> null
          - uid              = "09a992bc-9f2b-4bc8-a616-5e56a4ef4128" -> null
        }
    }

  # kubernetes_secret.homes will be destroyed
  # (because kubernetes_secret.homes is not in configuration)
  - resource "kubernetes_secret" "homes" {
      - data      = (sensitive value) -> null
      - id        = "azure-file/access-credentials" -> null
      - immutable = false -> null
      - type      = "Opaque" -> null

      - metadata {
          - annotations      = {} -> null
          - generation       = 0 -> null
          - labels           = {} -> null
          - name             = "access-credentials" -> null
          - namespace        = "azure-file" -> null
          - resource_version = "2276640" -> null
          - uid              = "ffecfd59-beb3-4527-8528-1709b80da7b9" -> null
        }
    }

Plan: 0 to add, 0 to change, 2 to destroy.

Changes to Outputs:
  ~ kubeconfig               = (sensitive value)

───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

Note: You didn't use the -out option to save this plan, so Terraform can't guarantee to take exactly these actions if you run "terraform apply" now.

📚 Documentation preview 📚: https://2i2c-pilot-hubs--3578.org.readthedocs.build/en/3578/

yuvipanda

Generally looks good, one question about max number!

yuvipanda · 2024-01-05T17:42:25Z

terraform/azure/projects/utoronto.tfvars

-    min : 1,
-    max : 100,
+    min : 0,
+    max : 86,


Is there a specific reason 86 was chosen?

I updated those values to align with the current configuration, but I don't know the history on why they are configured to 0 - 86.

@consideRatio ah, ok. Can you just add a comment about that here? Once that's done, this is good to go. Thanks for cleaning this up!

yuvipanda · 2024-01-05T17:43:56Z

terraform/azure/storage.tf

@@ -23,7 +23,7 @@ resource "azurerm_storage_share" "homes" {
  name                 = "homes"
  storage_account_name = azurerm_storage_account.homes.name
  quota                = var.storage_size
-  enabled_protocol     = var.storage_protocol
+  enabled_protocol     = "NFS"


In particular, this is great! Let's rip out any other Azure File mounting related stuff we may have too (we use NFS for mounting that too now)

yuvipanda · 2024-01-05T17:47:48Z

terraform/azure/projects/utoronto.tfvars

-    min : 1,
-    max : 100,
+    min : 0,
+    max : 86,


@consideRatio ah, ok. Can you just add a comment about that here? Once that's done, this is good to go. Thanks for cleaning this up!

consideRatio · 2024-01-05T18:37:49Z

Thank you for reviewing and answering questions about this @yuvipanda. This is now applied, and terraform plan now reports No changes. Your infrastructure matches the configuration. :)

yuvipanda · 2024-01-05T18:42:04Z

Thanks for going through this in detail and getting all this set up before the upgrade, @consideRatio!

consideRatio added 9 commits January 5, 2024 16:36

docs: fix notes about AKS machine types to use

572f435

Add docstring to terraform/azure/proxycommand.py

8563929

terraform, utoronto: reorganize for readability and add fixme notes

0ee4273

terraform, utoronto: align files with current state

f008c7c

terraform, azure: complete earlier cleanup by hardcoding NFS over SMB

dc54258

terraform, azure: stop declaring core node pool node count

593ed03

terraform, azure: fix capitalization

ce6084a

terraform, azure: bump lower bound on some providers

2898b43

terraform, azure: cleanup unused azure-file k8s namespace

a643698

consideRatio requested a review from a team as a code owner January 5, 2024 17:35

github-actions bot assigned consideRatio Jan 5, 2024

consideRatio changed the title ~~terraform, azure and utoronto: fixes and terraform state sync~~ terraform, azure and utoronto: fixes and aligning files with terraform state Jan 5, 2024

yuvipanda reviewed Jan 5, 2024

View reviewed changes

yuvipanda approved these changes Jan 5, 2024

View reviewed changes

consideRatio added 2 commits January 5, 2024 19:14

terraform, utoronto: add comment about min-max nodes

c8bb78d

terraform, azure: add note on handling a 403 when using terraform

d9edf6b

consideRatio merged commit 0c3180f into 2i2c-org:master Jan 5, 2024
4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

terraform, azure and utoronto: fixes and aligning files with terraform state #3578

terraform, azure and utoronto: fixes and aligning files with terraform state #3578

consideRatio commented Jan 5, 2024 •

edited by github-actions bot

Loading

yuvipanda left a comment

yuvipanda Jan 5, 2024

consideRatio Jan 5, 2024 •

edited

Loading

yuvipanda Jan 5, 2024

yuvipanda Jan 5, 2024

yuvipanda Jan 5, 2024

consideRatio commented Jan 5, 2024

yuvipanda commented Jan 5, 2024

terraform, azure and utoronto: fixes and aligning files with terraform state #3578

terraform, azure and utoronto: fixes and aligning files with terraform state #3578

Conversation

consideRatio commented Jan 5, 2024 • edited by github-actions bot Loading

yuvipanda left a comment

Choose a reason for hiding this comment

yuvipanda Jan 5, 2024

Choose a reason for hiding this comment

consideRatio Jan 5, 2024 • edited Loading

Choose a reason for hiding this comment

yuvipanda Jan 5, 2024

Choose a reason for hiding this comment

yuvipanda Jan 5, 2024

Choose a reason for hiding this comment

yuvipanda Jan 5, 2024

Choose a reason for hiding this comment

consideRatio commented Jan 5, 2024

yuvipanda commented Jan 5, 2024

consideRatio commented Jan 5, 2024 •

edited by github-actions bot

Loading

consideRatio Jan 5, 2024 •

edited

Loading