Skip to content

Commit fdb1041

Browse files
Prajyot-ParabPrajyot-Parab
committed
Bump IBM/vpc-go-sdk to v0.65.0
Signed-off-by: Prajyot Parab <[email protected]>
1 parent f886f36 commit fdb1041

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎api/v1beta2/types.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ type VPCLoadBalancerBackendPoolProtocol string
139139

140140
var (
141141
// VPCLoadBalancerBackendPoolProtocolHTTP is the string representing the http protocol for load balancer backend pools.
142-
VPCLoadBalancerBackendPoolProtocolHTTP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolHTTPConst
142+
VPCLoadBalancerBackendPoolProtocolHTTP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolHTTPConst
143143

144144
// VPCLoadBalancerBackendPoolProtocolHTTPS is the string representing the https protocol for load balancer backend pools.
145-
VPCLoadBalancerBackendPoolProtocolHTTPS VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolHTTPSConst
145+
VPCLoadBalancerBackendPoolProtocolHTTPS VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolHTTPSConst
146146

147147
// VPCLoadBalancerBackendPoolProtocolTCP is the string representing the tcp protocol for load balancer backend pools.
148-
VPCLoadBalancerBackendPoolProtocolTCP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolTCPConst
148+
VPCLoadBalancerBackendPoolProtocolTCP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolTCPConst
149149

150150
// VPCLoadBalancerBackendPoolProtocolUDP is the string representing the tudp protocol for load balancer backend pools.
151-
VPCLoadBalancerBackendPoolProtocolUDP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolUDPConst
151+
VPCLoadBalancerBackendPoolProtocolUDP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolUDPConst
152152
)
153153

154154
// VPCLoadBalancerListenerProtocol describes the protocol for load balancer listeners.

‎cloud/scope/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ func (s *ClusterScope) CreateLoadBalancer() (*vpcv1.LoadBalancer, error) {
485485
return nil, fmt.Errorf("error subnet required for load balancer creation")
486486
}
487487

