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

Add Contour URL prefix

Browse Source
This commit is contained in:
stefanprodan
2019-12-19 18:48:31 +02:00
parent 7641190ecb
commit bb4591106a
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/contour.go
+22 -7
View File
@@ -35,7 +35,7 @@ func (cr *ContourRouter) Reconcile(canary *flaggerv1.Canary) error {
{
Conditions: []contourv1.Condition{
{
Prefix: "/",
Prefix: cr.makePrefix(canary),
},
},
TimeoutPolicy: cr.makeTimeoutPolicy(canary),
@@ -79,7 +79,7 @@ func (cr *ContourRouter) Reconcile(canary *flaggerv1.Canary) error {
{
Conditions: []contourv1.Condition{
{
Prefix: "/",
Prefix: cr.makePrefix(canary),
},
},
TimeoutPolicy: cr.makeTimeoutPolicy(canary),
@@ -222,7 +222,7 @@ func (cr *ContourRouter) SetRoutes(
{
Conditions: []contourv1.Condition{
{
Prefix: "/",
Prefix: cr.makePrefix(canary),
},
},
TimeoutPolicy: cr.makeTimeoutPolicy(canary),
@@ -246,7 +246,7 @@ func (cr *ContourRouter) SetRoutes(
proxy.Spec = contourv1.HTTPProxySpec{
Routes: []contourv1.Route{
{
Conditions: cr.makeConditions(canary),
Conditions: cr.makeConditions(canary),
TimeoutPolicy: cr.makeTimeoutPolicy(canary),
RetryPolicy: cr.makeRetryPolicy(canary),
Services: []contourv1.Service{
@@ -265,7 +265,7 @@ func (cr *ContourRouter) SetRoutes(
{
Conditions: []contourv1.Condition{
{
Prefix: "/",
Prefix: cr.makePrefix(canary),
},
},
TimeoutPolicy: cr.makeTimeoutPolicy(canary),
@@ -294,6 +294,18 @@ func (cr *ContourRouter) SetRoutes(
return nil
}
func (cr *ContourRouter) makePrefix(canary *flaggerv1.Canary) string {
prefix := "/"
if len(canary.Spec.Service.Match) > 0 &&
canary.Spec.Service.Match[0].Uri != nil &&
canary.Spec.Service.Match[0].Uri.Prefix != "" {
prefix = canary.Spec.Service.Match[0].Uri.Prefix
}
return prefix
}
func (cr *ContourRouter) makeConditions(canary *flaggerv1.Canary) []contourv1.Condition {
list := []contourv1.Condition{}
@@ -316,13 +328,16 @@ func (cr *ContourRouter) makeConditions(canary *flaggerv1.Canary) []contourv1.Co
Contains: stringMatch.Prefix,
}
}
list = append(list, contourv1.Condition{Prefix: "/", Header: h})
list = append(list, contourv1.Condition{
Prefix: cr.makePrefix(canary),
Header: h,
})
}
}
} else {
list = []contourv1.Condition{
{
Prefix: "/",
Prefix: cr.makePrefix(canary),
},
}
}