Make lease times configurable

README.md

@@ -18,6 +18,12 @@ The IP address to lease shall be passed as a string in `bluefield_config.yaml` g
 ```yaml
 bluefieldIP: 2001:db8::1
 ```
+The leased address preferred and valid lifetimes default to 24 hours and are optionally configurable:
+```yaml
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h
+```
 
 
 ### Notes
@@ -111,6 +117,12 @@ Providing the length in `onmetal_config.yaml` goes as follows:
 prefixDelegation:
   length: 64
 ```
+The leased address preferred and valid lifetimes default to 24 hours and are optionally configurable:
+```yaml
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h
+```
 ### Notes
 - supports only IPv6
 - IPv6 relays are mandatory
@@ -131,6 +143,12 @@ subnetLabels:
   - key: foo
     value: bar
 ```
+The leased address preferred and valid lifetimes default to 24 hours and are optionally configurable:
+```yaml
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h
+```
 ### Notes
 - supports both IPv4 and IPv6
 - IPv6 relays are supported, IPv4 are not
@@ -258,7 +276,13 @@ The Stateless plugin derives deterministic IPv6 addresses from DHCPv6 relay mess
 
 For example, given a link address of `2001:db8:1111:2222:3333::` and a MAC of `aa:bb:cc:dd:ee:ff`, the resulting address is `2001:db8:1111:2222:3333:aabb:ccdd:eeff`.
 
