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.

Sign up for GitHub

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

Jump to bottom

adding dns_provider feature #117

Merged
merged 3 commits into from
Sep 21, 2022
Merged

adding dns_provider feature #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1967989
adding dns_provider feature
smarunich Sep 21, 2022
818ad80
Update makefile to reflect dns changes
smarunich Sep 21, 2022
c6d36fc
Update Makefile
smarunich Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ tsb_mp:
terraform apply ${terraform_apply_args} -target=module.cert-manager -target=module.es -var-file="../../terraform.tfvars.json"; \
terraform apply ${terraform_apply_args} -target=module.tsb_mp.kubectl_manifest.manifests_certs -var-file="../../terraform.tfvars.json"; \
terraform apply ${terraform_apply_args} -var-file="../../terraform.tfvars.json"; \
terraform apply ${terraform_apply_args} -target=module.aws_route53_register_fqdn -var-file="../../terraform.tfvars.json"; \
terraform apply ${terraform_apply_args} -target=module.aws_register_fqdn -target=module.azure_register_fqdn -target=module.gcp_register_fqdn -var-file="../../terraform.tfvars.json"; \
terraform output ${terraform_output_args} | jq . > ../../outputs/terraform_outputs/terraform-tsb-mp.json; \
terraform workspace select default; \
cd "../.."; \
Expand Down Expand Up @@ -219,7 +219,9 @@ argocd:
destroy:
@/bin/sh -c '\
cd "tsb/mp"; \
terraform destroy ${terraform_destroy_args} -target=module.aws_route53_register_fqdn -var-file="../../terraform.tfvars.json"; \
terraform destroy ${terraform_destroy_args} -target=module.aws_register_fqdn -var-file="../../terraform.tfvars.json"; \
terraform destroy ${terraform_destroy_args} -target=module.azure_register_fqdn -var-file="../../terraform.tfvars.json"; \
terraform destroy ${terraform_destroy_args} -target=module.gcp_register_fqdn -var-file="../../terraform.tfvars.json"; \
rm -rf terraform.tfstate.d/; \
rm -rf terraform.tfstate; \
cd "../.."; \
Expand Down
0 modules/aws/route53_register_fqdn/main.tf → modules/aws/register_fqdn/main.tf
View file
Open in desktop
File renamed without changes.
0 ...es/aws/route53_register_fqdn/variables.tf → modules/aws/register_fqdn/variables.tf
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions modules/azure/register_fqdn/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
data "azurerm_dns_zone" "zone" {
resource_group_name = "dns-terraform-sandbox"
name = var.dns_zone
}

data "dns_a_record_set" "tsb" {
host = var.address
}

resource "azurerm_dns_a_record" "example" {
name = split(".",var.fqdn,)[0]
zone_name = data.azurerm_dns_zone.zone.name
resource_group_name = "dns-terraform-sandbox"
ttl = 30
records = [data.dns_a_record_set.tsb.addrs[0]]
}
7 changes: 7 additions & 0 deletions modules/azure/register_fqdn/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
variable "dns_zone" {
}
variable "fqdn" {
}
variable "address" {
}

18 changes: 18 additions & 0 deletions modules/gcp/register_fqdn/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
data "google_dns_managed_zone" "zone" {
project = "dns-terraform-sandbox"
name = replace(var.dns_zone, ".", "-")
}

data "dns_a_record_set" "tsb" {
host = var.address
}

resource "google_dns_record_set" "tsb_fqdn" {
project = "dns-terraform-sandbox"
managed_zone = data.google_dns_managed_zone.zone.name
name = "${var.fqdn}."
type = "A"
ttl = 300

rrdatas = [data.dns_a_record_set.tsb.addrs[0]]
}
6 changes: 6 additions & 0 deletions modules/gcp/register_fqdn/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
variable "dns_zone" {
}
variable "fqdn" {
}
variable "address" {
}
3 changes: 2 additions & 1 deletion terraform.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "azure",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.azure.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
3 changes: 2 additions & 1 deletion tfvars_collection/mp-aks-cp-1aks-2gke-terraform.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "azure",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.azure.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
1 change: 1 addition & 0 deletions tfvars_collection/mp-eks-cp-1aks-1eks-2gke.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"dns_provider": "aws",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
Expand Down
3 changes: 2 additions & 1 deletion tfvars_collection/mp-gke-cp-1aks-1eks-2gke.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "gcp",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.gcp.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
3 changes: 2 additions & 1 deletion tfvars_collection/mp-gke-cp-1aks-2gke.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "gcp",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.gcp.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
3 changes: 2 additions & 1 deletion tfvars_collection/mp-gke-cp-2aks-2eks-2gke.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "gcp",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.gcp.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
3 changes: 2 additions & 1 deletion tfvars_collection/mp-gke-cp-3gke.tfvars.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name_prefix": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.cx.tetrate.info",
"dns_provider": "gcp",
"tsb_fqdn": "<YOUR UNIQUE PREFIX NAME TO BE CREATED>.gcp.cx.tetrate.info",
"tsb_version": "1.5.0",
"tsb_image_sync_username": "<TSB_REPO_USERNAME>",
"tsb_image_sync_apikey": "<TSB_REPO_APIKEY>",
Expand Down
23 changes: 20 additions & 3 deletions tsb/mp/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,26 @@ module "tsb_mp" {

}

module "aws_route53_register_fqdn" {
source = "../../modules/aws/route53_register_fqdn"
dns_zone = var.dns_zone
module "aws_register_fqdn" {
count = var.dns_provider == "aws" ? 1 : 0
source = "../../modules/aws/register_fqdn"
dns_zone = "cx.tetrate.info"
fqdn = var.tsb_fqdn
address = module.tsb_mp.ingress_ip != "" ? module.tsb_mp.ingress_ip : module.tsb_mp.ingress_hostname
}

module "azure_register_fqdn" {
count = var.dns_provider == "azure" ? 1 : 0
source = "../../modules/azure/register_fqdn"
dns_zone = "azure.cx.tetrate.info"
fqdn = var.tsb_fqdn
address = module.tsb_mp.ingress_ip != "" ? module.tsb_mp.ingress_ip : module.tsb_mp.ingress_hostname
}

module "gcp_register_fqdn" {
count = var.dns_provider == "gcp" ? 1 : 0
source = "../../modules/gcp/register_fqdn"
dns_zone = "gcp.cx.tetrate.info"
fqdn = var.tsb_fqdn
address = module.tsb_mp.ingress_ip != "" ? module.tsb_mp.ingress_ip : module.tsb_mp.ingress_hostname
}
4 changes: 4 additions & 0 deletions tsb/mp/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ provider "kubectl" {
token = local.infra[var.tsb_mp["cloud"]][var.tsb_mp["cluster_id"]]["outputs"].token
load_config_file = false
}

provider "azurerm" {
features {}
}
4 changes: 4 additions & 0 deletions tsb/mp/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,7 @@ variable "output_path" {
variable "cert-manager_enabled" {
default = true
}

variable "dns_provider" {
default = null
}