From 4afa7226ed9812f62a1491eb31b64ec64f52efd9 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 1 Mar 2023 00:17:54 +0100
Subject: [PATCH] fix(terraform): Remove useless subnet variable from module

This patch drops the unused subnet variable from the hcloud_instance
module, which wasn't used anyway. This help to make the module fully
compatible with the way the hedgedoc demo instance is deployed.
---
 terraform/k8s01/.terraform.lock.hcl           | 65 ++++++++++---------
 terraform/k8s01/main.tf                       |  2 +-
 terraform/k8s01/network.tf                    |  6 ++
 terraform/modules/hcloud_instance/network.tf  |  5 --
 .../modules/hcloud_instance/variables.tf      |  5 --
 5 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 terraform/modules/hcloud_instance/network.tf

diff --git a/terraform/k8s01/.terraform.lock.hcl b/terraform/k8s01/.terraform.lock.hcl
index dccdef842..dc7101c95 100644
--- a/terraform/k8s01/.terraform.lock.hcl
+++ b/terraform/k8s01/.terraform.lock.hcl
@@ -2,44 +2,45 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/cloudflare/cloudflare" {
-  version     = "3.31.0"
-  constraints = "3.31.0"
+  version     = "3.34.0"
+  constraints = "3.34.0"
   hashes = [
-    "h1:y8tULjyRExDVGvD2XtdU7fm0xgKmegieNvMjT60DKTY=",
-    "zh:0186c9dfbf5dc065b96d78ffafcdbcfcaa51021e56c98c7d2dcc792e5dc0c8da",
-    "zh:06d7c74cd2017eb3e26ab3afeb1365f2f91e48971f22de7d6581584fd0d19935",
-    "zh:08db742ab1664a323f7f0b122ca4f7e296fe29699ed97ba530c39d928cba114e",
-    "zh:10e391383eb8d2caf2e2d346ec1d942128dbb5b7973f9ae814cd30a417615a6d",
-    "zh:11b0ac044674304c57bf2dea83134361636757791adea352b60092c1e53c6790",
-    "zh:1e5f366be209a49345c97ebbbcf7ef9bf4cc8d1e881b961fb27fa1ebf470b54b",
-    "zh:20eff55c16d63b2805a807372f636417dccec2fce3aaf62705ffb9b07dec099b",
-    "zh:41deb6d7f8789e9300c67b5361baed8e3fd1e1ca8a34b537dd24af61461c6c25",
-    "zh:9307bd4c6a410d36d53f2d303aed4b28bc0710aef3647f6e7e470924f04e4647",
-    "zh:a668aab4ed0134a967ee6857c51696bb09cd2abcf9fe60f1dab545f50562d701",
-    "zh:cf2b817a9a4d5b275bcce9dbeedcb8926e41c33798516a92127251d5c90f3ec7",
-    "zh:d1e182fb35be4cb757f930dd8e53c1765f71723aca4658afc1696499393bcbf7",
-    "zh:d409f8f82980f468d0a84399d7ec97fc41e3bbeedd5970dae22333709fd5c4ed",
-    "zh:d69587eb50d6dd8c124c0ab23d0ad5c1d7ea4d2ddb9f96079ef10ab69679b36a",
+    "h1:4jOI2ZUyp/EvIVE9rNvCMTqrIaG7j7XxUD1i43xD0Jg=",
+    "zh:03729b0fcf189e732aca54452a105d82fec839580cb5d0137317af9163e0e4dd",
+    "zh:121b16a779e9f2fe8c96e98f32514ee9228346fc240ce12c3fb440958b93d127",
+    "zh:14509f521845eedd57a8791d76958e50bea4928760a152cd853e43f2c81a329b",
+    "zh:273336ec2bc59ab90916706c074be27f3fe6ab42addc61a354a0ef5e10c2efa5",
+    "zh:54931c30f71666856c5d749698264c15196103667c87d961f3d293ff8a5c3237",
+    "zh:58a35eea3b9e1d2f39d7b5b1c6cf107b70eacdf5891017d6667902903db3bd94",
+    "zh:5ec958afe392a76a1fea262d9070df839c4d811fc6ffd613a37f8b939ab159ef",
+    "zh:7c24c0572aa9beee20a33cb18ac54d5088a09653e94664a9f74a9af2ae0e3554",
+    "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
+    "zh:9248c43f795dbe54e07c6dbc2fb8e2f20aeac8f21ec91373d52b9975f285ba7e",
+    "zh:b09abd506601b7c3e0b3bfde0b8b9e1aed7f52b5ad629ef2865b8321852409c7",
+    "zh:e00032df4cd4aad12adf3b7955fca3d1baa8bff9436c775588417da171a4e1d9",
+    "zh:e4a8812770914d6ce9d1f8399d702e3fb0ecc4bfd6220ba015fcb3884b243c69",
+    "zh:f2ad0991ef0820b3fc5bd0a500be4dceffe0b5b2ac6c9c5fd17cbb350f2f1209",
+    "zh:fea3a9dfb1e752dc2864028049a4af05fabf7b62eb57fff26d139a424e3476fd",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/local" {
-  version     = "1.4.0"
-  constraints = "1.4.0"
+  version     = "2.3.0"
+  constraints = "2.3.0"
   hashes = [
-    "h1:P3mtBQSRp/KhVLJgwdHZRTWaYsT6A9nSwrmKrRZwsW8=",
-    "zh:1b265fcfdce8cc3ccb51969c6d7a61531bf8a6e1218d95c1a74c40f25595c74b",
-    "zh:2ea6d8c503a1119b80a273eacd187516347c00a54990c47d130235e2ad53d163",
-    "zh:38bcc4a224d2c0745015564b0803a368b2bd08d1a3e349783bc4c09c68fde24b",
-    "zh:3fada9c646bf57bcdd6844d7c30153407a2a8100811daa69fc0d674fb39a9d18",
-    "zh:74ccb372e752188ba4ff1b1280222d6fd61bdf29dcf474edb8ea63178897912c",
-    "zh:7a323f05ccd7caa1450301af1bb7cac25e2d6ac799eb581219c2c663e5d9ae3f",
-    "zh:7ef13da7e8ae7129fae8a9c72845d52d4586db496359228ed435aeab2f44aea8",
-    "zh:9df7edb284f5548918b839b18204c6a78ac33b4df070d4e4a5c264bb11152e9c",
-    "zh:b062919beaca2e06fd3b333b700dae664828fe734479e51c2c28b8219286e0fc",
-    "zh:ca9fe963f261236b3f3308f8b4979cdd95dd68281b00c1c18a6d17db07519ac8",
-    "zh:e125e4a7d838e231a88e0efc1e727f5a1807db5c0cad5e1cbaf1b52c560b47c7",
-    "zh:f3c3bbab3785f00433135538bdb697d516bc43f102c1b128a0c1419b172e88f6",
+    "h1:+l9ZTDGmGdwnuYI5ftUjwP8UgoLw4f4V9xoCzal4LW0=",
+    "zh:1f1920b3f78c31c6b69cdfe1e016a959667c0e2d01934e1a084b94d5a02cd9d2",
+    "zh:550a3cdae0ddb350942624e7b2e8b31d28bc15c20511553432413b1f38f4b214",
+    "zh:68d1d9ccbfce2ce56b28a23b22833a5369d4c719d6d75d50e101a8a8dbe33b9b",
+    "zh:6ae3ad6d865a906920c313ec2f413d080efe32c230aca711fd106b4cb9022ced",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:a0f413d50f54124057ae3dcd9353a797b84e91dc34bcf85c34a06f8aef1f9b12",
+    "zh:a2ac6d4088ceddcd73d88505e18b8226a6e008bff967b9e2d04254ef71b4ac6b",
+    "zh:a851010672e5218bdd4c4ea1822706c9025ef813a03da716d647dd6f8e2cffb0",
+    "zh:aa797561755041ef2fad99ee9ffc12b5e724e246bb019b21d7409afc2ece3232",
+    "zh:c6afa960a20d776f54bb1fc260cd13ead17280ebd87f05b9abcaa841ed29d289",
+    "zh:df0975e86b30bb89717b8c8d6d4690b21db66de06e79e6d6cfda769f3304afe6",
+    "zh:f0d3cc3da72135efdbe8f4cfbfb0f2f7174827887990a5545e6db1981f0d3a7c",
   ]
 }
 
