[DHCP] Add PXEURL to VPC DHCP Subnet config

githedgehog · Mar 6, 2024 · 70dcd3d · 70dcd3d
1 parent e745ecf
commit 70dcd3d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/api/vpc/v1alpha2/vpc_types.go b/api/vpc/v1alpha2/vpc_types.go
@@ -78,6 +78,8 @@ type VPCDHCP struct {
 	Enable bool `json:"enable,omitempty"`
 	// Range is the DHCP range for the subnet if DHCP server is enabled
 	Range *VPCDHCPRange `json:"range,omitempty"`
+	// PXEURL is the URL for the PXE server if DHCP server is enabled
+	PXEURL string `json:"pxeURL,omitempty"`
 }
 
 // VPCDHCPRange defines the DHCP range for the subnet if DHCP server is enabled

diff --git a/cmd/hhfctl/main.go b/cmd/hhfctl/main.go
@@ -140,6 +140,7 @@ func main() {
 								VLAN:   cCtx.String("vlan"),
 								DHCP: vpcapi.VPCDHCP{
 									Enable: cCtx.Bool("dhcp"),
+									PXEURL: cCtx.String("dhcp-pxe-url"),
 									Range: &vpcapi.VPCDHCPRange{
 										Start: cCtx.String("dhcp-range-start"),
 										End:   cCtx.String("dhcp-range-end"),

diff --git a/config/crd/bases/agent.githedgehog.com_agents.yaml b/config/crd/bases/agent.githedgehog.com_agents.yaml
@@ -1162,6 +1162,10 @@ spec:
                               enable:
                                 description: Enable enables DHCP server for the subnet
                                 type: boolean
+                              pxeURL:
+                                description: PXEURL is the URL for the PXE server
+                                  if DHCP server is enabled
+                                type: string
                               range:
                                 description: Range is the DHCP range for the subnet
                                   if DHCP server is enabled

diff --git a/config/crd/bases/vpc.githedgehog.com_vpcs.yaml b/config/crd/bases/vpc.githedgehog.com_vpcs.yaml
@@ -92,6 +92,10 @@ spec:
                         enable:
                           description: Enable enables DHCP server for the subnet
                           type: boolean
+                        pxeURL:
+                          description: PXEURL is the URL for the PXE server if DHCP
+                            server is enabled
+                          type: string
                         range:
                           description: Range is the DHCP range for the subnet if DHCP
                             server is enabled

diff --git a/docs/api.md b/docs/api.md
@@ -526,6 +526,7 @@ _Appears in:_
 | `relay` _string_ | Relay is the DHCP relay IP address, if specified, DHCP server will be disabled |
 | `enable` _boolean_ | Enable enables DHCP server for the subnet |
 | `range` _[VPCDHCPRange](#vpcdhcprange)_ | Range is the DHCP range for the subnet if DHCP server is enabled |
+| `pxeURL` _string_ | PXEURL is the URL for the PXE server if DHCP server is enabled |
 
 
 #### VPCDHCPRange

diff --git a/pkg/ctrl/vpc/dhcpd.go b/pkg/ctrl/vpc/dhcpd.go
@@ -218,6 +218,7 @@ func (r *VPCReconciler) updateDHCPSubnets(ctx context.Context, vpc *vpcapi.VPC)
 				EndIP:     end,
 				VRF:       fmt.Sprintf("VrfV%s", vpc.Name),    // TODO move to utils
 				CircuitID: fmt.Sprintf("Vlan%s", subnet.VLAN), // TODO move to utils
+				PXEURL:    subnet.DHCP.PXEURL,
 			}
 
 			return nil