scottk/terraform-talos
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/terraform-talos.git synced 2025-11-02 11:18:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix zone definition

Browse Source
This commit is contained in:
Serge Logvinov
2022-02-01 23:43:10 +02:00
parent faf1015748
commit ce4c934cc1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oracle/instances-controlplane.tf
View File

@@ -21,7 +21,7 @@ resource "oci_core_instance" "contolplane" {
display_name = "${local.project}-contolplane-${count.index + 1}" display_name = "${local.project}-contolplane-${count.index + 1}"
defined_tags = merge(var.tags, { "Kubernetes.Type" = "infra", "Kubernetes.Role" = "contolplane" }) defined_tags = merge(var.tags, { "Kubernetes.Type" = "infra", "Kubernetes.Role" = "contolplane" })
availability_domain = local.zones[count.index % local.zone_count] availability_domain = local.zones[count.index % local.zone_count]
fault_domain = element(data.oci_identity_fault_domains.domains[local.zones[count.index]].fault_domains, floor(count.index / local.zone_count)).name fault_domain = element(data.oci_identity_fault_domains.domains[element(local.zones, count.index)].fault_domains, floor(count.index / local.zone_count)).name
shape = lookup(var.controlplane, "type", "VM.Standard.E4.Flex") shape = lookup(var.controlplane, "type", "VM.Standard.E4.Flex")
shape_config { shape_config {
@@ -35,7 +35,7 @@ resource "oci_core_instance" "contolplane" {
name = "contolplane-${count.index + 1}" name = "contolplane-${count.index + 1}"
lbv4 = local.lbv4 lbv4 = local.lbv4
lbv4_local = local.lbv4_local lbv4_local = local.lbv4_local
nodeSubnets = local.network_public[local.zones[count.index]].cidr_block nodeSubnets = local.network_public[element(local.zones, count.index)].cidr_block
labels = local.contolplane_labels labels = local.contolplane_labels
ccm = base64encode("useInstancePrincipals: true\nloadBalancer:\n disabled: true") ccm = base64encode("useInstancePrincipals: true\nloadBalancer:\n disabled: true")
}) })
@@ -49,8 +49,8 @@ resource "oci_core_instance" "contolplane" {
} }
create_vnic_details { create_vnic_details {
assign_public_ip = true assign_public_ip = true
subnet_id = local.network_public[local.zones[count.index]].id subnet_id = local.network_public[element(local.zones, count.index)].id
private_ip = cidrhost(local.network_public[local.zones[count.index]].cidr_block, 11 + floor(count.index / local.zone_count)) private_ip = cidrhost(local.network_public[element(local.zones, count.index)].cidr_block, 11 + floor(count.index / local.zone_count))
nsg_ids = [local.nsg_talos, local.nsg_cilium, local.nsg_contolplane] nsg_ids = [local.nsg_talos, local.nsg_cilium, local.nsg_contolplane]
} }