MINOR: Make src-ip-header annotation available by Ingress

We used to have src-ip-header annotation only available at ConfigMap
level. This is now available at the Ingress level too.

Author: Mo3m3n

controller/frontend-annotations.go

@@ -31,6 +31,7 @@ import (
 var rateLimitTables []string
 
 func (c *HAProxyController) handleIngressAnnotations(ingress *store.Ingress) {
+	c.handleSourceIPHeader(ingress)
 	c.handleBlacklisting(ingress)
 	c.handleWhitelisting(ingress)
 	c.handleRequestRateLimiting(ingress)
@@ -45,6 +46,23 @@ func (c *HAProxyController) handleIngressAnnotations(ingress *store.Ingress) {
 	c.handleResponseCors(ingress)
 }
 
+func (c *HAProxyController) handleSourceIPHeader(ingress *store.Ingress) {
+	srcIPHeader, _ := c.Store.GetValueFromAnnotations("src-ip-header", ingress.Annotations, c.Store.ConfigMaps[Main].Annotations)
+
+	if srcIPHeader == nil {
+		return
+	}
+	if srcIPHeader.Status == DELETED || len(srcIPHeader.Value) == 0 {
+		logger.Debugf("Ingress %s/%s: Deleting Source IP configuration", ingress.Namespace, ingress.Name)
+		return
+	}
+	logger.Debugf("Ingress %s/%s: Configuring Source IP annotation", ingress.Namespace, ingress.Name)
+	reqSetSrc := rules.ReqSetSrc{
+		HeaderName: srcIPHeader.Value,
+	}
+	logger.Error(c.cfg.HAProxyRules.AddRule(reqSetSrc, &ingress.Name, FrontendHTTP, FrontendHTTPS))
+}
+
 func (c *HAProxyController) handleBlacklisting(ingress *store.Ingress) {
 	//  Get annotation status
 	annBlacklist, _ := c.Store.GetValueFromAnnotations("blacklist", ingress.Annotations, c.Store.ConfigMaps[Main].Annotations)

controller/handler-src-ip.go

@@ -25,7 +25,6 @@ type UpdateHandler interface {
 
 func (c *HAProxyController) initHandlers() {
 	c.UpdateHandlers = []UpdateHandler{
-		SourceIPHeader{},
 		ProxyProtocol{},
 		ErrorFile{},
 		HTTPS{

controller/handler.go

@@ -28,8 +28,8 @@ const (
 	REQ_ACCEPT_CONTENT RuleType = iota
 	REQ_INSPECT_DELAY
 	REQ_PROXY_PROTOCOL
-	REQ_SET_SRC
 	REQ_SET_VAR
+	REQ_SET_SRC
 	REQ_DENY
 	REQ_TRACK
 	REQ_AUTH

controller/haproxy/rules.go

@@ -32,7 +32,7 @@ This is autogenerated from [doc.yaml](doc.yaml). Description can be found in [ge
 | [backend-config-snippet](#config-snippet) | string |  |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [cookie-persistence](#cookie-persistence) | string |  |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [dontlognull](#logging) | [bool](#bool) | "true" |  |:large_blue_circle:|:white_circle:|:white_circle:|
-| [src-ip-header](#src-ip-header) | string | "null" |  |:large_blue_circle:|:white_circle:|:white_circle:|
+| [src-ip-header](#src-ip-header) | string | "null" |  |:large_blue_circle:|:large_blue_circle:|:white_circle:|
 | [forwarded-for](#x-forwarded-for) | [bool](#bool) | "true" |  |:large_blue_circle:|:large_blue_circle:|:large_blue_circle:|
 | [hard-stop-after](#hard-stop-after) | [time](#time) | "1h" |  |:large_blue_circle:|:white_circle:|:white_circle:|
 | [http-keep-alive](#http-options) | [bool](#bool) | "true" |  |:large_blue_circle:|:white_circle:|:white_circle:|
@@ -1331,7 +1331,7 @@ set-host: "example.local"
 
   Set the source IP from a header rather than the L3 connection.
 
-  Available on:  `configmap`
+  Available on:  `configmap`  `ingress`
 
 Possible values:
 

documentation/README.md

@@ -675,6 +675,7 @@ annotations:
       - "any header name"
     applies_to:
       - configmap
+      - ingress
     version_min: "1.5"
     example: ['src-ip-header: "True-Client-IP"']
   - title: forwarded-for