Merge pull request #1205 from shipt/bugfix-contour-annotation-override

fix contour httproxy annotations overwrite
fluxcd · Jun 21, 2022 · 7b2c005 · 7b2c005
2 parents c31ef8a + 0cecab5
commit 7b2c005
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/router/contour.go b/pkg/router/contour.go
@@ -188,9 +188,10 @@ func (cr *ContourRouter) Reconcile(canary *flaggerv1.Canary) error {
 		}
 
 		if cr.ingressClass != "" {
-			proxy.Annotations = map[string]string{
-				annotation: cr.ingressClass,
+			if proxy.Annotations == nil {
+				proxy.Annotations = make(map[string]string)
 			}
+			proxy.Annotations[annotation] = cr.ingressClass
 		}
 
 		_, err = cr.contourClient.ProjectcontourV1().HTTPProxies(canary.Namespace).Create(context.TODO(), proxy, metav1.CreateOptions{})