Merge branch 'main' into monitor-maintenance

Author: AshleyDumaine

.github/workflows/build-push.yml

@@ -27,6 +27,7 @@ jobs:
             index.docker.io:443
             registry-1.docker.io:443
             production.cloudflare.docker.com:443
+            production.cloudfront.docker.com:443
             gcr.io:443
             golang.org:443
             go.dev:443

.github/workflows/build_test_ci.yml

@@ -92,7 +92,7 @@ jobs:
         run: devbox run make test
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v6.0.2
         with:
           files: ./coverage.out
           fail_ci_if_error: false

.github/workflows/e2e-test.yaml

@@ -102,6 +102,7 @@ jobs:
             registry-1.docker.io:443
             auth.docker.io:443
             production.cloudflare.docker.com:443
+            production.cloudfront.docker.com:443
             storage.googleapis.com:443
             registry.k8s.io:443
             *.pkg.dev:443

.github/workflows/e2e-upgrade-test.yaml

@@ -66,6 +66,7 @@ jobs:
             registry-1.docker.io:443
             auth.docker.io:443
             production.cloudflare.docker.com:443
+            production.cloudfront.docker.com:443
             storage.googleapis.com:443
             registry.k8s.io:443
             *.pkg.dev:443

.github/workflows/go-analyze.yml

@@ -56,6 +56,7 @@ jobs:
             *.githubusercontent.com:443
             auth.docker.io:443
             production.cloudflare.docker.com:443
+            production.cloudfront.docker.com:443
             vuln.go.dev:443
             storage.googleapis.com:443
             golangci-lint.run:443

.github/workflows/pull_request_ci.yaml

@@ -127,6 +127,7 @@ jobs:
             registry-1.docker.io:443
             auth.docker.io:443
             production.cloudflare.docker.com:443
+            production.cloudfront.docker.com:443
             gcr.io:443
             storage.googleapis.com:443
 

api/v1alpha2/linodemachine_types.go

