Skip to content

✨ pkg/cloud/services/networking/securitygroups.go reimplement reconcilation #773

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
k8s-ci-robot merged 4 commits into from
Mar 16, 2021
+70 −66
Merged

✨ pkg/cloud/services/networking/securitygroups.go reimplement reconcilation #773

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
944a7df
pkg/cloud/services/networking/securitygroups.go reimplement reconcila…
chrischdi Mar 8, 2021
88c8e7e
pkg/cloud/services/networking/securitygroups.go lower log level for s…
chrischdi Mar 8, 2021
efd9a20
pkg/cloud/services/networking/securitygroups.go remove RemoteIPPrefix…
chrischdi Mar 8, 2021
98ecc10
pkg/cloud/services/networking/securitygroups.go switch order, first d…
chrischdi Mar 9, 2021
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
136 changes: 70 additions & 66 deletions pkg/cloud/services/networking/securitygroups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,6 @@ func (s *Service) ReconcileSecurityGroups(clusterName string, openStackCluster *
}

if observedSecGroups[k].ID != "" {
if matchGroups(desiredSecGroup, *observedSecGroups[k]) {
s.logger.V(6).Info("Group rules matched, have nothing to do.", "name", desiredSecGroup.Name)
continue
}

s.logger.V(6).Info("Group rules didn't match, reconciling...", "name", desiredSecGroup.Name)
observedSecGroup, err := s.reconcileGroupRules(desiredSecGroup, *observedSecGroups[k])
if err != nil {
return err
Expand Down Expand Up @@ -149,13 +143,12 @@ func (s *Service) generateDesiredSecGroups(secGroupNames map[string]string, open
controlPlaneRules := append(
[]infrav1.SecurityGroupRule{
{
Description: "Kubernetes API",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 6443,
PortRangeMax: 6443,
Protocol: "tcp",
RemoteIPPrefix: "0.0.0.0/0",
Description: "Kubernetes API",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 6443,
PortRangeMax: 6443,
Protocol: "tcp",
},
{
Description: "Etcd",
Expand Down Expand Up @@ -225,13 +218,12 @@ func (s *Service) generateDesiredSecGroups(secGroupNames map[string]string, open
workerRules := append(
[]infrav1.SecurityGroupRule{
{
Description: "Node Port Services",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 30000,
PortRangeMax: 32767,
Protocol: "tcp",
RemoteIPPrefix: "0.0.0.0/0",
Description: "Node Port Services",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 30000,
PortRangeMax: 32767,
Protocol: "tcp",
},
{
// This is needed to support metrics-server deployments
Expand Down Expand Up @@ -320,13 +312,12 @@ func (s *Service) generateDesiredSecGroups(secGroupNames map[string]string, open
Rules: append(
[]infrav1.SecurityGroupRule{
{
Description: "SSH",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 22,
PortRangeMax: 22,
Protocol: "tcp",
RemoteIPPrefix: "0.0.0.0/0",
Description: "SSH",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 22,
PortRangeMax: 22,
Protocol: "tcp",
},
},
defaultRules...,
Expand All @@ -338,13 +329,12 @@ func (s *Service) generateDesiredSecGroups(secGroupNames map[string]string, open
neutronLbaasRules := append(
[]infrav1.SecurityGroupRule{
{
Description: "Kubernetes API",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 6443,
PortRangeMax: 6443,
Protocol: "tcp",
RemoteIPPrefix: "0.0.0.0/0",
Description: "Kubernetes API",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: 6443,
PortRangeMax: 6443,
Protocol: "tcp",
},
},
defaultRules...,
Expand All @@ -354,13 +344,12 @@ func (s *Service) generateDesiredSecGroups(secGroupNames map[string]string, open
neutronLbaasRules = append(neutronLbaasRules,
[]infrav1.SecurityGroupRule{
{
Description: "APIServerLoadBalancerAdditionalPorts",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: value,
PortRangeMax: value,
Protocol: "tcp",
RemoteIPPrefix: "0.0.0.0/0",
Description: "APIServerLoadBalancerAdditionalPorts",
Direction: "ingress",
EtherType: "IPv4",
PortRangeMin: value,
PortRangeMax: value,
Protocol: "tcp",
},
}...,
)
Expand Down Expand Up @@ -414,48 +403,62 @@ func (s *Service) exists(groupID string) (bool, error) {
return true, nil
}

// matchGroups will check if security groups match.
func matchGroups(desired, observed infrav1.SecurityGroup) bool {
// If they have differing amount of rules they obviously don't match.
if len(desired.Rules) != len(observed.Rules) {
return false
// reconcileGroupRules reconciles an already existing observed group by deleting rules not needed anymore and
// creating rules that are missing.
func (s *Service) reconcileGroupRules(desired, observed infrav1.SecurityGroup) (infrav1.SecurityGroup, error) {
rulesToDelete := []infrav1.SecurityGroupRule{}
// fills rulesToDelete by calculating observed - desired
for _, observedRule := range observed.Rules {
delete := true
for _, desiredRule := range desired.Rules {
r := desiredRule
if r.RemoteGroupID == remoteGroupIDSelf {
r.RemoteGroupID = observed.ID
}
if r.Equal(observedRule) {
delete = false
break
}
}
if delete {
rulesToDelete = append(rulesToDelete, observedRule)
}
}

// Rules aren't in any order, so we're doing this the hard way.
rulesToCreate := []infrav1.SecurityGroupRule{}
reconciledRules := make([]infrav1.SecurityGroupRule, 0, len(desired.Rules))
// fills rulesToCreate by calculating desired - observed
// also adds rules which are in observed and desired to reconciledRules.
for _, desiredRule := range desired.Rules {
r := desiredRule
if r.RemoteGroupID == remoteGroupIDSelf {
r.RemoteGroupID = observed.ID
}
ruleMatched := false
create := true
for _, observedRule := range observed.Rules {
if observedRule.Equal(r) {
ruleMatched = true
if r.Equal(observedRule) {
// add already existing rules to reconciledRules because we won't touch them anymore
reconciledRules = append(reconciledRules, observedRule)
create = false
break
}
}

if !ruleMatched {
return false
if create {
rulesToCreate = append(rulesToCreate, desiredRule)
}
}
return true
}

// reconcileGroupRules reconciles an already existing observed group by essentially emptying out all the rules and
// recreating them.
func (s *Service) reconcileGroupRules(desired, observed infrav1.SecurityGroup) (infrav1.SecurityGroup, error) {
s.logger.V(6).Info("Deleting all rules for group", "name", observed.Name)
for _, rule := range observed.Rules {
s.logger.V(4).Info("Deleting rules not needed anymore for group", "name", observed.Name, "amount", len(rulesToDelete))
for _, rule := range rulesToDelete {
s.logger.V(6).Info("Deleting rule", "ruleID", rule.ID, "groupName", observed.Name)
err := rules.Delete(s.client, rule.ID).ExtractErr()
if err != nil {
return infrav1.SecurityGroup{}, err
}
}
recreatedRules := make([]infrav1.SecurityGroupRule, 0, len(desired.Rules))
s.logger.V(6).Info("Recreating all rules for group", "name", observed.Name)
for _, rule := range desired.Rules {

s.logger.V(4).Info("Creating new rules needed for group", "name", observed.Name, "amount", len(rulesToCreate))
for _, rule := range rulesToCreate {
r := rule
r.SecurityGroupID = observed.ID
if r.RemoteGroupID == remoteGroupIDSelf {
Expand All @@ -465,9 +468,10 @@ func (s *Service) reconcileGroupRules(desired, observed infrav1.SecurityGroup) (
if err != nil {
return infrav1.SecurityGroup{}, err
}
recreatedRules = append(recreatedRules, newRule)
reconciledRules = append(reconciledRules, newRule)
}
observed.Rules = recreatedRules
observed.Rules = reconciledRules

return observed, nil
}

Expand Down Expand Up @@ -541,7 +545,7 @@ func (s *Service) createRule(r infrav1.SecurityGroupRule) (infrav1.SecurityGroup
RemoteIPPrefix: r.RemoteIPPrefix,
SecGroupID: r.SecurityGroupID,
}
s.logger.V(6).Info("Creating rule")
s.logger.V(6).Info("Creating rule", "Description", r.Description, "Direction", dir, "PortRangeMin", r.PortRangeMin, "PortRangeMax", r.PortRangeMax, "Proto", proto, "etherType", etherType, "RemoteGroupID", r.RemoteGroupID, "RemoteIPPrefix", r.RemoteIPPrefix, "SecurityGroupID", r.SecurityGroupID)
rule, err := rules.Create(s.client, createOpts).Extract()
if err != nil {
return infrav1.SecurityGroupRule{}, err
Expand Down