diff --git a/terraform/k8s01/main.tf b/terraform/k8s01/main.tf
index a09b12d81..667ce1058 100644
--- a/terraform/k8s01/main.tf
+++ b/terraform/k8s01/main.tf
@@ -15,5 +15,5 @@ module "gw" {
     "firewall.hetzner.si-infra.de/web" = "true",
     "firewall.hetzner.si-infra.de/email" = "true"
   }
-  subnet         = hcloud_network_subnet.subnet.id
+  //subnet         = hcloud_network_subnet.subnet.id
 }
diff --git a/terraform/k8s01/network.tf b/terraform/k8s01/network.tf
index 62cc1e08f..d6a3a4077 100644
--- a/terraform/k8s01/network.tf
+++ b/terraform/k8s01/network.tf
@@ -9,3 +9,9 @@ resource "hcloud_network_subnet" "subnet" {
   network_zone = "eu-central"
   ip_range     = var.subnet_cidr
 }
+
+resource "hcloud_server_network" "srvnetwork" {
+  count      = length(module.gw.server_ids)
+  server_id  = element(module.gw.server_ids, count.index)
+  network_id = hcloud_network.network.id
+}
\ No newline at end of file
diff --git a/terraform/modules/hcloud_instance/network.tf b/terraform/modules/hcloud_instance/network.tf
deleted file mode 100644
index bebdd1153..000000000
--- a/terraform/modules/hcloud_instance/network.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-#resource "hcloud_server_network" "server_network" {
-#  server_id = element(hcloud_server.server.*.id, count.index)
-#  subnet_id = var.subnet
-#  count = length(hcloud_server.server.*.id)
-#}
diff --git a/terraform/modules/hcloud_instance/variables.tf b/terraform/modules/hcloud_instance/variables.tf
index 953cdced5..2fa5f709d 100644
--- a/terraform/modules/hcloud_instance/variables.tf
+++ b/terraform/modules/hcloud_instance/variables.tf
@@ -104,8 +104,3 @@ variable "volume_size" {
   description = "Size of the additional data volume"
   default     = 20
 }
-
-variable "subnet" {
-  type        = string
-  description = "Id of the additional internal network"
-}
-- 
GitLab