Skip to content

Commit f200864

Browse files
stackit-skeske-renovate-ce[bot]dergeberl
authored
[release-v1.35] Update module github.com/stackitcloud/stackit-sdk-go/services/loadbalancer to v1.14.0 (main) (#1160)
* Update module github.com/stackitcloud/stackit-sdk-go/services/loadbalancer to v1.14.0 * Update Loadbalancer enums --------- Co-authored-by: ske-renovate-ce[bot] <163154779+ske-renovate-ce[bot]@users.noreply.github.com> Co-authored-by: Maximilian Geberl <maximilian.geberl@digits.schwarz>
1 parent 728b3c9 commit f200864

6 files changed

Lines changed: 50 additions & 59 deletions

File tree

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/spf13/pflag v1.0.10
1616
github.com/stackitcloud/stackit-sdk-go/core v0.26.0
1717
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0
18-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.13.0
18+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0
1919
go.uber.org/mock v0.6.0
2020
golang.org/x/sync v0.20.0
2121
golang.org/x/sys v0.45.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ github.com/stackitcloud/stackit-sdk-go/core v0.26.0 h1:jQEb9gkehfp6VCP6TcYk7BI10
190190
github.com/stackitcloud/stackit-sdk-go/core v0.26.0/go.mod h1:WU1hhxnjXw2EV7CYa1nlEvNpMiRY6CvmIOaHuL3pOaA=
191191
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0 h1:H4V3H8qSKOaOalIrf4nAPDHhXnHYGs6SDGuK8Zj41Zo=
192192
github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0/go.mod h1:Ts06id0KejUlQWbpR+/rm+tKng6QkTuFV1VQTPJ4dA4=
193-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.13.0 h1:UuLNwFHjJCpL11y4F7B9oBKtZkxpu01VkNPILNkpex4=
194-
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.13.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
193+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 h1:1dvL7tX91ziklayQmOupniE3jM4D5Nbtc0auNcx2p18=
194+
github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
195195
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.23.0 h1:u2C3oHNcc41Ba5cUqSPuqviDrYSRhpaC5+ELbuHHdwM=
196196
github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.23.0/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs=
197197
github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=

‎pkg/ccm/loadbalancer.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
stackitconfig "github.com/stackitcloud/cloud-provider-stackit/pkg/stackit/config"
1111
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
12-
lbwait "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api/wait"
1312
corev1 "k8s.io/api/core/v1"
1413
"k8s.io/client-go/tools/record"
1514
cloudprovider "k8s.io/cloud-provider"
@@ -159,7 +158,7 @@ func (l *LoadBalancer) EnsureLoadBalancer( //nolint:gocyclo // not really comple
159158
PrivateAddress: spec.PrivateAddress,
160159
Region: spec.Region,
161160
Labels: spec.Labels,
162-
Status: spec.Status,
161+
Status: new(loadbalancer.UpdateLoadBalancerPayloadStatus(spec.GetStatus())),
163162
TargetPools: spec.TargetPools,
164163
Version: spec.Version,
165164
}
@@ -179,10 +178,10 @@ func (l *LoadBalancer) EnsureLoadBalancer( //nolint:gocyclo // not really comple
179178
}
180179
}
181180

