Make Ingress annotations available in template

kubernetes · Aug 26, 2017 · edcc3df · edcc3df
1 parent 6d0243a
commit edcc3df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
@@ -592,9 +592,10 @@ func isValidClientBodyBufferSize(input interface{}) bool {
 }
 
 type ingressInformation struct {
-	Namespace string
-	Rule      string
-	Service   string
+	Namespace   string
+	Rule        string
+	Service     string
+	Annotations map[string]string
 }
 
 func getIngressInformation(i, p interface{}) *ingressInformation {
@@ -616,8 +617,9 @@ func getIngressInformation(i, p interface{}) *ingressInformation {
 	}
 
 	info := &ingressInformation{
-		Namespace: ing.GetNamespace(),
-		Rule:      ing.GetName(),
+		Namespace:   ing.GetNamespace(),
+		Rule:        ing.GetName(),
+		Annotations: ing.Annotations,
 	}
 
 	if ing.Spec.Backend != nil {

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -668,6 +668,7 @@ stream {
         set $proxy_upstream_name "{{ buildUpstreamName $server.Hostname $all.Backends $location }}";
 
         {{ $ing := (getIngressInformation $location.Ingress $path) }}
+        {{/* $ing.Metadata contains the Ingress metadata */}}
         set $namespace      "{{ $ing.Namespace }}";
         set $ingress_name   "{{ $ing.Rule }}";
         set $service_name   "{{ $ing.Service }}";