clean (#232)

Author: james-otten

.github/workflows/deploy_dns_environment.yaml

@@ -22,7 +22,6 @@ env:
   TF_VAR_tsig_key_k8s_prod2: "${{ secrets.TF_VAR_TSIG_KEY_K8S_PROD2 }}"
   TF_VAR_tsig_key_k8s_dev3: "${{ secrets.TF_VAR_TSIG_KEY_K8S_DEV3 }}"
   TF_VAR_tsig_key_ha: "${{ secrets.TF_VAR_TSIG_KEY_HOMEASSISTANT }}"
-  TF_VAR_tsig_key_grandmox: "${{ secrets.TF_VAR_TSIG_KEY_GRANDMOX }}"
   TF_VAR_tsig_key_jon: "${{ secrets.TF_VAR_TSIG_KEY_JON }}"
   TF_VAR_tsig_key_10_r630_01: "${{ secrets.TF_VAR_TSIG_KEY_10_R630_01 }}"
   TF_VAR_tsig_key_713_r640_01: "${{ secrets.TF_VAR_TSIG_KEY_713_R640_01 }}"

infra/ansible/roles/knot_authoritative/templates/knot.conf.j2

@@ -35,9 +35,6 @@ key:
   - id: k8s.lb.dev3
     algorithm: hmac-sha512
     secret: {{ TSIG_KEY_K8S_DEV3 }}
-  - id: grandmox.prox.mesh.nycmesh.net.
-    algorithm: hmac-sha512
-    secret: {{ TSIG_KEY_GRANDMOX }}
   - id: jon.prox.mesh.nycmesh.net.
     algorithm: hmac-sha512
     secret: {{ TSIG_KEY_JON }}
@@ -82,12 +79,6 @@ acl:
     update-owner-match: equal
     update-owner-name: acme-challenge.jamesinternalprodtwo.mesh.nycmesh.net.
     key: k8s.lb.prod2
-  - id: acl-update-grandmox
-    action: update
-    update-type: [TXT]
-    update-owner-match: equal
-    update-owner-name: acme-challenge.grandmox.prox.mesh.nycmesh.net.
-    key: grandmox.prox.mesh.nycmesh.net.
   - id: acl-update-jon
     action: update
     update-type: [TXT]
@@ -158,7 +149,7 @@ zone:
     acl: acl-update-airflow
   - domain: prox.mesh.nycmesh.net
     file: prox.mesh.nycmesh.net.zone
-    acl: [acl-update-grandmox, acl-update-jon, acl-update-nycmesh-10-r630-01, acl-update-nycmesh-713-r640-01]
+    acl: [acl-update-jon, acl-update-nycmesh-10-r630-01, acl-update-nycmesh-713-r640-01]
   - domain: building.mesh.nycmesh.net
     file: building.mesh.nycmesh.net.zone
     acl: acl-update-building

infra/terraform/dns.tf

@@ -31,7 +31,6 @@ module "some_mesh_dns_servers" {
   tsig_key_k8s_prod1              = var.tsig_key_k8s_prod1
   tsig_key_k8s_prod2              = var.tsig_key_k8s_prod2
   tsig_key_k8s_dev3               = var.tsig_key_k8s_dev3
-  tsig_key_grandmox               = var.tsig_key_grandmox
   tsig_key_jon                    = var.tsig_key_jon
   tsig_key_10_r630_01             = var.tsig_key_10_r630_01
   tsig_key_713_r640_01            = var.tsig_key_713_r640_01

infra/terraform/mesh_dns_servers/ansible.tf

@@ -26,7 +26,6 @@ resource "ansible_group" "knot-authoritative" {
     TSIG_KEY_K8S_PROD1           = var.tsig_key_k8s_prod1
     TSIG_KEY_K8S_PROD2           = var.tsig_key_k8s_prod2
     TSIG_KEY_K8S_DEV3            = var.tsig_key_k8s_dev3
-    TSIG_KEY_GRANDMOX            = var.tsig_key_grandmox
     TSIG_KEY_JON                 = var.tsig_key_jon
     TSIG_KEY_10_R630_01          = var.tsig_key_10_r630_01
     TSIG_KEY_713_R640_01         = var.tsig_key_713_r640_01

infra/terraform/mesh_dns_servers/vars.tf

@@ -188,12 +188,6 @@ variable "tsig_key_k8s_dev3" {
   sensitive   = true
 }
 
-variable "tsig_key_grandmox" {
-  type        = string
-  description = "TSIG key for the grandmox.mesh.nycmesh.net zone"
-  sensitive   = true
-}
-
 variable "tsig_key_jon" {
   type        = string
   description = "TSIG key for the jon.mesh.nycmesh.net zone"

infra/terraform/vars.tf

@@ -187,12 +187,6 @@ variable "tsig_key_k8s_dev3" {
   sensitive   = true
 }
 
-variable "tsig_key_grandmox" {
-  type        = string
-  description = "TSIG key for the grandmox.mesh.nycmesh.net zone"
-  sensitive   = true
-}
-
 variable "tsig_key_jon" {
   type        = string
   description = "TSIG key for the jon.mesh.nycmesh.net zone"

mesh.zone

@@ -71,10 +71,6 @@ andrew NS andrew-vpn-endpoint-router
 ; Willard
 zabbix A 10.70.90.40
 status A 164.92.117.225
-grandbox A 10.69.19.233
-*.grandbox CNAME grandbox
-grandsvc A 199.167.59.101
-*.grandsvc CNAME grandsvc
 
 ; James
 scan A 10.70.90.120
@@ -109,9 +105,6 @@ nms A 10.70.118.10
 scuttle A 10.70.73.4
 lte A 10.70.90.170
 
-; Grand
-grandmox A 10.70.188.196
-
 ; The Room
 room A 10.69.30.65
 meshroom CNAME room

prox.mesh.nycmesh.net.zone

@@ -5,7 +5,6 @@ $TTL 3600
 ; Authoritative DNS servers
 nycmesh-713-dns-auth-3 A 199.170.132.47
 
-grandmox A 10.70.188.196
 jon A 10.70.90.52
 nycmesh-10-r630-01 A 10.70.103.186
 nycmesh-713-r640-01 A 10.70.90.195