Skip to content

[occm] Tag security groups with service identifier #3096

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

Draft
dlaw4608 wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −0
Draft

[occm] Tag security groups with service identifier #3096

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
34 changes: 34 additions & 0 deletions pkg/openstack/loadbalancer_sg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,30 @@ func getRulesToCreateAndDelete(wantedRules []rules.CreateOpts, existingRules []r
return toCreate, toDelete
}

// ensureSecurityGroupTags ensures the security group has the proper tags for identification
func (lbaas *LbaasV2) ensureSecurityGroupTags(ctx context.Context, sgID string, svcConf *serviceConfig) error {
// Tag with the same lbName as load balancers and listeners for consistency
// This allows querying all resources (LB, listeners, SG) for a given service
tag := svcConf.lbName

mc := metrics.NewMetricContext("security_group", "get")
sg, err := groups.Get(ctx, lbaas.network, sgID).Extract()
if mc.ObserveRequest(err) != nil {
return fmt.Errorf("failed to get security group %s: %v", sgID, err)
}

if !slices.Contains(sg.Tags, tag) {
mc := metrics.NewMetricContext("security_group_tag", "add")
err := neutrontags.Add(ctx, lbaas.network, "security-groups", sgID, tag).ExtractErr()
if mc.ObserveRequest(err) != nil {
return fmt.Errorf("failed to add tag %s to security group %s: %v", tag, sgID, err)
}
klog.V(4).InfoS("Tagged security group", "sgID", sgID, "tag", tag)
}

return nil
}

// ensureAndUpdateOctaviaSecurityGroup handles the creation and update of the security group and the securiry rules for the octavia load balancer
func (lbaas *LbaasV2) ensureAndUpdateOctaviaSecurityGroup(ctx context.Context, clusterName string, apiService *corev1.Service, nodes []*corev1.Node, svcConf *serviceConfig) error {
// get service ports
Expand Down Expand Up @@ -235,6 +259,16 @@ func (lbaas *LbaasV2) ensureAndUpdateOctaviaSecurityGroup(ctx context.Context, c
return fmt.Errorf("failed to create Security Group for loadbalancer service %s/%s: %v", apiService.Namespace, apiService.Name, err)
}
lbSecGroupID = lbSecGroup.ID

// Tag the newly created security group
if err := lbaas.ensureSecurityGroupTags(ctx, lbSecGroupID, svcConf); err != nil {
klog.Warningf("Failed to tag security group %s for service %s/%s: %v", lbSecGroupID, apiService.Namespace, apiService.Name, err)
}
} else {
// Ensure existing security groups have tags for backward compatibility
if err := lbaas.ensureSecurityGroupTags(ctx, lbSecGroupID, svcConf); err != nil {
klog.Warningf("Failed to tag security group %s for service %s/%s: %v", lbSecGroupID, apiService.Namespace, apiService.Name, err)
}
}

mc := metrics.NewMetricContext("subnet", "get")
Expand Down