From c67bf447782f15de0f78ecfe147f2d593d43e63f Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Mon, 23 Apr 2018 01:16:51 -0700
Subject: [PATCH] Use separate offshootLabels and offshootSelector (#991)

---
 apis/voyager/v1beta1/annotations.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apis/voyager/v1beta1/annotations.go b/apis/voyager/v1beta1/annotations.go
index 46e674b99..10d70fee3 100644
--- a/apis/voyager/v1beta1/annotations.go
+++ b/apis/voyager/v1beta1/annotations.go
@@ -325,7 +325,7 @@ func (r Ingress) OffshootName() string {
 	return VoyagerPrefix + r.Name
 }
 
-func (r Ingress) OffshootLabels() map[string]string {
+func (r Ingress) OffshootSelector() map[string]string {
 	lbl := map[string]string{
 		"origin":      "voyager",
 		"origin-name": r.Name,
@@ -338,6 +338,16 @@ func (r Ingress) OffshootLabels() map[string]string {
 	return lbl
 }
 
+func (r Ingress) OffshootLabels() map[string]string {
+	lbl := r.OffshootSelector()
+	for k, v := range r.Labels {
+		if _, found := lbl[k]; !found {
+			lbl[k] = v
+		}
+	}
+	return lbl
+}
+
 func (r Ingress) StatsLabels() map[string]string {
 	lbl := r.OffshootLabels()
 	lbl["feature"] = "stats"