diff --git a/internal/lagoon/routes.go b/internal/lagoon/routes.go index 8ef8b242..9ab990da 100644 --- a/internal/lagoon/routes.go +++ b/internal/lagoon/routes.go @@ -396,6 +396,11 @@ func handleAPIRoute(defaultIngressClass string, apiRoute RouteV2) (RouteV2, erro } else { routeAdd.IngressClass = defaultIngressClass } + if apiRoute.MonitoringPath != "" { + routeAdd.MonitoringPath = apiRoute.MonitoringPath + } else { + routeAdd.MonitoringPath = defaultMonitoringPath + } // if the route comes through as an active or standby route from the api // handle setting the migrate flag on the route diff --git a/internal/testdata/node/ingress-templates/active-standby-api-routes/active.example.com.yaml b/internal/testdata/node/ingress-templates/active-standby-api-routes/active.example.com.yaml index c672e1c4..d769ed45 100644 --- a/internal/testdata/node/ingress-templates/active-standby-api-routes/active.example.com.yaml +++ b/internal/testdata/node/ingress-templates/active-standby-api-routes/active.example.com.yaml @@ -10,6 +10,7 @@ metadata: lagoon.sh/branch: prod-left lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" labels: activestandby.lagoon.sh/migrate: "true" diff --git a/internal/testdata/node/ingress-templates/active-standby-api-routes/other.example.com.yaml b/internal/testdata/node/ingress-templates/active-standby-api-routes/other.example.com.yaml index 2b190158..ba3e6f2c 100644 --- a/internal/testdata/node/ingress-templates/active-standby-api-routes/other.example.com.yaml +++ b/internal/testdata/node/ingress-templates/active-standby-api-routes/other.example.com.yaml @@ -10,6 +10,7 @@ metadata: lagoon.sh/branch: prod-left lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" labels: activestandby.lagoon.sh/migrate: "false" diff --git a/internal/testdata/node/ingress-templates/active-standby-api-routes/test.example.com.yaml b/internal/testdata/node/ingress-templates/active-standby-api-routes/test.example.com.yaml index ae53bb9b..161d11ad 100644 --- a/internal/testdata/node/ingress-templates/active-standby-api-routes/test.example.com.yaml +++ b/internal/testdata/node/ingress-templates/active-standby-api-routes/test.example.com.yaml @@ -10,6 +10,7 @@ metadata: lagoon.sh/branch: prod-left lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "true" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" uptimerobot.monitor.stakater.com/alert-contacts: alertcontact uptimerobot.monitor.stakater.com/interval: "60" diff --git a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/other.example.com.yaml b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/other.example.com.yaml index 631948a9..079dbe30 100644 --- a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/other.example.com.yaml +++ b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/other.example.com.yaml @@ -11,6 +11,7 @@ metadata: lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" labels: activestandby.lagoon.sh/migrate: "false" diff --git a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/test.example.com.yaml b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/test.example.com.yaml index e2cada69..2c21df71 100644 --- a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/test.example.com.yaml +++ b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml-fastly/test.example.com.yaml @@ -11,6 +11,7 @@ metadata: lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "true" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" uptimerobot.monitor.stakater.com/alert-contacts: alertcontact uptimerobot.monitor.stakater.com/interval: "60" diff --git a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/other.example.com.yaml b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/other.example.com.yaml index ebc20789..beeb2d9c 100644 --- a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/other.example.com.yaml +++ b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/other.example.com.yaml @@ -10,6 +10,7 @@ metadata: lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "false" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" labels: activestandby.lagoon.sh/migrate: "false" diff --git a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/test.example.com.yaml b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/test.example.com.yaml index 39d8ae21..b8502a63 100644 --- a/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/test.example.com.yaml +++ b/internal/testdata/node/ingress-templates/api-defined-routes-with-lagoon-yml/test.example.com.yaml @@ -10,6 +10,7 @@ metadata: lagoon.sh/branch: main lagoon.sh/version: v2.7.x monitor.stakater.com/enabled: "true" + monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" uptimerobot.monitor.stakater.com/alert-contacts: alertcontact uptimerobot.monitor.stakater.com/interval: "60"