github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix contour httproxy annotations overwrite
This commit is contained in:
Sanskar Jaiswal
2022-06-21 13:51:40 +05:30
committed by GitHub
parent c31ef8a788 0cecab530f
commit 7b2c005d9b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/router/contour.go
View File

@@ -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{})