Add EDNS Persistence Support (#2950)

F5Networks · Jun 26, 2023 · a021059 · a021059
1 parent c088922
commit a021059
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 24 deletions.
diff --git a/config/apis/cis/v1/types.go b/config/apis/cis/v1/types.go
@@ -254,10 +254,14 @@ type ExternalDNS struct {
 }
 
 type ExternalDNSSpec struct {
-	DomainName        string    `json:"domainName"`
-	DNSRecordType     string    `json:"dnsRecordType"`
-	LoadBalanceMethod string    `json:"loadBalanceMethod"`
-	Pools             []DNSPool `json:"pools"`
+	DomainName         string    `json:"domainName"`
+	DNSRecordType      string    `json:"dnsRecordType"`
+	LoadBalanceMethod  string    `json:"loadBalanceMethod"`
+	PersistenceEnabled bool      `json:"persistenceEnabled""`
+	PersistCidrIPv4    uint8     `json:"persistCidrIpv4"`
+	PersistCidrIPv6    uint8     `json:"persistCidrIpv6"`
+	TTLPersistence     uint32    `json:"ttlPersistence"`
+	Pools              []DNSPool `json:"pools"`
 }
 
 type DNSPool struct {

diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -9,7 +9,7 @@ Added Functionality
     * Ingress
         *
     * CRD
-        *
+        * Support PERSISTENCE capability for service published through EDNS
 Bug Fixes
 ````````````
 * Exclude the removal of static ARP entries for Flannel CNI during CIS restart

diff --git a/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml b/docs/config_examples/customResourceDefinitions/customresourcedefinitions.yml
@@ -623,6 +623,21 @@ spec:
                 loadBalanceMethod:
                   type: string
                   pattern: '^[a-z]+[a-z_-]+[a-z]+$'
+                persistenceEnabled:
+                  type: boolean
+                persistCidrIpv4:
+                  type: integer
+                  minimum: 0
+                  maximum: 32
+                persistCidrIpv6:
+                  type: integer
+                  minimum: 0
+                  maximum: 128
+                ttlPersistence:
+                  type: integer
+                  format: int64
+                  minimum: 0
+                  maximum: 4294967295
                 pools:
                   type: array
                   items:

diff --git a/pkg/controller/backend.go b/pkg/controller/backend.go
@@ -665,11 +665,15 @@ func (agent *Agent) createAS3GTMConfigADC(config ResourceConfigRequest, adc as3A
 		for domainName, wideIP := range gtmPartitionConfig.WideIPs {
 
 			gslbDomain := as3GLSBDomain{
-				Class:      "GSLB_Domain",
-				DomainName: wideIP.DomainName,
-				RecordType: wideIP.RecordType,
-				LBMode:     wideIP.LBMethod,
-				Pools:      make([]as3GSLBDomainPool, 0, len(wideIP.Pools)),
+				Class:              "GSLB_Domain",
+				DomainName:         wideIP.DomainName,
+				RecordType:         wideIP.RecordType,
+				LBMode:             wideIP.LBMethod,
+				PersistenceEnabled: wideIP.PersistenceEnabled,
+				PersistCidrIPv4:    wideIP.PersistCidrIPv4,
+				PersistCidrIPv6:    wideIP.PersistCidrIPv6,
+				TTLPersistence:     wideIP.TTLPersistence,
+				Pools:              make([]as3GSLBDomainPool, 0, len(wideIP.Pools)),
 			}
 			for _, pool := range wideIP.Pools {
 				gslbPool := as3GSLBPool{

diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go
@@ -1316,6 +1316,10 @@ func copyGTMConfig(cfg WideIP) (rc WideIP) {
 	rc.DomainName = cfg.DomainName
 	rc.UID = cfg.UID
 	rc.LBMethod = cfg.LBMethod
+	rc.TTLPersistence = cfg.TTLPersistence
+	rc.PersistCidrIPv4 = cfg.PersistCidrIPv4
+	rc.PersistCidrIPv6 = cfg.PersistCidrIPv6
+	rc.PersistenceEnabled = cfg.PersistenceEnabled
 	rc.RecordType = cfg.RecordType
 	// Pools
 	rc.Pools = make([]GSLBPool, len(cfg.Pools))

diff --git a/pkg/controller/types.go b/pkg/controller/types.go
@@ -339,11 +339,15 @@ type (
 	}
 
 	WideIP struct {
-		DomainName string     `json:"name"`
-		RecordType string     `json:"recordType"`
-		LBMethod   string     `json:"LoadBalancingMode"`
-		Pools      []GSLBPool `json:"pools"`
-		UID        string
+		DomainName         string     `json:"name"`
+		RecordType         string     `json:"recordType"`
+		LBMethod           string     `json:"LoadBalancingMode"`
+		PersistenceEnabled bool       `json:"persistenceEnabled"`
+		PersistCidrIPv4    uint8      `json:"persistCidrIpv4"`
+		PersistCidrIPv6    uint8      `json:"persistCidrIpv6"`
+		TTLPersistence     uint32     `json:"ttlPersistence"`
+		Pools              []GSLBPool `json:"pools"`
+		UID                string
 	}
 
 	GSLBPool struct {
@@ -1053,11 +1057,15 @@ type (
 
 	// as3GLSBDomain maps to GSLB_Domain in AS3 Resources
 	as3GLSBDomain struct {
-		Class      string              `json:"class"`
-		DomainName string              `json:"domainName"`
-		RecordType string              `json:"resourceRecordType"`
-		LBMode     string              `json:"poolLbMode"`
-		Pools      []as3GSLBDomainPool `json:"pools"`
+		Class              string              `json:"class"`
+		DomainName         string              `json:"domainName"`
+		RecordType         string              `json:"resourceRecordType"`
+		LBMode             string              `json:"poolLbMode"`
+		PersistenceEnabled bool                `json:"persistenceEnabled"`
+		PersistCidrIPv4    uint8               `json:"persistCidrIpv4"`
+		PersistCidrIPv6    uint8               `json:"persistCidrIpv6"`
+		TTLPersistence     uint32              `json:"ttlPersistence"`
+		Pools              []as3GSLBDomainPool `json:"pools"`
 	}
 
 	as3GSLBDomainPool struct {

diff --git a/pkg/controller/worker.go b/pkg/controller/worker.go
@@ -2506,10 +2506,24 @@ func (ctlr *Controller) processExternalDNS(edns *cisapiv1.ExternalDNS, isDelete
 	ctlr.TeemData.Unlock()
 
 	wip := WideIP{
-		DomainName: edns.Spec.DomainName,
-		RecordType: edns.Spec.DNSRecordType,
-		LBMethod:   edns.Spec.LoadBalanceMethod,
-		UID:        string(edns.UID),
+		DomainName:         edns.Spec.DomainName,
+		RecordType:         edns.Spec.DNSRecordType,
+		LBMethod:           edns.Spec.LoadBalanceMethod,
+		PersistenceEnabled: edns.Spec.PersistenceEnabled,
+		PersistCidrIPv4:    edns.Spec.PersistCidrIPv4,
+		PersistCidrIPv6:    edns.Spec.PersistCidrIPv6,
+		TTLPersistence:     edns.Spec.TTLPersistence,
+		UID:                string(edns.UID),
+	}
+
+	if edns.Spec.TTLPersistence == 0 {
+		wip.TTLPersistence = 3600
+	}
+	if edns.Spec.PersistCidrIPv6 == 0 {
+		wip.PersistCidrIPv6 = 128
+	}
+	if edns.Spec.PersistCidrIPv4 == 0 {
+		wip.PersistCidrIPv4 = 32
 	}
 
 	if edns.Spec.DNSRecordType == "" {