C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make it possible to open additional ports on master nodes (#6547)

Browse source
This commit is contained in:
Hugo Blom 2020-08-27 11:07:13 +02:00 committed by GitHub
parent f59d3fc4a3
commit 2f8fc92182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/terraform/openstack/kubespray.tf
View file

@ -74,6 +74,7 @@ module "compute" {
k8s_allowed_egress_ips = var.k8s_allowed_egress_ips k8s_allowed_egress_ips = var.k8s_allowed_egress_ips
supplementary_master_groups = var.supplementary_master_groups supplementary_master_groups = var.supplementary_master_groups
supplementary_node_groups = var.supplementary_node_groups supplementary_node_groups = var.supplementary_node_groups
master_allowed_ports = var.master_allowed_ports
worker_allowed_ports = var.worker_allowed_ports worker_allowed_ports = var.worker_allowed_ports
wait_for_floatingip = var.wait_for_floatingip wait_for_floatingip = var.wait_for_floatingip
use_access_ip = var.use_access_ip use_access_ip = var.use_access_ip

11
contrib/terraform/openstack/modules/compute/main.tf
View file

@ -28,6 +28,17 @@ resource "openstack_networking_secgroup_rule_v2" "k8s_master" {
security_group_id = openstack_networking_secgroup_v2.k8s_master.id security_group_id = openstack_networking_secgroup_v2.k8s_master.id
} }
resource "openstack_networking_secgroup_rule_v2" "k8s_master_ports" {
count = length(var.master_allowed_ports)
direction = "ingress"
ethertype = "IPv4"
protocol = lookup(var.master_allowed_ports[count.index], "protocol", "tcp")
port_range_min = lookup(var.master_allowed_ports[count.index], "port_range_min")
port_range_max = lookup(var.master_allowed_ports[count.index], "port_range_max")
remote_ip_prefix = lookup(var.master_allowed_ports[count.index], "remote_ip_prefix", "0.0.0.0/0")
security_group_id = openstack_networking_secgroup_v2.k8s_master.id
}
resource "openstack_networking_secgroup_v2" "bastion" { resource "openstack_networking_secgroup_v2" "bastion" {
name = "${var.cluster_name}-bastion" name = "${var.cluster_name}-bastion"
count = var.number_of_bastions != "" ? 1 : 0 count = var.number_of_bastions != "" ? 1 : 0

4
contrib/terraform/openstack/modules/compute/variables.tf
View file

@ -114,6 +114,10 @@ variable "supplementary_node_groups" {
default = "" default = ""
} }
variable "master_allowed_ports" {
type = list
}
variable "worker_allowed_ports" { variable "worker_allowed_ports" {
type = list type = list
} }

6
contrib/terraform/openstack/variables.tf
View file

@ -204,6 +204,12 @@ variable "k8s_allowed_egress_ips" {
default = ["0.0.0.0/0"] default = ["0.0.0.0/0"]
} }
variable "master_allowed_ports" {
type = list
default = []
}
variable "worker_allowed_ports" { variable "worker_allowed_ports" {
type = list type = list