Skip to content

Commit 29e6e0e

Browse files
authored
Merge pull request #564 from jichenjc/update_doc_ssh
update doc about ssh security group
2 parents 14acfa2 + e14c93b commit 29e6e0e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

api/v1alpha3/openstackcluster_types.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ type OpenStackClusterSpec struct {
8484
APIServerLoadBalancerAdditionalPorts []int `json:"apiServerLoadBalancerAdditionalPorts,omitempty"`
8585

8686
// ManagedSecurityGroups defines that kubernetes manages the OpenStack security groups
87-
// for now, that means that we'll create two security groups, one allowing SSH
88-
// and API access from everywhere, and another one that allows all traffic to/from
89-
// machines belonging to that group. In the future, we could make this more flexible.
87+
// for now, that means that we'll create security group allows traffic to/from
88+
// machines belonging to that group based on Calico CNI plugin default network
89+
// requirements: BGP and IP-in-IP for master node(s) and worker node(s) respectively.
90+
// In the future, we could make this more flexible.
9091
// +optional
9192
ManagedSecurityGroups bool `json:"managedSecurityGroups"`
9293

config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,12 @@ spec:
238238
properties are mandatory: APIServerLoadBalancerFloatingIP, APIServerLoadBalancerPort'
239239
type: boolean
240240
managedSecurityGroups:
241-
description: ManagedSecurityGroups defines that kubernetes manages
242-
the OpenStack security groups for now, that means that we'll create
243-
two security groups, one allowing SSH and API access from everywhere,
244-
and another one that allows all traffic to/from machines belonging
245-
to that group. In the future, we could make this more flexible.
241+
description: 'ManagedSecurityGroups defines that kubernetes manages
242+
the OpenStack security groups for now, that means that we''ll create
243+
security group allows traffic to/from machines belonging to that
244+
group based on Calico CNI plugin default network requirements: BGP
245+
and IP-in-IP for master node(s) and worker node(s) respectively.
246+
In the future, we could make this more flexible.'
246247
type: boolean
247248
network:
248249
description: If NodeCIDR cannot be set this can be used to detect

0 commit comments

Comments
 (0)