488-
options.SetPools([]vpcv1.LoadBalancerPoolPrototype{
488+
options.SetPools([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
489489
{
490490
Algorithm: core.StringPtr("round_robin"),
491491
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},

‎cloud/scope/powervs_cluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,7 @@ func (s *PowerVSClusterScope) createLoadBalancer(lb infrav1beta2.VPCLoadBalancer
21732173
}
21742174
options.Subnets = append(options.Subnets, subnet)
21752175
}
2176-
options.SetPools([]vpcv1.LoadBalancerPoolPrototype{
2176+
options.SetPools([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
21772177
{
21782178
Algorithm: core.StringPtr("round_robin"),
21792179
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},
@@ -2194,7 +2194,7 @@ func (s *PowerVSClusterScope) createLoadBalancer(lb infrav1beta2.VPCLoadBalancer
21942194
})
21952195

21962196
for _, additionalListeners := range lb.AdditionalListeners {
2197-
pool := vpcv1.LoadBalancerPoolPrototype{
2197+
pool := vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
21982198
Algorithm: core.StringPtr("round_robin"),
21992199
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},
22002200
// Note: Appending port number to the name, it will be referenced to set target port while adding new pool member

‎cloud/scope/vpc_cluster.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,7 +1944,7 @@ func (s *VPCClusterScope) createLoadBalancer(loadBalancer infrav1beta2.VPCLoadBa
19441944
}
19451945

19461946
// Build the load balancer's backend pools.
1947-
backendPools := make([]vpcv1.LoadBalancerPoolPrototype, 0)
1947+
backendPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0)
19481948
// If BackendPools is populated, use those. Otherwise, use default.
19491949
// TODO(cjschaef): Determine if a default Pool should be auto generated, or allow "empty" pools for LB's.
19501950
if loadBalancer.BackendPools != nil {
@@ -2082,7 +2082,7 @@ func (s *VPCClusterScope) getLoadBalancerSecurityGroupIDs(loadBalancer infrav1be
20822082
}
20832083

20842084
// buildLoadBalancerBackendPool will build a Load Balancer Pool based on the provided spec.
2085-
func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoadBalancerBackendPoolSpec) vpcv1.LoadBalancerPoolPrototype {
2085+
func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoadBalancerBackendPoolSpec) vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext {
20862086
monitor := &vpcv1.LoadBalancerPoolHealthMonitorPrototype{
20872087
Delay: ptr.To(pool.HealthMonitor.Delay),
20882088
MaxRetries: ptr.To(pool.HealthMonitor.Retries),
@@ -2095,7 +2095,7 @@ func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoad
20952095
if pool.HealthMonitor.URLPath != nil {
20962096
monitor.URLPath = pool.HealthMonitor.URLPath
20972097
}
2098-
backendPool := vpcv1.LoadBalancerPoolPrototype{
2098+
backendPool := vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
20992099
Algorithm: ptr.To(string(pool.Algorithm)),
21002100
HealthMonitor: monitor,
21012101
Protocol: ptr.To(string(pool.Protocol)),
@@ -2109,8 +2109,8 @@ func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoad
21092109
}
21102110

21112111
// getDefaultBalancerBackendPools returns a list of default Load Balancer Backend Pools for a Load Balancer.
2112-
func (s *VPCClusterScope) getDefaultLoadBalancerBackendPools() []vpcv1.LoadBalancerPoolPrototype {
2113-
defaultPools := make([]vpcv1.LoadBalancerPoolPrototype, 0)
2112+
func (s *VPCClusterScope) getDefaultLoadBalancerBackendPools() []vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext {
2113+
defaultPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0)
21142114

21152115
// For now, only one default pool is expected.
21162116
defaultPool := infrav1beta2.VPCLoadBalancerBackendPoolSpec{

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/IBM/ibm-cos-sdk-go v1.12.2
1616
github.com/IBM/networking-go-sdk v0.51.2
1717
github.com/IBM/platform-services-go-sdk v0.79.0
18-
github.com/IBM/vpc-go-sdk v0.64.1
18+
github.com/IBM/vpc-go-sdk v0.65.0
1919
github.com/blang/semver/v4 v4.0.0
2020
github.com/coreos/ignition/v2 v2.20.0
2121
github.com/go-logr/logr v1.4.2

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/IBM/networking-go-sdk v0.51.2 h1:aDa33IvvxMMWEB0sf+qNDWr8xE1XYoZYatG5
1414
github.com/IBM/networking-go-sdk v0.51.2/go.mod h1:5aBaPKkm47LHECEOOZ4ltbwypOhapVo5aSCP3MTxmgQ=
1515
github.com/IBM/platform-services-go-sdk v0.79.0 h1:qCNheB3390holPcpDxdgNyi11JS6ZfsL39YgnJEOsTo=
1616
github.com/IBM/platform-services-go-sdk v0.79.0/go.mod h1:FzCPOfbNAt0s9RwtIrbJbfDwA7mKIObtZ/18KnviKr0=
17-
github.com/IBM/vpc-go-sdk v0.64.1 h1:1tIeb+GqPnvw7Ty+M0BknZJIdzIIrHqxWsYjgrM6NQY=
18-
github.com/IBM/vpc-go-sdk v0.64.1/go.mod h1:6rEWo6HGt7S0Nbw7WdJQiVcz9Z+mRDmyycK4xc4kWlw=
17+
github.com/IBM/vpc-go-sdk v0.65.0 h1:wCOm4pPdrsPnnHlpLHrqntLdzEmyjafK5BfZdke/ntI=
18+
github.com/IBM/vpc-go-sdk v0.65.0/go.mod h1:VL7sy61ybg6tvA60SepoQx7TFe20m7JyNUt+se2tHP4=
1919
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
2020
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
2121
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=

0 commit comments

Comments
 (0)