Skip to content

Commit c15ec92

Browse files
authored
Merge branch 'main' into dependabot/go_modules/k8s.io/apimachinery-0.36.1
2 parents 43664c9 + 19b7b07 commit c15ec92

13 files changed

Lines changed: 5171 additions & 8581 deletions

nodebalancer.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ type NodeBalancer struct {
3737
// An array of tags applied to this object. Tags are for organizational purposes only.
3838
Tags []string `json:"tags"`
3939

40+
// This NodeBalancer's related LKE cluster, if any. The value is null if this NodeBalancer is not related to an LKE cluster.
41+
LKECluster *NodeBalancerLKECluster `json:"lke_cluster"`
42+
4043
// An array of locks applied to this NodeBalancer for deletion protection.
4144
// Locks prevent the NodeBalancer or its subresources from being deleted.
4245
// NOTE: Locks can only be used with v4beta.
@@ -91,6 +94,17 @@ type NodeBalancerUpdateOptions struct {
9194
Tags *[]string `json:"tags,omitempty"`
9295
}
9396

97+
type NodeBalancerLKECluster struct {
98+
// The ID of the related LKE cluster.
99+
ID int `json:"id"`
100+
// The label of the related LKE cluster.
101+
Label string `json:"label"`
102+
// The type for LKE clusters.
103+
Type string `json:"type"`
104+
// The URL where you can access the related LKE cluster.
105+
URL string `json:"url"`
106+
}
107+
94108
// NodeBalancerPlanType constants start with NBType and include Linode API NodeBalancer's plan types
95109
type NodeBalancerPlanType string
96110

test/integration/fixtures/ExampleListImages_all.yaml

Lines changed: 261 additions & 172 deletions
Large diffs are not rendered by default.

test/integration/fixtures/ExampleListStackscripts_page1.yaml

Lines changed: 2571 additions & 3547 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestImageSharing_Suite.yaml

Lines changed: 329 additions & 281 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestImages_List.yaml

Lines changed: 259 additions & 158 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestInstance_Rebuild.yaml

Lines changed: 89 additions & 374 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestInstance_RebuildWithEncryption.yaml

Lines changed: 89 additions & 374 deletions
Large diffs are not rendered by default.

test/integration/fixtures/TestStackscripts_List.yaml

Lines changed: 1470 additions & 3658 deletions
Large diffs are not rendered by default.

test/integration/instances_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ func TestInstance_Rebuild(t *testing.T) {
708708
}
709709

710710
rebuildOpts := linodego.InstanceRebuildOptions{
711-
Image: "linode/alpine3.19",
711+
Image: "linode/alpine3.23",
712712
Metadata: &linodego.InstanceMetadataOptions{
713713
UserData: base64.StdEncoding.EncodeToString([]byte("cool")),
714714
},
@@ -747,7 +747,7 @@ func TestInstance_RebuildWithEncryption(t *testing.T) {
747747
}
748748

749749
rebuildOpts := linodego.InstanceRebuildOptions{
750-
Image: "linode/alpine3.19",
750+
Image: "linode/alpine3.23",
751751
RootPass: randPassword(),
752752
Type: "g6-standard-2",
753753
DiskEncryption: linodego.InstanceDiskEncryptionDisabled,

test/unit/fixtures/nodebalancer_get.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"in": 1000.0,
1212
"out": 1000.0
1313
},
14+
"lke_cluster": null,
1415
"tags": ["production"],
1516
"locks": ["cannot_delete_with_subresources"],
1617
"created": "2025-01-15T08:00:00",

0 commit comments

Comments
 (0)