Skip to content

✨ Add Tags to API-Loadbalancer resources #1457

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 1 commit into from
Feb 3, 2023
Merged

✨ Add Tags to API-Loadbalancer resources #1457

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
2 changes: 2 additions & 0 deletions api/v1alpha3/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ func TestFuzzyConversion(t *testing.T) {
if v1alpha6Cluster.Status.Network != nil {
if v1alpha6Cluster.Status.Network.APIServerLoadBalancer != nil {
v1alpha6Cluster.Status.Network.APIServerLoadBalancer.AllowedCIDRs = nil
v1alpha6Cluster.Status.Network.APIServerLoadBalancer.Tags = []string{}
}
if v1alpha6Cluster.Status.Network.Router != nil {
v1alpha6Cluster.Status.Network.Router.IPs = []string{}
Expand All @@ -257,6 +258,7 @@ func TestFuzzyConversion(t *testing.T) {
if v1alpha6Cluster.Status.ExternalNetwork != nil {
if v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer != nil {
v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer.AllowedCIDRs = nil
v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer.Tags = []string{}
}
if v1alpha6Cluster.Status.ExternalNetwork.Router != nil {
v1alpha6Cluster.Status.ExternalNetwork.Router.IPs = []string{}
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/v1alpha4/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ func TestFuzzyConversion(t *testing.T) {
if v1alpha6Cluster.Status.Network != nil {
if v1alpha6Cluster.Status.Network.APIServerLoadBalancer != nil {
v1alpha6Cluster.Status.Network.APIServerLoadBalancer.AllowedCIDRs = nil
v1alpha6Cluster.Status.Network.APIServerLoadBalancer.Tags = []string{}
}
if v1alpha6Cluster.Status.Network.Router != nil {
v1alpha6Cluster.Status.Network.Router.IPs = []string{}
Expand All @@ -355,6 +356,7 @@ func TestFuzzyConversion(t *testing.T) {
if v1alpha6Cluster.Status.ExternalNetwork != nil {
if v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer != nil {
v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer.AllowedCIDRs = nil
v1alpha6Cluster.Status.ExternalNetwork.APIServerLoadBalancer.Tags = []string{}
}
if v1alpha6Cluster.Status.ExternalNetwork.Router != nil {
v1alpha6Cluster.Status.ExternalNetwork.Router.IPs = []string{}
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha4/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions api/v1alpha5/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,27 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *
// Our new flag has no equivalent in v1alpha5
return autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in, out, s)
}

func Convert_v1alpha6_LoadBalancer_To_v1alpha5_LoadBalancer(in *infrav1.LoadBalancer, out *LoadBalancer, s conversion.Scope) error {
return autoConvert_v1alpha6_LoadBalancer_To_v1alpha5_LoadBalancer(in, out, s)
}

func Convert_Slice_v1alpha5_Network_To_Slice_v1alpha6_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
*out = make([]infrav1.Network, len(*in))
for i := range *in {
if err := Convert_v1alpha5_Network_To_v1alpha6_Network(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
return nil
}

func Convert_Slice_v1alpha6_Network_To_Slice_v1alpha5_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
*out = make([]Network, len(*in))
for i := range *in {
if err := Convert_v1alpha6_Network_To_v1alpha5_Network(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
return nil
}
126 changes: 106 additions & 20 deletions api/v1alpha5/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/v1alpha6/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ type LoadBalancer struct {
InternalIP string `json:"internalIP"`
//+optional
AllowedCIDRs []string `json:"allowedCIDRs,omitempty"`
//+optional
Tags []string `json:"tags,omitempty"`
}

// SecurityGroup represents the basic information of the associated
Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha6/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4959,6 +4959,10 @@ spec:
type: string
name:
type: string
tags:
items:
type: string
type: array
required:
- id
- internalIP
Expand Down Expand Up @@ -5352,6 +5356,10 @@ spec:
type: string
name:
type: string
tags:
items:
type: string
type: array
required:
- id
- internalIP
Expand Down Expand Up @@ -5656,6 +5664,10 @@ spec:
type: string
name:
type: string
tags:
items:
type: string
type: array
required:
- id
- internalIP
Expand Down
5 changes: 5 additions & 0 deletions pkg/cloud/services/loadbalancer/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
InternalIP: lb.VipAddress,
IP: lbFloatingIP,
AllowedCIDRs: allowedCIDRs,
Tags: lb.Tags,
}
return nil
}
Expand All @@ -172,6 +173,7 @@ func (s *Service) getOrCreateLoadBalancer(openStackCluster *infrav1.OpenStackClu
VipAddress: vipAddress,
Description: names.GetDescription(clusterName),
Provider: provider,
Tags: openStackCluster.Spec.Tags,
}
lb, err = s.loadbalancerClient.CreateLoadBalancer(lbCreateOpts)
if err != nil {
Expand Down Expand Up @@ -200,6 +202,7 @@ func (s *Service) getOrCreateListener(openStackCluster *infrav1.OpenStackCluster
Protocol: "TCP",
ProtocolPort: port,
LoadbalancerID: lbID,
Tags: openStackCluster.Spec.Tags,
}
listener, err = s.loadbalancerClient.CreateListener(listenerCreateOpts)
if err != nil {
Expand Down Expand Up @@ -314,6 +317,7 @@ func (s *Service) getOrCreatePool(openStackCluster *infrav1.OpenStackCluster, po
Protocol: "TCP",
LBMethod: pools.LBMethodRoundRobin,
ListenerID: listenerID,
Tags: openStackCluster.Spec.Tags,
}
pool, err = s.loadbalancerClient.CreatePool(poolCreateOpts)
if err != nil {
Expand Down Expand Up @@ -430,6 +434,7 @@ func (s *Service) ReconcileLoadBalancerMember(openStackCluster *infrav1.OpenStac
Name: name,
ProtocolPort: port,
Address: ip,
Tags: openStackCluster.Spec.Tags,
}

if err := s.waitForLoadBalancerActive(lbID); err != nil {
Expand Down