kubespray 2.24 추가

contrib/terraform/openstack/modules/ips/main.tf

@@ -0,0 +1,46 @@
+resource "null_resource" "dummy_dependency" {
+  triggers = {
+    dependency_id = var.router_id
+  }
+  depends_on = [
+    var.router_internal_port_id
+  ]
+}
+
+# If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones.
+resource "openstack_networking_floatingip_v2" "k8s_master" {
+  count      = length(var.k8s_master_fips) > 0 ? 0 : var.number_of_k8s_masters
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}
+
+resource "openstack_networking_floatingip_v2" "k8s_masters" {
+  for_each   = var.number_of_k8s_masters == 0 && var.number_of_k8s_masters_no_etcd == 0 ? { for key, value in var.k8s_masters : key => value if value.floating_ip } : {}
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}
+
+# If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones.
+resource "openstack_networking_floatingip_v2" "k8s_master_no_etcd" {
+  count      = length(var.k8s_master_fips) > 0 ? 0 : var.number_of_k8s_masters_no_etcd
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}
+
+resource "openstack_networking_floatingip_v2" "k8s_node" {
+  count      = var.number_of_k8s_nodes
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}
+
+resource "openstack_networking_floatingip_v2" "bastion" {
+  count      = length(var.bastion_fips) > 0 ? 0 : var.number_of_bastions
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}
+
+resource "openstack_networking_floatingip_v2" "k8s_nodes" {
+  for_each   = var.number_of_k8s_nodes == 0 ? { for key, value in var.k8s_nodes : key => value if value.floating_ip } : {}
+  pool       = var.floatingip_pool
+  depends_on = [null_resource.dummy_dependency]
+}

contrib/terraform/openstack/modules/ips/outputs.tf

@@ -0,0 +1,25 @@
+# If k8s_master_fips is already defined as input, keep the same value since new FIPs have not been created.
+output "k8s_master_fips" {
+  value = length(var.k8s_master_fips) > 0 ? var.k8s_master_fips : openstack_networking_floatingip_v2.k8s_master[*].address
+}
+
+output "k8s_masters_fips" {
+  value = openstack_networking_floatingip_v2.k8s_masters
+}
+
+# If k8s_master_fips is already defined as input, keep the same value since new FIPs have not been created.
+output "k8s_master_no_etcd_fips" {
+  value = length(var.k8s_master_fips) > 0 ? var.k8s_master_fips : openstack_networking_floatingip_v2.k8s_master_no_etcd[*].address
+}
+
+output "k8s_node_fips" {
+  value = openstack_networking_floatingip_v2.k8s_node[*].address
+}
+
+output "k8s_nodes_fips" {
+  value = openstack_networking_floatingip_v2.k8s_nodes
+}
+
+output "bastion_fips" {
+  value = length(var.bastion_fips) > 0 ? var.bastion_fips : openstack_networking_floatingip_v2.bastion[*].address
+}

contrib/terraform/openstack/modules/ips/variables.tf

@@ -0,0 +1,27 @@
+variable "number_of_k8s_masters" {}
+
+variable "number_of_k8s_masters_no_etcd" {}
+
+variable "number_of_k8s_nodes" {}
+
+variable "floatingip_pool" {}
+
+variable "number_of_bastions" {}
+
+variable "external_net" {}
+
+variable "network_name" {}
+
+variable "router_id" {
+  default = ""
+}
+
+variable "k8s_masters" {}
+
+variable "k8s_nodes" {}
+
+variable "k8s_master_fips" {}
+
+variable "bastion_fips" {}
+
+variable "router_internal_port_id" {}

contrib/terraform/openstack/modules/ips/versions.tf

@@ -0,0 +1,11 @@
+terraform {
+  required_providers {
+    null = {
+      source = "hashicorp/null"
+    }
+    openstack = {
+      source = "terraform-provider-openstack/openstack"
+    }
+  }
+  required_version = ">= 0.12.26"
+}