182-
if lb.Status != nil && *lb.Status == lbwait.LOADBALANCERSTATUS_ERROR {
181+
if lb.Status != nil && *lb.Status == loadbalancer.LOADBALANCERSTATUS_STATUS_ERROR {
183182
return nil, fmt.Errorf("the load balancer is in an error state")
184183
}
185-
if lb.Status == nil || *lb.Status != lbwait.LOADBALANCERSTATUS_READY {
184+
if lb.Status == nil || *lb.Status != loadbalancer.LOADBALANCERSTATUS_STATUS_READY {
186185
return nil, api.NewRetryError("waiting for load balancer to become ready. This error is normal while the load balancer starts.", retryDuration)
187186
}
188187

@@ -222,7 +221,7 @@ func (l *LoadBalancer) createLoadBalancer(ctx context.Context, clusterName strin
222221
return nil, createErr
223222
}
224223

225-
if lb.Status == nil || *lb.Status != lbwait.LOADBALANCERSTATUS_READY {
224+
if lb.Status == nil || *lb.Status != loadbalancer.LOADBALANCERSTATUS_STATUS_READY {
226225
return nil, api.NewRetryError("waiting for load balancer to become ready. This error is normal while the load balancer starts.", retryDuration)
227226
}
228227

@@ -275,7 +274,7 @@ func (l *LoadBalancer) EnsureLoadBalancerDeleted(
275274
return nil
276275
case err != nil:
277276
return err
278-
case lb.Status != nil && *lb.Status == lbwait.LOADBALANCERSTATUS_TERMINATING:
277+
case lb.Status != nil && *lb.Status == loadbalancer.LOADBALANCERSTATUS_STATUS_TERMINATING:
279278
return nil
280279
}
281280

‎pkg/ccm/loadbalancer_spec.go‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"time"
1010

1111
stackitconfig "github.com/stackitcloud/cloud-provider-stackit/pkg/stackit/config"
12-
//nolint:staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants.
13-
lbLegacy "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
1412
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1513
corev1 "k8s.io/api/core/v1"
1614

@@ -248,7 +246,7 @@ func getPlanID(service *corev1.Service) (planID *string, msgs []string, err erro
248246
// The property name will be empty and must be set by the caller to produce a valid payload for the API.
249247
// An error is returned if the service has invalid options.
250248
//
251-
//nolint:gocyclo,funlen,staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants.
249+
//nolint:gocyclo,funlen // main function to create a lb from a service, this includes many options and is therefore complex.
252250
func lbSpecFromService(
253251
service *corev1.Service,
254252
nodes []*corev1.Node,
@@ -259,7 +257,7 @@ func lbSpecFromService(
259257
Options: &loadbalancer.LoadBalancerOptions{},
260258
Networks: []loadbalancer.Network{
261259
{
262-
Role: new(string(lbLegacy.NETWORKROLE_LISTENERS_AND_TARGETS)),
260+
Role: new(loadbalancer.NETWORKROLE_ROLE_LISTENERS_AND_TARGETS),
263261
NetworkId: &opts.NetworkID,
264262
},
265263
},
@@ -268,17 +266,17 @@ func lbSpecFromService(
268266
if listenerNetwork := service.Annotations[listenerNetworkAnnotation]; listenerNetwork != "" {
269267
lb.Networks = []loadbalancer.Network{
270268
{
271-
Role: new(string(lbLegacy.NETWORKROLE_TARGETS)),
269+
Role: new(loadbalancer.NETWORKROLE_ROLE_TARGETS),
272270
NetworkId: &opts.NetworkID,
273271
}, {
274-
Role: new(string(lbLegacy.NETWORKROLE_LISTENERS)),
272+
Role: new(loadbalancer.NETWORKROLE_ROLE_LISTENERS),
275273
NetworkId: &listenerNetwork,
276274
},
277275
}
278276
} else {
279277
lb.Networks = []loadbalancer.Network{
280278
{
281-
Role: new(string(lbLegacy.NETWORKROLE_LISTENERS_AND_TARGETS)),
279+
Role: new(loadbalancer.NETWORKROLE_ROLE_LISTENERS_AND_TARGETS),
282280
NetworkId: &opts.NetworkID,
283281
},
284282
}
@@ -503,22 +501,22 @@ func lbSpecFromService(
503501
name = fmt.Sprintf("port-%s-%d", strings.ToLower(string(port.Protocol)), port.Port)
504502
}
505503

506-
var protocol lbLegacy.ListenerProtocol
504+
var protocol loadbalancer.ListenerProtocol
507505
var tcpOptions *loadbalancer.OptionsTCP
508506
var udpOptions *loadbalancer.OptionsUDP
509507

510508
switch port.Protocol {
511509
case corev1.ProtocolTCP:
512510
if proxyProtocolEnableForPort(tcpProxyProtocolEnabled, tcpProxyProtocolPortFilter, port.Port) {
513-
protocol = lbLegacy.LISTENERPROTOCOL_TCP_PROXY
511+
protocol = loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY
514512
} else {
515-
protocol = lbLegacy.LISTENERPROTOCOL_TCP
513+
protocol = loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP
516514
}
517515
tcpOptions = &loadbalancer.OptionsTCP{
518516
IdleTimeout: new(fmt.Sprintf("%.0fs", tcpIdleTimeout.Seconds())),
519517
}
520518
case corev1.ProtocolUDP:
521-
protocol = lbLegacy.LISTENERPROTOCOL_UDP
519+
protocol = loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP
522520
udpOptions = &loadbalancer.OptionsUDP{
523521
IdleTimeout: new(fmt.Sprintf("%.0fs", udpIdleTimeout.Seconds())),
524522
}
@@ -530,7 +528,7 @@ func lbSpecFromService(
530528
DisplayName: &name,
531529
Port: new(port.Port),
532530
TargetPool: &name,
533-
Protocol: new(string(protocol)),
531+
Protocol: new(protocol),
534532
Tcp: tcpOptions,
535533
Udp: udpOptions,
536534
})
@@ -597,8 +595,7 @@ type resultImmutableChanged struct {
597595
// compareLBwithSpec checks whether the load balancer fulfills the specification.
598596
// If immutableChanged is not nil then spec differs from lb such that an update will fail.
599597
// Otherwise, fulfills will indicate whether an update is necessary.
600-
//
601-
//nolint:staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants.
598+
602599
func compareLBwithSpec(lb *loadbalancer.LoadBalancer, spec *loadbalancer.CreateLoadBalancerPayload) (fulfills bool, immutableChanged *resultImmutableChanged) { //nolint:gocyclo,funlen,lll // It is long but not complex.
603600
// If a mutable property has changed we must still check the rest of the object because if there is an immutable change it must always be returned.
604601
fulfills = true
@@ -666,13 +663,13 @@ func compareLBwithSpec(lb *loadbalancer.LoadBalancer, spec *loadbalancer.CreateL
666663
if !cmp.PtrValEqual(x.TargetPool, y.TargetPool) {
667664
fulfills = false
668665
}
669-
if (cmp.UnpackPtr(x.Protocol) == string(lbLegacy.LISTENERPROTOCOL_TCP) || cmp.UnpackPtr(x.Protocol) == string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY)) &&
666+
if (cmp.UnpackPtr(x.Protocol) == loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP || cmp.UnpackPtr(x.Protocol) == loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY) &&
670667
!cmp.PtrValEqualFn(x.Tcp, y.Tcp, func(a, b loadbalancer.OptionsTCP) bool {
671668
return cmp.PtrValEqual(a.IdleTimeout, b.IdleTimeout)
672669
}) {
673670
fulfills = false
674671
}
675-
if cmp.UnpackPtr(x.Protocol) == string(lbLegacy.LISTENERPROTOCOL_UDP) && !cmp.PtrValEqualFn(x.Udp, y.Udp, func(a, b loadbalancer.OptionsUDP) bool {
672+
if cmp.UnpackPtr(x.Protocol) == loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP && !cmp.PtrValEqualFn(x.Udp, y.Udp, func(a, b loadbalancer.OptionsUDP) bool {
676673
return cmp.PtrValEqual(a.IdleTimeout, b.IdleTimeout)
677674
}) {
678675
fulfills = false

‎pkg/ccm/loadbalancer_spec_test.go‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ import (
99
"github.com/onsi/gomega/types"
1010
stackitconfig "github.com/stackitcloud/cloud-provider-stackit/pkg/stackit/config"
1111

12-
//nolint:staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants.
13-
lbLegacy "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
1412
loadbalancer "github.com/stackitcloud/stackit-sdk-go/services/loadbalancer/v2api"
1513
corev1 "k8s.io/api/core/v1"
1614
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1715
"k8s.io/utils/ptr"
1816
)
1917

20-
//nolint:staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants
2118
var _ = Describe("lbSpecFromService", func() {
2219
const (
2320
externalAddress = "123.124.88.99"
@@ -227,15 +224,15 @@ var _ = Describe("lbSpecFromService", func() {
227224
"Listeners": ConsistOf(
228225
MatchFields(IgnoreExtras, Fields{
229226
"DisplayName": PointTo(Equal("http")),
230-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))),
227+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)),
231228
}),
232229
MatchFields(IgnoreExtras, Fields{
233230
"DisplayName": PointTo(Equal("http-alt")),
234-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))),
231+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)),
235232
}),
236233
MatchFields(IgnoreExtras, Fields{
237234
"DisplayName": PointTo(Equal("dns")),
238-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_UDP))),
235+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP)),
239236
}),
240237
),
241238
})))
@@ -262,15 +259,15 @@ var _ = Describe("lbSpecFromService", func() {
262259
"Listeners": ConsistOf(
263260
MatchFields(IgnoreExtras, Fields{
264261
"DisplayName": PointTo(Equal("http")),
265-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))),
262+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)),
266263
}),
267264
MatchFields(IgnoreExtras, Fields{
268265
"DisplayName": PointTo(Equal("http-alt")),
269-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))),
266+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)),
270267
}),
271268
MatchFields(IgnoreExtras, Fields{
272269
"DisplayName": PointTo(Equal("https")),
273-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP))),
270+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP)),
274271
}),
275272
),
276273
})))
@@ -295,7 +292,7 @@ var _ = Describe("lbSpecFromService", func() {
295292
"Listeners": ConsistOf(
296293
MatchFields(IgnoreExtras, Fields{
297294
"DisplayName": PointTo(Equal("http")),
298-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP))),
295+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP)),
299296
}),
300297
),
301298
})))
@@ -375,13 +372,13 @@ var _ = Describe("lbSpecFromService", func() {
375372
Expect(spec.Listeners).To(ConsistOf(
376373
MatchFields(IgnoreExtras, Fields{
377374
"DisplayName": PointTo(Equal("http")),
378-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP))),
375+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP)),
379376
"Port": PointTo(BeNumerically("==", 80)),
380377
"TargetPool": PointTo(Equal("http")),
381378
}),
382379
MatchFields(IgnoreExtras, Fields{
383380
"DisplayName": PointTo(Equal("dns")),
384-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_UDP))),
381+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP)),
385382
"Port": PointTo(BeNumerically("==", 53)),
386383
"TargetPool": PointTo(Equal("dns")),
387384
}),
@@ -649,7 +646,7 @@ var _ = Describe("lbSpecFromService", func() {
649646
}),
650647
MatchFields(IgnoreExtras, Fields{
651648
"DisplayName": PointTo(Equal("my-tcp-proxy-port")),
652-
"Protocol": PointTo(Equal(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))),
649+
"Protocol": PointTo(Equal(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)),
653650
"Tcp": PointTo(MatchFields(IgnoreExtras, Fields{
654651
"IdleTimeout": PointTo(Equal("900s")),
655652
})),
@@ -1160,7 +1157,7 @@ var _ = Describe("lbSpecFromService", func() {
11601157
Expect(err).NotTo(HaveOccurred())
11611158
Expect(spec.Networks).To(ConsistOf(MatchFields(IgnoreExtras, Fields{
11621159
"NetworkId": PointTo(Equal("my-network")),
1163-
"Role": PointTo(Equal(string(lbLegacy.NETWORKROLE_LISTENERS_AND_TARGETS))),
1160+
"Role": PointTo(Equal(loadbalancer.NETWORKROLE_ROLE_LISTENERS_AND_TARGETS)),
11641161
})))
11651162
})
11661163

@@ -1176,11 +1173,11 @@ var _ = Describe("lbSpecFromService", func() {
11761173
Expect(spec.Networks).To(ConsistOf(
11771174
MatchFields(IgnoreExtras, Fields{
11781175
"NetworkId": PointTo(Equal("my-network")),
1179-
"Role": PointTo(Equal(string(lbLegacy.NETWORKROLE_TARGETS))),
1176+
"Role": PointTo(Equal(loadbalancer.NETWORKROLE_ROLE_TARGETS)),
11801177
}),
11811178
MatchFields(IgnoreExtras, Fields{
11821179
"NetworkId": PointTo(Equal("my-listener-network")),
1183-
"Role": PointTo(Equal(string(lbLegacy.NETWORKROLE_LISTENERS))),
1180+
"Role": PointTo(Equal(loadbalancer.NETWORKROLE_ROLE_LISTENERS)),
11841181
}),
11851182
))
11861183
})
@@ -1224,7 +1221,6 @@ type compareLBwithSpecTest struct {
12241221
spec *loadbalancer.CreateLoadBalancerPayload
12251222
}
12261223

1227-
//nolint:staticcheck // Temporary workaround: v2api OpenAPI generator currently misses enum constants
12281224
var _ = DescribeTable("compareLBwithSpec",
12291225
func(t *compareLBwithSpecTest) {
12301226
fulfills, immutableChanged := compareLBwithSpec(t.lb, t.spec)
@@ -1429,15 +1425,15 @@ var _ = DescribeTable("compareLBwithSpec",
14291425
PrivateNetworkOnly: new(true),
14301426
},
14311427
Listeners: []loadbalancer.Listener{
1432-
{Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP))},
1428+
{Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP)},
14331429
},
14341430
},
14351431
spec: &loadbalancer.CreateLoadBalancerPayload{
14361432
Options: &loadbalancer.LoadBalancerOptions{
14371433
PrivateNetworkOnly: new(true),
14381434
},
14391435
Listeners: []loadbalancer.Listener{
1440-
{Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY))},
1436+
{Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY)},
14411437
},
14421438
},
14431439
}),
@@ -1449,7 +1445,7 @@ var _ = DescribeTable("compareLBwithSpec",
14491445
},
14501446
Listeners: []loadbalancer.Listener{
14511447
{
1452-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP)),
1448+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP),
14531449
Tcp: &loadbalancer.OptionsTCP{
14541450
IdleTimeout: new("60s"),
14551451
},
@@ -1462,7 +1458,7 @@ var _ = DescribeTable("compareLBwithSpec",
14621458
},
14631459
Listeners: []loadbalancer.Listener{
14641460
{
1465-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP)),
1461+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP),
14661462
Tcp: &loadbalancer.OptionsTCP{
14671463
IdleTimeout: new("120s"),
14681464
},
@@ -1478,7 +1474,7 @@ var _ = DescribeTable("compareLBwithSpec",
14781474
},
14791475
Listeners: []loadbalancer.Listener{
14801476
{
1481-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_UDP)),
1477+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP),
14821478
Udp: &loadbalancer.OptionsUDP{
14831479
IdleTimeout: new("60s"),
14841480
},
@@ -1491,7 +1487,7 @@ var _ = DescribeTable("compareLBwithSpec",
14911487
},
14921488
Listeners: []loadbalancer.Listener{
14931489
{
1494-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_UDP)),
1490+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_UDP),
14951491
Udp: &loadbalancer.OptionsUDP{
14961492
IdleTimeout: new("120s"),
14971493
},
@@ -1507,7 +1503,7 @@ var _ = DescribeTable("compareLBwithSpec",
15071503
},
15081504
Listeners: []loadbalancer.Listener{
15091505
{
1510-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY)),
1506+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY),
15111507
Tcp: &loadbalancer.OptionsTCP{
15121508
IdleTimeout: new("60s"),
15131509
},
@@ -1520,7 +1516,7 @@ var _ = DescribeTable("compareLBwithSpec",
15201516
},
15211517
Listeners: []loadbalancer.Listener{
15221518
{
1523-
Protocol: new(string(lbLegacy.LISTENERPROTOCOL_TCP_PROXY)),
1519+
Protocol: new(loadbalancer.LISTENERPROTOCOL_PROTOCOL_TCP_PROXY),
15241520
Tcp: &loadbalancer.OptionsTCP{
15251521
IdleTimeout: new("120s"),
15261522
},
@@ -1595,7 +1591,7 @@ var _ = DescribeTable("compareLBwithSpec",
15951591
},
15961592
Networks: []loadbalancer.Network{
15971593
{
1598-
Role: new(string(lbLegacy.NETWORKROLE_LISTENERS)),
1594+
Role: new(loadbalancer.NETWORKROLE_ROLE_LISTENERS),
15991595
},
16001596
},
16011597
},
@@ -1605,7 +1601,7 @@ var _ = DescribeTable("compareLBwithSpec",
16051601
},
16061602
Networks: []loadbalancer.Network{
16071603
{
1608-
Role: new(string(lbLegacy.NETWORKROLE_TARGETS)),
1604+
Role: new(loadbalancer.NETWORKROLE_ROLE_TARGETS),
16091605
},
16101606
},
16111607
},

0 commit comments

Comments
 (0)