Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_linodevpcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ spec:
Once ranges are allocated based on the IPv6Range field, they will be
added to this field.
items:
description: VPCIPv6Range represents a single IPv6 range assigned
to a VPC.
description: |-
VPCIPv6Range represents a single IPv6 range assigned to a VPC.
NOTE: IPv6 VPCs may not currently be available to all users.
properties:
range:
type: string
Expand Down Expand Up @@ -132,8 +133,9 @@ spec:
Once ranges are allocated based on the IPv6Range field, they will be
added to this field.
items:
description: VPCIPv6Range represents a single IPv6 range assigned
to a VPC.
description: |-
VPCIPv6Range represents a single IPv6 range assigned to a VPC.
NOTE: IPv6 VPCs may not currently be available to all users.
properties:
range:
type: string
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/go-logr/logr v1.4.3
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/linode/linodego v1.54.1-0.20250812173013-ca1c9b03408c
github.com/linode/linodego v1.56.0
github.com/onsi/ginkgo/v2 v2.25.1
github.com/onsi/gomega v1.38.2
github.com/stretchr/testify v1.11.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI
github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
Expand All @@ -177,8 +177,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/linode/linodego v1.54.1-0.20250812173013-ca1c9b03408c h1:EnDv76oCGlC3YGbmtdLJD67GGCkbKT5rQf+bJSQ5X9A=
github.com/linode/linodego v1.54.1-0.20250812173013-ca1c9b03408c/go.mod h1:VHlFAbhj18634Cd7B7L5D723kFKFQMOxzIutSMcWsB4=
github.com/linode/linodego v1.56.0 h1:WO2ztR6/hdfqCIeZnC8DyYb+AXnuWOl4FB/qqK6T5HE=
github.com/linode/linodego v1.56.0/go.mod h1:W5+QH6nCppgi5gud/b16uAKOzTtfuwzjOHEFA7bKOd0=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
Expand Down
14 changes: 7 additions & 7 deletions internal/controller/linodemachine_controller_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ func getVPCLinodeInterfaceConfig(ctx context.Context, machineScope *scope.Machin
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
Primary: ptr.To(true),
NAT1To1Address: ptr.To("auto"),
Address: "auto",
Address: ptr.To("auto"),
}},
},
},
Expand Down Expand Up @@ -760,7 +760,7 @@ func getVPCLinodeInterfaceConfigFromDirectID(ctx context.Context, machineScope *
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
Primary: ptr.To(true),
NAT1To1Address: ptr.To("auto"),
Address: "auto",
Address: ptr.To("auto"),
}},
},
},
Expand Down Expand Up @@ -953,7 +953,7 @@ func constructLinodeInterfaceCreateOpts(createOpts []infrav1alpha2.LinodeInterfa
IPv6: iface.DefaultRoute.IPv6,
}
}
ifaceCreateOpts.FirewallID = iface.FirewallID
ifaceCreateOpts.FirewallID = ptr.To(iface.FirewallID)
// createOpts is now fully populated with the interface options
linodeInterfaces[idx] = ifaceCreateOpts
}
Expand All @@ -973,7 +973,7 @@ func constructLinodeInterfaceVPC(iface infrav1alpha2.LinodeInterfaceCreateOption
if iface.VPC.IPv4 != nil {
for _, addr := range iface.VPC.IPv4.Addresses {
ipv4Addrs = append(ipv4Addrs, linodego.VPCInterfaceIPv4AddressCreateOptions{
Address: addr.Address,
Address: ptr.To(addr.Address),
Primary: addr.Primary,
NAT1To1Address: addr.NAT1To1Address,
})
Expand All @@ -989,7 +989,7 @@ func constructLinodeInterfaceVPC(iface infrav1alpha2.LinodeInterfaceCreateOption
{
Primary: ptr.To(true),
NAT1To1Address: ptr.To("auto"),
Address: "auto", // Default to auto-assigned address
Address: ptr.To("auto"), // Default to auto-assigned address
},
}
}
Expand Down Expand Up @@ -1029,7 +1029,7 @@ func constructLinodeInterfacePublic(iface infrav1alpha2.LinodeInterfaceCreateOpt
if iface.Public.IPv4 != nil {
for _, addr := range iface.Public.IPv4.Addresses {
ipv4Addrs = append(ipv4Addrs, linodego.PublicInterfaceIPv4AddressCreateOptions{
Address: addr.Address,
Address: ptr.To(addr.Address),
Primary: addr.Primary,
})
}
Expand Down Expand Up @@ -1518,7 +1518,7 @@ func configureFirewall(ctx context.Context, machineScope *scope.MachineScope, cr

// If using LinodeInterfaces that needs to know about the firewall ID
for i := range createConfig.LinodeInterfaces {
createConfig.LinodeInterfaces[i].FirewallID = ptr.To(fwID)
createConfig.LinodeInterfaces[i].FirewallID = ptr.To(ptr.To(fwID))
}

return nil
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/linodemachine_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2746,7 +2746,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
NAT1To1Address: ptr.To("auto"),
Primary: ptr.To(true),
Address: "auto",
Address: ptr.To("auto"),
}},
},
},
Expand Down Expand Up @@ -2813,7 +2813,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
NAT1To1Address: ptr.To("auto"),
Primary: ptr.To(true),
Address: "auto",
Address: ptr.To("auto"),
}},
},
},
Expand Down Expand Up @@ -2886,7 +2886,7 @@ var _ = Describe("machine in VPC with new network interfaces", Label("machine",
Addresses: []linodego.VPCInterfaceIPv4AddressCreateOptions{{
NAT1To1Address: ptr.To("auto"),
Primary: ptr.To(true),
Address: "auto",
Address: ptr.To("auto"),
}},
},
},
Expand Down
Loading