Add prefix nginx to annotations

internal/ingress/controller/backend_ssl.go

@@ -92,7 +92,7 @@ func (ic *NGINXController) getPemCertificate(secretName string) (*ingress.SSLCer
 		}
 
 		// If 'ca.crt' is also present, it will allow this secret to be used in the
-		// 'ingress.kubernetes.io/auth-tls-secret' annotation
+		// 'nginx.ingress.kubernetes.io/auth-tls-secret' annotation
 		s, err = ssl.AddOrUpdateCertAndKey(nsSecName, cert, key, ca)
 		if err != nil {
 			return nil, fmt.Errorf("unexpected error creating pem file: %v", err)
@@ -145,7 +145,7 @@ func (ic *NGINXController) checkMissingSecrets() {
 			}
 		}
 
-		key, _ := parser.GetStringAnnotation("ingress.kubernetes.io/auth-tls-secret", ing)
+		key, _ := parser.GetStringAnnotation("auth-tls-secret", ing, ic)
 		if key == "" {
 			continue
 		}

internal/ingress/controller/controller.go

@@ -66,6 +66,8 @@ func init() {
 
 // Configuration contains all the settings required by an Ingress controller
 type Configuration struct {
+	AnnotationsPrefix string
+
 	APIServerHost  string
 	KubeConfigFile string
 	Client         clientset.Interface
@@ -133,6 +135,11 @@ func (n NGINXController) GetService(name string) (*apiv1.Service, error) {
 	return n.listers.Service.GetByName(name)
 }
 
+// GetAnnotationWithPrefix returns the prefix of ingress annotations
+func (n NGINXController) GetAnnotationWithPrefix(suffix string) string {
+	return fmt.Sprintf("%v/%v", n.cfg.AnnotationsPrefix, suffix)
+}
+
 // sync collects all the pieces required to assemble the configuration file and
 // then sends the content to the backend (OnUpdate) receiving the populated
 // template as response reloading the backend if is required.
@@ -1156,7 +1163,7 @@ func (n *NGINXController) readSecrets(ing *extensions.Ingress) {
 		n.syncSecret(key)
 	}
 
-	key, _ := parser.GetStringAnnotation("ingress.kubernetes.io/auth-tls-secret", ing)
+	key, _ := parser.GetStringAnnotation("auth-tls-secret", ing, n)
 	if key == "" {
 		return
 	}

internal/ingress/controller/listers.go

@@ -66,7 +66,7 @@ func (n *NGINXController) createListers(stopCh chan struct{}) (*ingress.StoreLis
 		AddFunc: func(obj interface{}) {
 			addIng := obj.(*extensions.Ingress)
 			if !class.IsValid(addIng, n.cfg.IngressClass, defIngressClass) {
-				a, _ := parser.GetStringAnnotation(class.IngressKey, addIng)
+				a, _ := parser.GetStringAnnotation(class.IngressKey, addIng, n)
 				glog.Infof("ignoring add for ingress %v based on annotation %v with value %v", addIng.Name, class.IngressKey, a)
 				return
 			}

internal/ingress/controller/nginx.go

@@ -246,7 +246,7 @@ func (n *NGINXController) Start() {
 		ing := obj.(*extensions.Ingress)
 
 		if !class.IsValid(ing, n.cfg.IngressClass, n.cfg.DefaultIngressClass) {
-			a, _ := parser.GetStringAnnotation(class.IngressKey, ing)
+			a, _ := parser.GetStringAnnotation(class.IngressKey, ing, n)
 			glog.Infof("ignoring add for ingress %v based on annotation %v with value %v", ing.Name, class.IngressKey, a)
 			continue
 		}

internal/ingress/controller/template/template.go

@@ -193,7 +193,7 @@ func buildResolvers(input interface{}) string {
 }
 
 // buildLocation produces the location string, if the ingress has redirects
-// (specified through the ingress.kubernetes.io/rewrite-to annotation)
+// (specified through the nginx.ingress.kubernetes.io/rewrite-to annotation)
 func buildLocation(input interface{}) string {
 	location, ok := input.(*ingress.Location)
 	if !ok {
@@ -268,8 +268,8 @@ func buildLogFormatUpstream(input interface{}) string {
 }
 
 // buildProxyPass produces the proxy pass string, if the ingress has redirects
-// (specified through the ingress.kubernetes.io/rewrite-to annotation)
-// If the annotation ingress.kubernetes.io/add-base-url:"true" is specified it will
+// (specified through the nginx.ingress.kubernetes.io/rewrite-to annotation)
+// If the annotation nginx.ingress.kubernetes.io/add-base-url:"true" is specified it will
 // add a base tag in the head of the response from the service
 func buildProxyPass(host string, b interface{}, loc interface{}) string {
 	backends, ok := b.([]*ingress.Backend)