diff --git a/data/data/openstack/bootstrap/main.tf b/data/data/openstack/bootstrap/main.tf index 2778f7562ee..99f60447eaf 100644 --- a/data/data/openstack/bootstrap/main.tf +++ b/data/data/openstack/bootstrap/main.tf @@ -18,10 +18,6 @@ resource "openstack_networking_port_v2" "bootstrap_port" { allowed_address_pairs { ip_address = var.api_int_ip } - - allowed_address_pairs { - ip_address = var.node_dns_ip - } } data "openstack_compute_flavor_v2" "bootstrap_flavor" { diff --git a/data/data/openstack/bootstrap/variables.tf b/data/data/openstack/bootstrap/variables.tf index 709262af361..46d0e342f11 100644 --- a/data/data/openstack/bootstrap/variables.tf +++ b/data/data/openstack/bootstrap/variables.tf @@ -39,10 +39,6 @@ variable "api_int_ip" { type = string } -variable "node_dns_ip" { - type = string -} - variable "external_network" { type = string } diff --git a/data/data/openstack/main.tf b/data/data/openstack/main.tf index 7dac58f6679..9a104407f03 100644 --- a/data/data/openstack/main.tf +++ b/data/data/openstack/main.tf @@ -31,7 +31,6 @@ module "bootstrap" { flavor_name = var.openstack_master_flavor_name ignition = var.ignition_bootstrap api_int_ip = var.openstack_api_int_ip - node_dns_ip = var.openstack_node_dns_ip external_network = var.openstack_external_network cluster_domain = var.cluster_domain nodes_subnet_id = module.topology.nodes_subnet_id @@ -68,7 +67,6 @@ module "topology" { masters_count = var.master_count lb_floating_ip = var.openstack_lb_floating_ip api_int_ip = var.openstack_api_int_ip - node_dns_ip = var.openstack_node_dns_ip ingress_ip = var.openstack_ingress_ip external_dns = var.openstack_external_dns trunk_support = var.openstack_trunk_support diff --git a/data/data/openstack/topology/private-network.tf b/data/data/openstack/topology/private-network.tf index a726a3e1fb8..4f368c962b3 100644 --- a/data/data/openstack/topology/private-network.tf +++ b/data/data/openstack/topology/private-network.tf @@ -55,10 +55,6 @@ resource "openstack_networking_port_v2" "masters" { ip_address = var.api_int_ip } - allowed_address_pairs { - ip_address = var.node_dns_ip - } - allowed_address_pairs { ip_address = var.ingress_ip } diff --git a/data/data/openstack/topology/variables.tf b/data/data/openstack/topology/variables.tf index 927fcc03234..ec61ff48c28 100644 --- a/data/data/openstack/topology/variables.tf +++ b/data/data/openstack/topology/variables.tf @@ -37,10 +37,6 @@ variable "api_int_ip" { type = string } -variable "node_dns_ip" { - type = string -} - variable "ingress_ip" { type = string } diff --git a/data/data/openstack/variables-openstack.tf b/data/data/openstack/variables-openstack.tf index 523f07cc8a8..7f251ebbc4e 100644 --- a/data/data/openstack/variables-openstack.tf +++ b/data/data/openstack/variables-openstack.tf @@ -291,11 +291,6 @@ variable "openstack_api_int_ip" { description = "IP on the node subnet reserved for api-int VIP." } -variable "openstack_node_dns_ip" { - type = string - description = "IP on the nodes subnet reserved for node dns VIP." -} - variable "openstack_ingress_ip" { type = string description = "IP on the nodes subnet reserved for the ingress VIP." diff --git a/pkg/asset/cluster/tfvars.go b/pkg/asset/cluster/tfvars.go index c68961165a0..1f0bcd321a3 100644 --- a/pkg/asset/cluster/tfvars.go +++ b/pkg/asset/cluster/tfvars.go @@ -360,10 +360,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error { if err != nil { return err } - dnsVIP, err := openstackdefaults.DNSVIP(installConfig.Config.Networking) - if err != nil { - return err - } ingressVIP, err := openstackdefaults.IngressVIP(installConfig.Config.Networking) if err != nil { return err @@ -375,7 +371,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error { installConfig.Config.Platform.OpenStack.ExternalDNS, installConfig.Config.Platform.OpenStack.LbFloatingIP, apiVIP.String(), - dnsVIP.String(), ingressVIP.String(), installConfig.Config.Platform.OpenStack.TrunkSupport, installConfig.Config.Platform.OpenStack.OctaviaSupport, diff --git a/pkg/asset/manifests/infrastructure.go b/pkg/asset/manifests/infrastructure.go index 887cc5ffdb2..f67fa0bf0d1 100644 --- a/pkg/asset/manifests/infrastructure.go +++ b/pkg/asset/manifests/infrastructure.go @@ -128,17 +128,12 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error { if err != nil { return err } - dnsVIP, err := openstackdefaults.DNSVIP(installConfig.Config.Networking) - if err != nil { - return err - } ingressVIP, err := openstackdefaults.IngressVIP(installConfig.Config.Networking) if err != nil { return err } config.Status.PlatformStatus.OpenStack = &configv1.OpenStackPlatformStatus{ APIServerInternalIP: apiVIP.String(), - NodeDNSIP: dnsVIP.String(), IngressIP: ingressVIP.String(), } case vsphere.Name: diff --git a/pkg/tfvars/openstack/openstack.go b/pkg/tfvars/openstack/openstack.go index bd8670ecc84..a08a72db10c 100644 --- a/pkg/tfvars/openstack/openstack.go +++ b/pkg/tfvars/openstack/openstack.go @@ -24,7 +24,6 @@ type config struct { FlavorName string `json:"openstack_master_flavor_name,omitempty"` LbFloatingIP string `json:"openstack_lb_floating_ip,omitempty"` APIVIP string `json:"openstack_api_int_ip,omitempty"` - DNSVIP string `json:"openstack_node_dns_ip,omitempty"` IngressVIP string `json:"openstack_ingress_ip,omitempty"` TrunkSupport string `json:"openstack_trunk_support,omitempty"` OctaviaSupport string `json:"openstack_octavia_support,omitempty"` @@ -35,7 +34,7 @@ type config struct { } // TFVars generates OpenStack-specific Terraform variables. -func TFVars(masterConfig *v1alpha1.OpenstackProviderSpec, cloud string, externalNetwork string, externalDNS []string, lbFloatingIP string, apiVIP string, dnsVIP string, ingressVIP string, trunkSupport string, octaviaSupport string, baseImage string, infraID string, userCA string, bootstrapIgn string) ([]byte, error) { +func TFVars(masterConfig *v1alpha1.OpenstackProviderSpec, cloud string, externalNetwork string, externalDNS []string, lbFloatingIP string, apiVIP string, ingressVIP string, trunkSupport string, octaviaSupport string, baseImage string, infraID string, userCA string, bootstrapIgn string) ([]byte, error) { cfg := &config{ ExternalNetwork: externalNetwork, @@ -43,7 +42,6 @@ func TFVars(masterConfig *v1alpha1.OpenstackProviderSpec, cloud string, external FlavorName: masterConfig.Flavor, LbFloatingIP: lbFloatingIP, APIVIP: apiVIP, - DNSVIP: dnsVIP, IngressVIP: ingressVIP, ExternalDNS: externalDNS, TrunkSupport: trunkSupport, diff --git a/pkg/types/openstack/defaults/platform.go b/pkg/types/openstack/defaults/platform.go index 9852933060e..7a325c77496 100644 --- a/pkg/types/openstack/defaults/platform.go +++ b/pkg/types/openstack/defaults/platform.go @@ -33,14 +33,6 @@ func APIVIP(networking *types.Networking) (net.IP, error) { return cidr.Host(&networking.MachineNetwork[0].CIDR.IPNet, 5) } -// DNSVIP returns the internal virtual IP address (VIP) put in front -// of the DNS static pods running on the nodes. Unlike the DNS -// operator these services provide name resolution for the nodes -// themselves. -func DNSVIP(networking *types.Networking) (net.IP, error) { - return cidr.Host(&networking.MachineNetwork[0].CIDR.IPNet, 6) -} - // IngressVIP returns the internal virtual IP address (VIP) put in // front of the OpenShift router pods. This provides the internal // accessibility to the internal pods running on the worker nodes,