-Addresses are leased as [non temporary IPv6 addresses](https://datatracker.ietf.org/doc/html/rfc8415#section-6.2) with a 24-hour lifetime.
+Addresses are leased as [non temporary IPv6 addresses](https://datatracker.ietf.org/doc/html/rfc8415#section-6.2). The preferred and valid lifetimes default to 24 hours and are configurable via an optional config file (`stateless_config.yaml`):
+```yaml
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h
+```
+When no config file is provided, the defaults (24h) are used.
 
 ### Notes
 - supports IPv6 only

example/bluefield_config.yaml

@@ -1 +1,5 @@
-bluefieldIP: 2001:db8::1
+bluefieldIP: 2001:db8::1
+# leaseTimes is optional; both default to 24h when omitted.
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h

example/onmetal_config.yaml

@@ -1,2 +1,6 @@
 prefixDelegation:
-    length: 64
+    length: 64
+# leaseTimes is optional; both default to 24h when omitted.
+leaseTimes:
+    preferredLifetime: 24h
+    validLifetime: 24h

example/oob_config.yaml

@@ -3,4 +3,8 @@ subnetLabels:
   - key: dhcp
     value: "true"
   - key: key-2
-    value: value-2
+    value: value-2
+# leaseTimes is optional; both default to 24h when omitted.
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h

example/stateless_config.yaml

@@ -0,0 +1,4 @@
+# Lease times are optional; both default to 24h when omitted.
+leaseTimes:
+  preferredLifetime: 24h
+  validLifetime: 24h

internal/api/bluefield_config.go

@@ -4,5 +4,6 @@
 package api
 
 type BluefieldConfig struct {
-	BluefieldIP string `yaml:"bluefieldIP"`
+	BluefieldIP string     `yaml:"bluefieldIP"`
+	LeaseTimes  LeaseTimes `yaml:"leaseTimes"`
 }

internal/api/leasetime_config.go

@@ -0,0 +1,52 @@
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and IronCore contributors
+// SPDX-License-Identifier: MIT
+
+package api
+
+import (
+	"fmt"
+	"time"
+)
+
+// DefaultLeaseTime is the default preferred and valid lifetime for DHCP leases.
+const DefaultLeaseTime = 24 * time.Hour
+
+// LeaseTimes holds the DHCPv6 preferred and valid lifetimes. Both are optional;
+// when unset they default to DefaultLeaseTime (24h).
+type LeaseTimes struct {
+	// PreferredLifetime is the time.Duration an address remains preferred.
+	// +optional
+	PreferredLifetime time.Duration `yaml:"preferredLifetime"`
+	// ValidLifetime is the time.Duration an address remains valid.
+	// +optional
+	ValidLifetime time.Duration `yaml:"validLifetime"`
+}
+
+// Resolve returns the preferred and valid lifetimes, defaulting any zero value
+// to DefaultLeaseTime.
+func (l LeaseTimes) Resolve() (preferred, valid time.Duration) {
+	preferred = l.PreferredLifetime
+	if preferred == 0 {
+		preferred = DefaultLeaseTime
+	}
+	valid = l.ValidLifetime
+	if valid == 0 {
+		valid = DefaultLeaseTime
+	}
+	return preferred, valid
+}
+
+// Validate checks the resolved lifetimes. Both must be positive, and per
+// RFC 8415 the preferred lifetime must not exceed the valid lifetime.
+func (l LeaseTimes) Validate() error {
+	preferred, valid := l.Resolve()
+	switch {
+	case preferred <= 0:
+		return fmt.Errorf("preferredLifetime must be positive, got %s", preferred)
+	case valid <= 0:
+		return fmt.Errorf("validLifetime must be positive, got %s", valid)
+	case preferred > valid:
+		return fmt.Errorf("preferredLifetime (%s) must not exceed validLifetime (%s)", preferred, valid)
+	}
+	return nil
+}

internal/api/onmetal_config.go

@@ -9,4 +9,5 @@ type PrefixDelegation struct {
 
 type OnMetalConfig struct {
 	PrefixDelegation PrefixDelegation `yaml:"prefixDelegation"`
+	LeaseTimes       LeaseTimes       `yaml:"leaseTimes"`
 }

internal/api/oob_config.go

@@ -11,4 +11,5 @@ type SubnetLabel struct {
 type OOBConfig struct {
 	Namespace    string        `yaml:"namespace"`
 	SubnetLabels []SubnetLabel `yaml:"subnetLabels"`
+	LeaseTimes   LeaseTimes    `yaml:"leaseTimes"`
 }

internal/api/stateless_config.go

@@ -0,0 +1,9 @@
+// SPDX-FileCopyrightText: 2025 SAP SE or an SAP affiliate company and IronCore contributors
+// SPDX-License-Identifier: MIT
+
+package api
+
+// StatelessConfig holds the configuration for the stateless plugin.
+type StatelessConfig struct {
+	LeaseTimes LeaseTimes `yaml:"leaseTimes"`
+}

plugins/bluefield/plugin.go

@@ -27,7 +27,11 @@ var Plugin = plugins.Plugin{
 	Name:   "bluefield",
 	Setup6: setupPlugin,
 }
-var ipaddr net.IP
+var (
+	ipaddr            net.IP
+	preferredLifeTime time.Duration
+	validLifeTime     time.Duration
+)
 
 // args[0] = path to config file
 func parseArgs(args ...string) (string, error) {
@@ -66,7 +70,11 @@ func setupPlugin(args ...string) (handler.Handler6, error) {
 	if ipaddr == nil {
 		return nil, fmt.Errorf("invalid IPv6 address: %s", args[0])
 	}
-	log.Infof("Parsed IP %s", ipaddr)
+	if err := bluefieldIPConfig.LeaseTimes.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid lease times: %v", err)
+	}
+	preferredLifeTime, validLifeTime = bluefieldIPConfig.LeaseTimes.Resolve()
+	log.Infof("Parsed IP %s, lease times (preferred %s, valid %s)", ipaddr, preferredLifeTime, validLifeTime)
 	return handleDHCPv6, nil
 }
 
@@ -128,8 +136,8 @@ func addOptIANA(resp dhcpv6.DHCPv6, iaId [4]byte) {
 		Options: dhcpv6.IdentityOptions{Options: []dhcpv6.Option{
 			&dhcpv6.OptIAAddress{
 				IPv6Addr:          ipaddr,
-				PreferredLifetime: 24 * time.Hour,
-				ValidLifetime:     48 * time.Hour,
+				PreferredLifetime: preferredLifeTime,
+				ValidLifetime:     validLifeTime,
 			},
 		}},
 	})

plugins/bluefield/plugin_test.go

@@ -95,7 +95,7 @@ var _ = Describe("Bluefield Plugin", func() {
 				Expect(respm.MessageType).To(Equal(dhcpv6.MessageTypeAdvertise))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).IPv6Addr.String()).To(Equal(testIP))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).PreferredLifetime).To(Equal(24 * time.Hour))
-				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(48 * time.Hour))
+				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(24 * time.Hour))
 				Expect(respm.Options.OneIANA().T1).To(Equal(1 * time.Hour))
 				Expect(respm.Options.OneIANA().T2).To(Equal(2 * time.Hour))
 				Expect(respm.Options.OneIANA().IaId).NotTo(BeNil())
@@ -112,7 +112,7 @@ var _ = Describe("Bluefield Plugin", func() {
 				Expect(respm.MessageType).To(Equal(dhcpv6.MessageTypeReply))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).IPv6Addr.String()).To(Equal(testIP))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).PreferredLifetime).To(Equal(24 * time.Hour))
