Skip to content

Commit 0bc3773

Browse files
AshleyDumaineAshleyDumaine
committed
bump linodego to v2
1 parent ee8fb3b commit 0bc3773

28 files changed

Lines changed: 246 additions & 203 deletions

‎cloud/linode/cilium_loadbalancers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
ciliumclient "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1"
1414
slimv1 "github.com/cilium/cilium/pkg/k8s/slim/k8s/apis/meta/v1"
1515
"github.com/google/uuid"
16-
"github.com/linode/linodego"
16+
"github.com/linode/linodego/v2"
1717
v1 "k8s.io/api/core/v1"
1818
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -218,7 +218,7 @@ func (l *loadbalancers) createSharedIP(ctx context.Context, nodes []*v1.Node, ip
218218
return "", err
219219
}
220220

221-
newSharedIP, err := l.client.AddInstanceIPAddress(ctx, ipHolder.ID, true)
221+
newSharedIP, err := l.client.AddInstanceIPAddress(ctx, ipHolder.ID, linodego.InstanceIPAddOptions{Public: true})
222222
if err != nil {
223223
return "", err
224224
}

‎cloud/linode/cilium_loadbalancers_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
ciliumfake "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/fake"
1010
fakev2alpha1 "github.com/cilium/cilium/pkg/k8s/client/clientset/versioned/typed/cilium.io/v2alpha1/fake"
1111
"github.com/golang/mock/gomock"
12-
"github.com/linode/linodego"
12+
"github.com/linode/linodego/v2"
1313
v1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/client-go/kubernetes"
@@ -84,7 +84,7 @@ var (
8484
Label: fmt.Sprintf("%s-%s", ipHolderLabelPrefix, zone),
8585
Type: "g6-standard-1",
8686
Region: "us-west",
87-
IPv4: []*net.IP{&publicIPv4},
87+
IPv4: []net.IP{publicIPv4},
8888
}
8989
newIpHolderInstance = linodego.Instance{}
9090
)
@@ -208,7 +208,7 @@ func createNewIpHolderInstance() linodego.Instance {
208208
Label: generateClusterScopedIPHolderLinodeName(zone, options.Options.IpHolderSuffix),
209209
Type: "g6-standard-1",
210210
Region: "us-west",
211-
IPv4: []*net.IP{&publicIPv4},
211+
IPv4: []net.IP{publicIPv4},
212212
}
213213
}
214214

