From 619690016d10d75d8b7cb2114b7c176c8c9683ec Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Sun, 1 Dec 2024 19:34:48 -0500 Subject: [PATCH 1/7] Configure gamma1 tfvars --- terraform/gamma1.tfvars | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 terraform/gamma1.tfvars diff --git a/terraform/gamma1.tfvars b/terraform/gamma1.tfvars new file mode 100644 index 0000000..9f425a5 --- /dev/null +++ b/terraform/gamma1.tfvars @@ -0,0 +1,55 @@ +mesh_proxmox_node = "jon" +mesh_proxmox_template_image = "debian-cloud" +mesh_proxmox_storage_location = "local-lvm" +mesh_env_name = "gamma1" +mesh_local_user = "debian" +mesh_mgr_ips = [ + "10.70.90.211", +] +mesh_mgr_cores = [ + 4, +] +mesh_mgr_ram_mb = [ + 4096, +] +mesh_mgr_disk_size = [ + 50, +] +mesh_ips = [ + "10.70.90.212", + "10.70.90.213", + "10.70.90.214", +] +mesh_worker_cores = [ + 4, + 4, + 4, + 4, +] +mesh_worker_ram_mb = [ + 4096, + 4096, + 4096, + 4096, +] +mesh_worker_disk_size = [ + 150, + 150, + 150, + 150, +] +mesh_lb_ip = "10.70.90.210" +mesh_gateway = "10.70.90.1" +mesh_networkrange = "24" +mesh_net_block = "10.70.90.0" +mesh_external_ips = [ + "199.170.132.42", +] +meshdb_fqdn = [ + "gammadb.nycmesh.net", + "adminmap.gammadb.nycmesh.net", + "los-backend.gammadb.nycmesh.net", + "los.gammadb.nycmesh.net", + "forms.gammadb.nycmesh.net", + "gammamap.nycmesh.net", +] From 1412ef3ecd95cbac4ba378791e041a8086bc0f51 Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Sun, 1 Dec 2024 19:46:06 -0500 Subject: [PATCH 2/7] Deploy Gamma Environment --- .github/workflows/deploy_gamma.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/deploy_gamma.yaml diff --git a/.github/workflows/deploy_gamma.yaml b/.github/workflows/deploy_gamma.yaml new file mode 100644 index 0000000..728ae42 --- /dev/null +++ b/.github/workflows/deploy_gamma.yaml @@ -0,0 +1,19 @@ +name: Deploy Gamma Environment +permissions: read-all + +on: + push: + branches: + - wdn/gamma1 # TODO: Change me to dev branch + workflow_dispatch: + branches: + - wdn/gamma1 # TODO: Change me to dev branch + +jobs: + deploy_gamma1: + name: Deploy gamma1 + uses: ./.github/workflows/deploy_k8s_cluster.yaml + with: + environment: gamma1 + secrets: inherit + if: github.ref == 'refs/heads/wdn/gamma1' # TODO: Change me to dev branch From b042abf3a1b11a1aa3fb965eb66ff77c15efbf48 Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Tue, 3 Dec 2024 08:16:31 -0500 Subject: [PATCH 3/7] Update IP Addresses --- terraform/gamma1.tfvars | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/gamma1.tfvars b/terraform/gamma1.tfvars index 9f425a5..b6f001e 100644 --- a/terraform/gamma1.tfvars +++ b/terraform/gamma1.tfvars @@ -4,7 +4,7 @@ mesh_proxmox_storage_location = "local-lvm" mesh_env_name = "gamma1" mesh_local_user = "debian" mesh_mgr_ips = [ - "10.70.90.211", + "10.70.90.198", ] mesh_mgr_cores = [ 4, @@ -16,9 +16,9 @@ mesh_mgr_disk_size = [ 50, ] mesh_ips = [ - "10.70.90.212", - "10.70.90.213", - "10.70.90.214", + "10.70.90.199", + "10.70.90.200", + "10.70.90.168", ] mesh_worker_cores = [ 4, @@ -38,7 +38,7 @@ mesh_worker_disk_size = [ 150, 150, ] -mesh_lb_ip = "10.70.90.210" +mesh_lb_ip = "10.70.90.197" mesh_gateway = "10.70.90.1" mesh_networkrange = "24" mesh_net_block = "10.70.90.0" From cb328ccefdf1b48e0df244ad250df4e1bfcf1ed2 Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Tue, 3 Dec 2024 08:32:27 -0500 Subject: [PATCH 4/7] 198 is unreachable --- terraform/gamma1.tfvars | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/terraform/gamma1.tfvars b/terraform/gamma1.tfvars index b6f001e..41ffbdb 100644 --- a/terraform/gamma1.tfvars +++ b/terraform/gamma1.tfvars @@ -4,7 +4,7 @@ mesh_proxmox_storage_location = "local-lvm" mesh_env_name = "gamma1" mesh_local_user = "debian" mesh_mgr_ips = [ - "10.70.90.198", + "10.70.90.168", ] mesh_mgr_cores = [ 4, @@ -18,7 +18,6 @@ mesh_mgr_disk_size = [ mesh_ips = [ "10.70.90.199", "10.70.90.200", - "10.70.90.168", ] mesh_worker_cores = [ 4, From 0c027afcbe4572d56bf31ce52a435c74dd0e294c Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Wed, 4 Dec 2024 09:28:51 -0500 Subject: [PATCH 5/7] Update IPs --- terraform/gamma1.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/gamma1.tfvars b/terraform/gamma1.tfvars index 41ffbdb..c600f55 100644 --- a/terraform/gamma1.tfvars +++ b/terraform/gamma1.tfvars @@ -17,7 +17,7 @@ mesh_mgr_disk_size = [ ] mesh_ips = [ "10.70.90.199", - "10.70.90.200", + "10.70.90.162", ] mesh_worker_cores = [ 4, From 519b4da512b018cc55f631890f661ede9ac6263a Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Wed, 4 Dec 2024 19:50:05 -0500 Subject: [PATCH 6/7] Update terraform/gamma1.tfvars Co-authored-by: james-otten --- terraform/gamma1.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/gamma1.tfvars b/terraform/gamma1.tfvars index c600f55..496cf87 100644 --- a/terraform/gamma1.tfvars +++ b/terraform/gamma1.tfvars @@ -50,5 +50,5 @@ meshdb_fqdn = [ "los-backend.gammadb.nycmesh.net", "los.gammadb.nycmesh.net", "forms.gammadb.nycmesh.net", - "gammamap.nycmesh.net", + "adminmap.gammadb.nycmesh.net", ] From a5e402c7e5c7c3bf00dc23c51acbe8cad9dae79a Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Wed, 4 Dec 2024 21:27:39 -0500 Subject: [PATCH 7/7] Move gamma1 deployment to main --- .github/workflows/deploy_environments.yaml | 8 ++++++++ .github/workflows/deploy_gamma.yaml | 19 ------------------- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/deploy_gamma.yaml diff --git a/.github/workflows/deploy_environments.yaml b/.github/workflows/deploy_environments.yaml index 8e32b4d..bfc38ad 100644 --- a/.github/workflows/deploy_environments.yaml +++ b/.github/workflows/deploy_environments.yaml @@ -10,6 +10,14 @@ on: - main jobs: + deploy_gamma1: + name: Deploy gamma1 + uses: ./.github/workflows/deploy_k8s_cluster.yaml + with: + environment: gamma1 + secrets: inherit + if: github.ref == 'refs/heads/main' + deploy_dev3: name: Deploy dev3 uses: ./.github/workflows/deploy_k8s_cluster.yaml diff --git a/.github/workflows/deploy_gamma.yaml b/.github/workflows/deploy_gamma.yaml deleted file mode 100644 index 728ae42..0000000 --- a/.github/workflows/deploy_gamma.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: Deploy Gamma Environment -permissions: read-all - -on: - push: - branches: - - wdn/gamma1 # TODO: Change me to dev branch - workflow_dispatch: - branches: - - wdn/gamma1 # TODO: Change me to dev branch - -jobs: - deploy_gamma1: - name: Deploy gamma1 - uses: ./.github/workflows/deploy_k8s_cluster.yaml - with: - environment: gamma1 - secrets: inherit - if: github.ref == 'refs/heads/wdn/gamma1' # TODO: Change me to dev branch