Try keep the CRD stable

metal-stack · Aug 30, 2024 · a814da6 · a814da6
1 parent 7b87dc0
commit a814da6
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/api/v1/clusterwidenetworkpolicy_types.go b/api/v1/clusterwidenetworkpolicy_types.go
@@ -152,21 +152,22 @@ type FQDNSelector struct {
 }
 
 // IPSet stores set name association to IP addresses
-type IPSet struct {
-	FQDN    string                 `json:"fqdn,omitempty"`
-	SetName string                 `json:"setName,omitempty"`
-	IPs     map[string]metav1.Time `json:"ips,omitempty"`
-	Version IPVersion              `json:"version,omitempty"`
-}
-
 // type IPSet struct {
-// 	FQDN           string      `json:"fqdn,omitempty"`
-// 	SetName        string      `json:"setName,omitempty"`
-// 	IPs            []string    `json:"ips,omitempty"`
-// 	ExpirationTime metav1.Time `json:"expirationTime,omitempty"`
-// 	Version        IPVersion   `json:"version,omitempty"`
+// 	FQDN    string                 `json:"fqdn,omitempty"`
+// 	SetName string                 `json:"setName,omitempty"`
+// 	IPs     map[string]metav1.Time `json:"ips,omitempty"`
+// 	Version IPVersion              `json:"version,omitempty"`
 // }
 
+// IPSet stores set name association to IP addresses
+type IPSet struct {
+	FQDN           string      `json:"fqdn,omitempty"`
+	SetName        string      `json:"setName,omitempty"`
+	IPs            []string    `json:"ips,omitempty"`
+	ExpirationTime metav1.Time `json:"expirationTime,omitempty"`
+	Version        IPVersion   `json:"version,omitempty"`
+}
+
 func (l *ClusterwideNetworkPolicyList) GetFQDNs() []FQDNSelector {
 	s := []FQDNSelector{}
 	for _, i := range l.Items {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/metal-stack.io_clusterwidenetworkpolicies.yaml b/config/crd/bases/metal-stack.io_clusterwidenetworkpolicies.yaml
@@ -245,13 +245,15 @@ spec:
                   items:
                     description: IPSet stores set name association to IP addresses
                     properties:
+                      expirationTime:
+                        format: date-time
+                        type: string
                       fqdn:
                         type: string
                       ips:
-                        additionalProperties:
-                          format: date-time
+                        items:
                           type: string
-                        type: object
+                        type: array
                       setName:
                         type: string
                       version:

diff --git a/pkg/dns/dnscache.go b/pkg/dns/dnscache.go
@@ -13,7 +13,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/google/nftables"
 	dnsgo "github.com/miekg/dns"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	// metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	firewallv1 "github.com/metal-stack/firewall-controller/v2/api/v1"
 )
@@ -193,8 +193,13 @@ func (c *DNSCache) restoreSets(fqdnSets []firewallv1.IPSet) {
 			ipe := &ipEntry{
 				setName: s.SetName,
 			}
-			for ip, expirationTime := range s.IPs {
-				ipe.ips[ip] = expirationTime.Time
+			for _, ip := range s.IPs {
+				ipa, _, _ := strings.Cut(ip, ",")
+				expirationTime := time.Now()
+				if _, ets, found := strings.Cut(ip, ": "); found {
+					expirationTime.UnmarshalText([]byte(ets))
+				}
+				ipe.ips[ipa] = expirationTime
 			}
 			switch s.Version {
 			case firewallv1.IPv4:
@@ -469,11 +474,14 @@ func createIPSetFromIPEntry(fqdn string, version firewallv1.IPVersion, entry *ip
 	ips := firewallv1.IPSet{
 		FQDN:    fqdn,
 		SetName: entry.setName,
-		IPs:     map[string]metav1.Time{},
+		IPs:     []string{},
 		Version: version,
 	}
 	for ip, expirationTime := range entry.ips {
-		ips.IPs[ip] = metav1.Time{Time: expirationTime}
+		if et, err := expirationTime.MarshalText(); err == nil {
+			ip = ip + ", expiration time: " + string(et)
+		}
+		ips.IPs = append(ips.IPs, ip)
 	}
 	return ips
 }