@@ -299,6 +299,7 @@ type InstanceConfigInterfaceCreateOptions struct {
 
 	// subnetId is the ID of the subnet to use for the interface.
 	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
 	SubnetID *int `json:"subnetId,omitempty"`
 
 	// ipv4 is the IPv4 configuration for the interface.
@@ -317,10 +318,20 @@ type LinodeInterfaceCreateOptions struct {
 	// +optional
 	FirewallID *int `json:"firewallID,omitempty"`
 
+	// firewall_id is the ID of the firewall to use for the interface.
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	FirewallIDLegacy *int `json:"firewall_id,omitempty"`
+
 	// defaultRoute is the default route for the interface.
 	// +optional
 	DefaultRoute *InterfaceDefaultRoute `json:"defaultRoute,omitempty"`
 
+	// default_route is the default route for the interface.
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	DefaultRouteLegacy *InterfaceDefaultRoute `json:"default_route,omitempty"`
+
 	// public is the public interface configuration for the interface.
 	// +optional
 	Public *PublicInterfaceCreateOptions `json:"public,omitempty"`
@@ -400,6 +411,11 @@ type VPCInterfaceCreateOptions struct {
 	// +optional
 	SubnetID *int `json:"subnetId,omitempty"`
 
+	// subnet_id is the ID of the subnet to use for the interface.
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	SubnetIDLegacy *int `json:"subnet_id,omitempty"`
+
 	// ipv4 is the IPv4 configuration for the interface.
 	// +optional
 	IPv4 *VPCInterfaceIPv4CreateOptions `json:"ipv4,omitempty"`
@@ -424,8 +440,13 @@ type VPCInterfaceIPv6CreateOptions struct {
 	Ranges []VPCInterfaceIPv6RangeCreateOptions `json:"ranges,omitempty"`
 
 	// isPublic is a boolean indicating whether the interface is public.
-	// +required
+	// +optional
 	IsPublic *bool `json:"isPublic,omitempty"`
+
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	// is_public is a boolean indicating whether the interface is public.
+	IsPublicLegacy *bool `json:"is_public,omitempty"`
 }
 
 // VPCInterfaceIPv6SLAACCreateOptions defines the Range for IPv6 SLAAC
@@ -473,6 +494,11 @@ type VPCInterfaceIPv4AddressCreateOptions struct {
 	// nat1to1Address is the NAT 1:1 address for the interface.
 	// +optional
 	NAT1To1Address *string `json:"nat1to1Address,omitempty"`
+
+	// nat_1_1_address is the NAT 1:1 address for the interface.
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	NAT1To1AddressLegacy *string `json:"nat_1_1_address,omitempty"`
 }
 
 // VPCInterfaceIPv4RangeCreateOptions defines the IPv4 range for a VPC interface
@@ -487,12 +513,23 @@ type VPCInterfaceIPv4RangeCreateOptions struct {
 type VLANInterface struct {
 	// vlanLabel is the label of the VLAN.
 	// +kubebuilder:validation:MinLength=1
-	// +required
+	// +optional
 	VLANLabel string `json:"vlanLabel,omitempty"`
 
+	// vlan_label is the label of the VLAN.
+	// +kubebuilder:validation:MinLength=1
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	VLANLabelLegacy string `json:"vlan_label,omitempty"`
+
 	// ipamAddress is the IP address to assign to the interface.
 	// +optional
 	IPAMAddress *string `json:"ipamAddress,omitempty"`
+
+	// ipam_address is the IP address to assign to the interface.
+	// +optional
+	//nolint:kubeapilinter  // to maintain backwards compatibility
+	IPAMAddressLegacy *string `json:"ipam_address,omitempty"`
 }
 
 // VPCIPv4 defines VPC IPV4 settings

api/v1alpha2/linodevpc_types.go

@@ -90,6 +90,11 @@ type VPCCreateOptionsIPv6 struct {
 	// allocationClass is the IPv6 inventory from which the VPC prefix should be allocated.
 	// +optional
 	AllocationClass *string `json:"allocationClass,omitempty"`
+
+	// allocation_class is the IPv6 inventory from which the VPC prefix should be allocated.
+	// +optional
+	//nolint:kubeapilinter // to maintain backwards compatibility
+	AllocationClassLegacy *string `json:"allocation_class,omitempty"`
 }
 
 // VPCSubnetCreateOptions defines subnet options

api/v1alpha2/zz_generated.deepcopy.go

@@ -525,6 +525,16 @@ spec:
                   description: LinodeInterfaceCreateOptions defines the linode network
                     interface config
                   properties:
+                    default_route:
+                      description: default_route is the default route for the interface.
+                      properties:
+                        ipv4:
+                          description: ipv4 is the IPv4 default route for the interface.
+                          type: boolean
+                        ipv6:
+                          description: ipv6 is the IPv6 default route for the interface.
+                          type: boolean
+                      type: object
                     defaultRoute:
                       description: defaultRoute is the default route for the interface.
                       properties:
@@ -535,6 +545,10 @@ spec:
                           description: ipv6 is the IPv6 default route for the interface.
                           type: boolean
                       type: object
+                    firewall_id:
+                      description: firewall_id is the ID of the firewall to use for
+                        the interface.
+                      type: integer
                     firewallID:
                       description: firewallID is the ID of the firewall to use for
                         the interface.
@@ -601,16 +615,22 @@ spec:
                       description: vlan is the VLAN interface configuration for the
                         interface.
                       properties:
+                        ipam_address:
+                          description: ipam_address is the IP address to assign to
+                            the interface.
+                          type: string
                         ipamAddress:
                           description: ipamAddress is the IP address to assign to
                             the interface.
                           type: string
+                        vlan_label:
+                          description: vlan_label is the label of the VLAN.
+                          minLength: 1
+                          type: string
                         vlanLabel:
                           description: vlanLabel is the label of the VLAN.
                           minLength: 1
                           type: string
-                      required:
-                      - vlanLabel
                       type: object
                     vpc:
                       description: vpc is the VPC interface configuration for the
@@ -631,6 +651,10 @@ spec:
                                       interface.
                                     minLength: 1
                                     type: string
+                                  nat_1_1_address:
+                                    description: nat_1_1_address is the NAT 1:1 address
+                                      for the interface.
+                                    type: string
                                   nat1to1Address:
                                     description: nat1to1Address is the NAT 1:1 address
                                       for the interface.
@@ -667,6 +691,10 @@ spec:
                         ipv6:
                           description: ipv6 is the IPv6 configuration for the interface.
                           properties:
+                            is_public:
+                              description: is_public is a boolean indicating whether
+                                the interface is public.
+                              type: boolean
                             isPublic:
                               description: isPublic is a boolean indicating whether
                                 the interface is public.
@@ -706,9 +734,11 @@ spec:
                               x-kubernetes-list-map-keys:
                               - range
                               x-kubernetes-list-type: map
-                          required:
-                          - isPublic
                           type: object
+                        subnet_id:
+                          description: subnet_id is the ID of the subnet to use for
+                            the interface.
+                          type: integer
                         subnetId:
                           description: subnetId is the ID of the subnet to use for
                             the interface.