@@ -246,7 +246,7 @@ func testNoBGPNodeLabel(t *testing.T, mc *mocks.MockClient) {
246246
mc.EXPECT().CreateInstance(gomock.Any(), gomock.Any()).Times(1).Return(&newIpHolderInstance, nil)
247247
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
248248
IPv4: &linodego.InstanceIPv4Response{
249-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
249+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
250250
},
251251
}, nil)
252252
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), newIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
@@ -328,7 +328,7 @@ func testCreateWithExistingIPHolderWithOldIpHolderNamingConvention(t *testing.T,
328328
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), oldIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
329329
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), oldIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
330330
IPv4: &linodego.InstanceIPv4Response{
331-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
331+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
332332
},
333333
}, nil)
334334
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -374,7 +374,7 @@ func testCreateWithExistingIPHolderWithNewIpHolderNamingConvention(t *testing.T,
374374
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), oldIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
375375
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), oldIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
376376
IPv4: &linodego.InstanceIPv4Response{
377-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
377+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
378378
},
379379
}, nil)
380380
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -420,7 +420,7 @@ func testCreateWithExistingIPHolderWithNewIpHolderNamingConventionUsingLongSuffi
420420
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), oldIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
421421
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), oldIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
422422
IPv4: &linodego.InstanceIPv4Response{
423-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
423+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
424424
},
425425
}, nil)
426426
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -472,7 +472,7 @@ func testCreateWithNoExistingIPHolderUsingNoSuffix(t *testing.T, mc *mocks.MockC
472472
mc.EXPECT().CreateInstance(gomock.Any(), gomock.Any()).Times(1).Return(&newIpHolderInstance, nil)
473473
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
474474
IPv4: &linodego.InstanceIPv4Response{
475-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
475+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
476476
},
477477
}, nil)
478478
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), newIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
@@ -525,7 +525,7 @@ func testCreateWithNoExistingIPHolderUsingShortSuffix(t *testing.T, mc *mocks.Mo
525525
mc.EXPECT().CreateInstance(gomock.Any(), gomock.Any()).Times(1).Return(&newIpHolderInstance, nil)
526526
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
527527
IPv4: &linodego.InstanceIPv4Response{
528-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
528+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
529529
},
530530
}, nil)
531531
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), newIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
@@ -578,7 +578,7 @@ func testCreateWithNoExistingIPHolderUsingLongSuffix(t *testing.T, mc *mocks.Moc
578578
mc.EXPECT().CreateInstance(gomock.Any(), gomock.Any()).Times(1).Return(&newIpHolderInstance, nil)
579579
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
580580
IPv4: &linodego.InstanceIPv4Response{
581-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
581+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
582582
},
583583
}, nil)
584584
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), newIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
@@ -695,7 +695,7 @@ func testCiliumUpdateLoadBalancerAddNodeWithOldIpHolderNamingConvention(t *testi
695695
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), oldIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
696696
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), oldIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
697697
IPv4: &linodego.InstanceIPv4Response{
698-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
698+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
699699
},
700700
}, nil)
701701
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -719,7 +719,7 @@ func testCiliumUpdateLoadBalancerAddNodeWithOldIpHolderNamingConvention(t *testi
719719
mc.EXPECT().ListInstances(gomock.Any(), linodego.NewListOptions(1, string(rawFilter))).Times(1).Return([]linodego.Instance{oldIpHolderInstance}, nil)
720720
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), oldIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
721721
IPv4: &linodego.InstanceIPv4Response{
722-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
722+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
723723
},
724724
}, nil)
725725
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -765,7 +765,7 @@ func testCiliumUpdateLoadBalancerAddNodeWithNewIpHolderNamingConvention(t *testi
765765
mc.EXPECT().AddInstanceIPAddress(gomock.Any(), newIpHolderInstance.ID, true).Times(1).Return(&linodego.InstanceIP{Address: dummySharedIP}, nil)
766766
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
767767
IPv4: &linodego.InstanceIPv4Response{
768-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
768+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
769769
},
770770
}, nil)
771771
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{
@@ -801,7 +801,7 @@ func testCiliumUpdateLoadBalancerAddNodeWithNewIpHolderNamingConvention(t *testi
801801

802802
mc.EXPECT().GetInstanceIPAddresses(gomock.Any(), newIpHolderInstance.ID).Times(1).Return(&linodego.InstanceIPAddressResponse{
803803
IPv4: &linodego.InstanceIPv4Response{
804-
Public: []*linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
804+
Public: []linodego.InstanceIP{{Address: publicIPv4.String()}, {Address: dummySharedIP}},
805805
},
806806
}, nil)
807807
mc.EXPECT().ShareIPAddresses(gomock.Any(), linodego.IPAddressesShareOptions{

‎cloud/linode/client/client.go‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"os"
1212
"time"
1313

14-
"github.com/linode/linodego"
14+
"github.com/linode/linodego/v2"
1515
"k8s.io/klog/v2"
1616

1717
_ "github.com/hexdigest/gowrap"
@@ -33,7 +33,7 @@ type Client interface {
3333
ListInstanceConfigs(ctx context.Context, linodeID int, opts *linodego.ListOptions) ([]linodego.InstanceConfig, error)
3434

3535
GetInstanceIPAddresses(context.Context, int) (*linodego.InstanceIPAddressResponse, error)
36-
AddInstanceIPAddress(ctx context.Context, linodeID int, public bool) (*linodego.InstanceIP, error)
36+
AddInstanceIPAddress(ctx context.Context, linodeID int, options linodego.InstanceIPAddOptions) (*linodego.InstanceIP, error)
3737
DeleteInstanceIPAddress(ctx context.Context, linodeID int, ipAddress string) error
3838
ShareIPAddresses(ctx context.Context, opts linodego.IPAddressesShareOptions) error
3939

@@ -67,7 +67,7 @@ type Client interface {
6767
CreateFirewall(ctx context.Context, opts linodego.FirewallCreateOptions) (*linodego.Firewall, error)
6868
DeleteFirewall(ctx context.Context, fwid int) error
6969
GetFirewall(context.Context, int) (*linodego.Firewall, error)
70-
UpdateFirewallRules(context.Context, int, linodego.FirewallRuleSet) (*linodego.FirewallRuleSet, error)
70+
UpdateFirewallRules(context.Context, int, linodego.FirewallRulesUpdateOptions) (*linodego.FirewallRules, error)
7171

7272
ReserveIPAddress(ctx context.Context, opts linodego.ReserveIPOptions) (*linodego.InstanceIP, error)
7373
DeleteReservedIPAddress(ctx context.Context, ipAddress string) error
@@ -97,6 +97,7 @@ func (t *tokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
9797

9898
// New creates a new linode client with a given token and default timeout.
9999
func New(timeout time.Duration, tokenProvider TokenProvider) (*linodego.Client, error) {
100+
var client *linodego.Client
100101
userAgent := fmt.Sprintf("linode-cloud-controller-manager %s", linodego.DefaultUserAgent)
101102
apiURL := os.Getenv("LINODE_URL")
102103
if apiURL == "" {
@@ -108,8 +109,11 @@ func New(timeout time.Duration, tokenProvider TokenProvider) (*linodego.Client,
108109
tokenProvider: tokenProvider,
109110
}
110111

111-
linodeClient := linodego.NewClient(httpClient)
112-
client, err := linodeClient.UseURL(apiURL)
112+
linodeClient, err := linodego.NewClient(httpClient)
113+
if err != nil {
114+
return nil, err
115+
}
116+
client, err = linodeClient.UseURL(apiURL)
113117
if err != nil {
114118
return nil, err
115119
}

‎cloud/linode/client/client_with_metrics.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloud/linode/client/mocks/mock_client.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloud/linode/fake_linode_test.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414
"testing"
1515

16-
"github.com/linode/linodego"
16+
"github.com/linode/linodego/v2"
1717
)
1818

1919
const apiVersion = "v4"
@@ -531,9 +531,15 @@ func (f *fakeAPI) setupRoutes() {
531531
}
532532

533533
firewall := linodego.Firewall{
534-
ID: rand.Intn(9999),
535-
Label: fco.Label,
536-
Rules: fco.Rules,
534+
ID: rand.Intn(9999),
535+
Label: fco.Label,
536+
Rules: linodego.FirewallRules{
537+
Inbound: fco.Rules.Inbound,
538+
InboundPolicy: fco.Rules.InboundPolicy,
539+
Outbound: fco.Rules.Outbound,
540+
OutboundPolicy: fco.Rules.OutboundPolicy,
541+
Version: 1,
542+
},
537543
Tags: fco.Tags,
538544
Status: "enabled",
539545
}
@@ -735,7 +741,7 @@ func (f *fakeAPI) setupRoutes() {
735741
})
736742

737743
f.mux.HandleFunc("PUT /v4/networking/firewalls/{firewallID}/rules", func(w http.ResponseWriter, r *http.Request) {
738-
fwrs := new(linodego.FirewallRuleSet)
744+
fwrs := new(linodego.FirewallRulesUpdateOptions)
739745
if err := json.NewDecoder(r.Body).Decode(fwrs); err != nil {
740746
f.t.Fatal(err)
741747
}
@@ -785,7 +791,7 @@ func (f *fakeAPI) setupRoutes() {
785791
nb.Label = nbuo.Label
786792
}
787793
if nbuo.Tags != nil {
788-
nb.Tags = *nbuo.Tags
794+
nb.Tags = nbuo.Tags
789795
}
790796

791797
f.nb[strconv.Itoa(nb.ID)] = nb

‎cloud/linode/health_check_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/golang/mock/gomock"
8-
"github.com/linode/linodego"
8+
"github.com/linode/linodego/v2"
99

1010
"github.com/linode/linode-cloud-controller-manager/cloud/linode/client/mocks"
1111
)

0 commit comments

Comments
 (0)