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

Fix for #61 and #63 #62

Open
wants to merge 2 commits into
base: release
Choose a base branch
from
Open

Fix for #61 and #63 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5df635
Change network name "service-1" to "service" to be more consistent wi…
Sep 3, 2020
348f815
Register *.pks.domain as the wildcard DNS entry to make it consistent…
Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws/pks-dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resource "aws_route53_record" "pks-api" {
name = "api.pks.${var.environment_name}.${data.aws_route53_zone.hosted.name}"
name = "*.pks.${var.environment_name}.${data.aws_route53_zone.hosted.name}"

zone_id = data.aws_route53_zone.hosted.zone_id
type = "A"
Expand Down
2 changes: 1 addition & 1 deletion aws/pks-outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
stable_config_pks = {
pks_master_iam_instance_profile_name = aws_iam_instance_profile.pks-master.name
pks_worker_iam_instance_profile_name = aws_iam_instance_profile.pks-worker.name
pks_api_dns = aws_route53_record.pks-api.name
pks_api_dns = replace(replace(aws_route53_record.pks-api.name, "/\\.$/", ""), "*.", "api.")
pks_subnet_ids = aws_subnet.pks-subnet[*].id
pks_subnet_cidrs = aws_subnet.pks-subnet[*].cidr_block
pks_subnet_gateways = [
Expand Down
4 changes: 2 additions & 2 deletions azure/pks-dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
resource "azurerm_dns_a_record" "pks" {
name = "pks.${var.environment_name}"
name = "*.pks.${var.environment_name}"
zone_name = data.azurerm_dns_zone.hosted.name
resource_group_name = data.azurerm_dns_zone.hosted.resource_group_name
ttl = "60"
records = [azurerm_public_ip.pks-lb.ip_address]

tags = merge(
var.tags,
{ name = "pks.${var.environment_name}" },
{ name = "*.pks.${var.environment_name}" },
)
}
2 changes: 1 addition & 1 deletion azure/pks-outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ locals {
stable_config_pks = {
pks_as_name = azurerm_availability_set.pks_as.name
pks_lb_name = azurerm_lb.pks.name
pks_dns = "${azurerm_dns_a_record.pks.name}.${azurerm_dns_a_record.pks.zone_name}"
pks_dns = replace(replace("${azurerm_dns_a_record.pks.name}.${azurerm_dns_a_record.pks.zone_name}", "/\\.$/", ""), "*.", "api.")
pks_subnet_name = azurerm_subnet.pks.name
pks_subnet_id = azurerm_subnet.pks.id
pks_subnet_cidr = azurerm_subnet.pks.address_prefix
Expand Down
2 changes: 1 addition & 1 deletion ci/configuration/azure/director.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ networks-configuration:
reserved_ip_ranges: ((management_subnet_gateway))-((management_subnet_range))
dns: 168.63.129.16
gateway: ((management_subnet_gateway))
- name: services-1
- name: services
service_network: false
subnets:
- iaas_identifier: ((network_name))/((services_subnet_name))
Expand Down
2 changes: 1 addition & 1 deletion ci/configuration/azure/pks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ network-properties:
other_availability_zones:
- name: Availability Sets
service_network:
name: services-1
name: services
singleton_availability_zone:
name: Availability Sets
product-properties:
Expand Down
2 changes: 1 addition & 1 deletion gcp/pks-outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
pks_master_node_service_account_id = google_service_account.pks-master-node-service-account.email
pks_worker_node_service_account_id = google_service_account.pks-worker-node-service-account.email
pks_api_target_pool_name = google_compute_target_pool.pks-api-lb.name
pks_api_dns_domain = replace(replace(google_dns_record_set.pks-api.name, "/\\.$/", ""), "*.", "")
pks_api_dns_domain = replace(replace(google_dns_record_set.pks-api.name, "/\\.$/", ""), "*.", "api.")
}
}

Expand Down