-				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(48 * time.Hour))
+				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(24 * time.Hour))
 				Expect(respm.Options.OneIANA().T1).To(Equal(1 * time.Hour))
 				Expect(respm.Options.OneIANA().T2).To(Equal(2 * time.Hour))
 				Expect(respm.Options.OneIANA().IaId).NotTo(BeNil())
@@ -129,7 +129,7 @@ var _ = Describe("Bluefield Plugin", func() {
 				Expect(respm.MessageType).To(Equal(dhcpv6.MessageTypeReply))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).IPv6Addr.String()).To(Equal(testIP))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).PreferredLifetime).To(Equal(24 * time.Hour))
-				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(48 * time.Hour))
+				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(24 * time.Hour))
 				Expect(respm.Options.OneIANA().T1).To(Equal(1 * time.Hour))
 				Expect(respm.Options.OneIANA().T2).To(Equal(2 * time.Hour))
 				Expect(respm.Options.OneIANA().IaId).NotTo(BeNil())
@@ -159,7 +159,7 @@ var _ = Describe("Bluefield Plugin", func() {
 				Expect(respm.MessageType).To(Equal(dhcpv6.MessageTypeReply))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).IPv6Addr.String()).To(Equal(testIP))
 				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).PreferredLifetime).To(Equal(24 * time.Hour))
-				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(48 * time.Hour))
+				Expect(respm.Options.OneIANA().Options.Options[0].(*dhcpv6.OptIAAddress).ValidLifetime).To(Equal(24 * time.Hour))
 				Expect(respm.Options.OneIANA().T1).To(Equal(1 * time.Hour))
 				Expect(respm.Options.OneIANA().T2).To(Equal(2 * time.Hour))
 				Expect(respm.Options.OneIANA().IaId).NotTo(BeNil())

plugins/onmetal/plugin.go

@@ -32,9 +32,12 @@ var Plugin = plugins.Plugin{
 
 var prefixLength int
 
+var (
+	preferredLifeTime time.Duration
+	validLifeTime     time.Duration
+)
+
 const (
-	preferredLifeTime         = 24 * time.Hour
-	validLifeTime             = 24 * time.Hour
 	prefixDelegationLengthMin = 1
 	prefixDelegationLengthMax = 127
 )
@@ -77,6 +80,12 @@ func setup6(args ...string) (handler.Handler6, error) {
 		return nil, fmt.Errorf("invalid prefix length: %d", prefixLength)
 	}
 
+	if err := onMetalConfig.LeaseTimes.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid lease times: %v", err)
+	}
+	preferredLifeTime, validLifeTime = onMetalConfig.LeaseTimes.Resolve()
+	log.Infof("Using lease times (preferred %s, valid %s)", preferredLifeTime, validLifeTime)
+
 	return handler6, nil
 }
 

plugins/oob/plugin.go

@@ -40,10 +40,13 @@ var (
 	k8sClient *K8sClient
 )
 
+var (
+	preferredLifeTime time.Duration
+	validLifeTime     time.Duration
+)
+
 const (
-	UNKNOWN_IP        = "0.0.0.0"
-	preferredLifeTime = 24 * time.Hour
-	validLifeTime     = 24 * time.Hour
+	UNKNOWN_IP = "0.0.0.0"
 )
 
 // args[0] = path to config file
@@ -85,6 +88,12 @@ func setup6(args ...string) (handler.Handler6, error) {
 		return nil, fmt.Errorf("failed to create k8s client: %w", err)
 	}
 
+	if err := oobConfig.LeaseTimes.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid lease times: %v", err)
+	}
+	preferredLifeTime, validLifeTime = oobConfig.LeaseTimes.Resolve()
+	log.Infof("Using lease times (preferred %s, valid %s)", preferredLifeTime, validLifeTime)
+
 	log.Print("Loaded oob plugin for DHCPv6.")
 	return handler6, nil
 }
@@ -171,6 +180,12 @@ func setup4(args ...string) (handler.Handler4, error) {
 		return nil, fmt.Errorf("failed to create k8s client: %w", err)
 	}
 
+	if err := oobConfig.LeaseTimes.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid lease times: %v", err)
+	}
+	preferredLifeTime, validLifeTime = oobConfig.LeaseTimes.Resolve()
+	log.Infof("Using lease times (preferred %s, valid %s)", preferredLifeTime, validLifeTime)
+
 	log.Print("Loaded oob plugin for DHCPv4.")
 	return handler4, nil
 }