Skip to content

controller-manager/scheduler: switch to secure ports #1576

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 18, 2019
Merged

controller-manager/scheduler: switch to secure ports #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions data/data/aws/vpc/sg-master.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ resource "aws_security_group_rule" "master_ingress_kube_scheduler" {
security_group_id = "${aws_security_group.master.id}"

protocol = "tcp"
from_port = 10251
to_port = 10251
from_port = 10259
to_port = 10259
self = true
}

Expand All @@ -132,17 +132,17 @@ resource "aws_security_group_rule" "master_ingress_kube_scheduler_from_worker" {
source_security_group_id = "${aws_security_group.worker.id}"

protocol = "tcp"
from_port = 10251
to_port = 10251
from_port = 10259
to_port = 10259
}

resource "aws_security_group_rule" "master_ingress_kube_controller_manager" {
type = "ingress"
security_group_id = "${aws_security_group.master.id}"

protocol = "tcp"
from_port = 10252
to_port = 10252
from_port = 10257
to_port = 10257
self = true
}

Expand All @@ -152,8 +152,8 @@ resource "aws_security_group_rule" "master_ingress_kube_controller_manager_from_
source_security_group_id = "${aws_security_group.worker.id}"

protocol = "tcp"
from_port = 10252
to_port = 10252
from_port = 10257
to_port = 10257
}

resource "aws_security_group_rule" "master_ingress_kubelet_secure" {
Expand Down
16 changes: 8 additions & 8 deletions data/data/openstack/topology/sg-master.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,17 +152,17 @@ resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_scheduler"
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 10251
port_range_max = 10251
port_range_min = 10259
port_range_max = 10259
security_group_id = "${openstack_networking_secgroup_v2.master.id}"
}

resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_scheduler_from_worker" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 10251
port_range_max = 10251
port_range_min = 10259
port_range_max = 10259
remote_group_id = "${openstack_networking_secgroup_v2.worker.id}"
security_group_id = "${openstack_networking_secgroup_v2.master.id}"
}
Expand All @@ -171,17 +171,17 @@ resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_controller
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 10252
port_range_max = 10252
port_range_min = 10257
port_range_max = 10257
security_group_id = "${openstack_networking_secgroup_v2.master.id}"
}

resource "openstack_networking_secgroup_rule_v2" "master_ingress_kube_controller_manager_from_worker" {
direction = "ingress"
ethertype = "IPv4"
protocol = "tcp"
port_range_min = 10252
port_range_max = 10252
port_range_min = 10257
port_range_max = 10257
remote_group_id = "${openstack_networking_secgroup_v2.worker.id}"
security_group_id = "${openstack_networking_secgroup_v2.master.id}"
}
Expand Down
4 changes: 2 additions & 2 deletions upi/aws/cloudformation/03_cluster_security.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Resources:
SourceSecurityGroupId: !GetAtt MasterSecurityGroup.GroupId
Description: Kubernetes kubelet, scheduler and controller manager
FromPort: 10250
ToPort: 10252
ToPort: 10259
IpProtocol: tcp

MasterIngressWorkerKube:
Expand All @@ -151,7 +151,7 @@ Resources:
SourceSecurityGroupId: !GetAtt WorkerSecurityGroup.GroupId
Description: Kubernetes kubelet, scheduler and controller manager
FromPort: 10250
ToPort: 10252
ToPort: 10259
IpProtocol: tcp

MasterIngressIngressServices:
Expand Down