From 08c75d6e06e48fd1ddbb0d192a4698a754a13bb2 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Mon, 20 Nov 2023 18:54:58 +1100 Subject: [PATCH] refactor: remove unused stakater annotations and add helper loop to clean up old annotations --- .../templating/ingress/templates_ingress.go | 18 +++--------- .../result-active-standby1.yaml | 8 ++--- .../result-custom-ingress1.yaml | 8 ++--- legacy/build-deploy-docker-compose.sh | 29 +++++++++++++++++++ .../test1-results/node.yaml | 2 +- .../test10-results/node.yaml | 2 +- .../test18-results/node.yaml | 2 +- .../test19-results/node.yaml | 2 +- .../test2-results/node.yaml | 2 +- .../test23-results/node.yaml | 2 +- .../test24-results/node.yaml | 2 +- .../test4-results/node.yaml | 2 +- .../test5-results/node.yaml | 2 +- .../test7-results/node.yaml | 2 +- .../test8-results/node.yaml | 2 +- .../test9-results/node.yaml | 2 +- .../test1-results/example.com.yaml | 8 ++--- .../test10-results/main2.example.com.yaml | 4 +-- .../test10-results/standby.example.com.yaml | 8 ++--- .../test11-results/content.example.com.yaml | 8 ++--- .../test12-results/test1.example.com.yaml | 8 ++--- .../test13-results/example.com.yaml | 8 ++--- .../test14-results/example.com.yaml | 8 ++--- .../test15-results/example.com.yaml | 8 ++--- .../test16-results/example.com.yaml | 8 ++--- .../test17-results/example.com.yaml | 8 ++--- .../test18-results/example.com.yaml | 8 ++--- .../test18-results/www.example.com.yaml | 4 +-- .../test2-results/example.com.yaml | 8 ++--- .../test21-results/example.com.yaml | 8 ++--- .../test22-results/example.com.yaml | 4 +-- .../test3-results/example.com.yaml | 8 ++--- .../test4-results/example.com.yaml | 8 ++--- .../test5-results/multiproject1.com.yaml | 8 ++--- .../test6-results/multiproject2.com.yaml | 8 ++--- .../test7-results/example.com.yaml | 8 ++--- .../test7-results/www.example.com.yaml | 4 +-- .../customdomain-will-be-main-domain.com.yaml | 8 ++--- ...domain-will-be-not-be-main-domain.com.yaml | 4 +-- .../test9-results/active.example.com.yaml | 8 ++--- .../test9-results/main.example.com.yaml | 4 +-- 41 files changed, 99 insertions(+), 164 deletions(-) diff --git a/internal/templating/ingress/templates_ingress.go b/internal/templating/ingress/templates_ingress.go index 88bb863b..0f350b35 100644 --- a/internal/templating/ingress/templates_ingress.go +++ b/internal/templating/ingress/templates_ingress.go @@ -100,26 +100,16 @@ func GenerateIngressTemplate( } if lValues.EnvironmentType == "production" { // monitoring is only available in production environments - additionalAnnotations["monitor.stakater.com/enabled"] = "false" primaryIngress, _ := url.Parse(lValues.Route) // check if monitoring enabled, route isn't autogenerated, and the primary ingress from the .lagoon.yml is this processed routedomain // and enable monitoring on the primary ingress only. if lValues.Monitoring.Enabled && !route.Autogenerated && primaryIngress.Host == route.Domain { - additionalLabels["lagoon.sh/primaryIngress"] = "true" - - // only add the monitring annotations if monitoring is enabled - additionalAnnotations["monitor.stakater.com/enabled"] = "true" - additionalAnnotations["uptimerobot.monitor.stakater.com/alert-contacts"] = "unconfigured" - if lValues.Monitoring.AlertContact != "" { - additionalAnnotations["uptimerobot.monitor.stakater.com/alert-contacts"] = lValues.Monitoring.AlertContact - } - if lValues.Monitoring.StatusPageID != "" { - additionalAnnotations["uptimerobot.monitor.stakater.com/status-pages"] = lValues.Monitoring.StatusPageID - } - additionalAnnotations["uptimerobot.monitor.stakater.com/interval"] = "60" + additionalLabels["route.lagoon.sh/primary"] = "true" + } else { + additionalLabels["route.lagoon.sh/primary"] = "false" } if route.MonitoringPath != "" { - additionalAnnotations["monitor.stakater.com/overridePath"] = route.MonitoringPath + additionalAnnotations["route.lagoon.sh/path-override"] = route.MonitoringPath } } if route.Fastly.ServiceID != "" { diff --git a/internal/templating/ingress/test-resources/result-active-standby1.yaml b/internal/templating/ingress/test-resources/result-active-standby1.yaml index 39406101..d21b2318 100644 --- a/internal/templating/ingress/test-resources/result-active-standby1.yaml +++ b/internal/templating/ingress/test-resources/result-active-standby1.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: environment-with-really-really-reall-3fdb lagoon.sh/version: v2.x.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" - uptimerobot.monitor.stakater.com/alert-contacts: abcdefg - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: "12345" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: extra-long-name-f6c8a @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: environment-with-really-really-reall-3fdb lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: extra-long-name-f6c8a lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: extra-long-name.a-really-long-name-that-should-truncate.www.example.com spec: rules: diff --git a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml index 2d904d3e..3d1d1b4f 100644 --- a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml +++ b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: environment-with-really-really-reall-3fdb lagoon.sh/version: v2.x.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" - uptimerobot.monitor.stakater.com/alert-contacts: abcdefg - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: "12345" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: extra-long-name-f6c8a @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: environment-with-really-really-reall-3fdb lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: extra-long-name-f6c8a lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: extra-long-name.a-really-long-name-that-should-truncate.www.example.com spec: rules: diff --git a/legacy/build-deploy-docker-compose.sh b/legacy/build-deploy-docker-compose.sh index b6f54716..9e0009da 100755 --- a/legacy/build-deploy-docker-compose.sh +++ b/legacy/build-deploy-docker-compose.sh @@ -1206,6 +1206,35 @@ fi # Load all routes with correct schema and comma separated ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "acme.openshift.io/exposer!=true" -o=go-template --template='{{range $indexItems, $ingress := .items}}{{if $indexItems}},{{end}}{{$tls := .spec.tls}}{{range $indexRule, $rule := .spec.rules}}{{if $indexRule}},{{end}}{{if $tls}}https://{{else}}http://{{end}}{{.host}}{{end}}{{end}}') +# remove stakater annotations, and fix primary label +for ingress in $(kubectl -n ${NAMESPACE} get ingress -o json | jq -r '.items[] | @base64'); do + _jq() { + echo ${ingress} | base64 --decode | jq -r ${1} + } + INGRESS_NAME=$(echo $(_jq '.') | jq -r '.metadata.name') + PRIMARY=$(echo $(_jq '.') | jq -r '.metadata.labels["lagoon.sh/primaryIngress"] // false ') + OVERRIDE=$(echo $(_jq '.') | jq -r '.metadata.annotations["monitor.stakater.com/overridePath"] // empty ') + PATCH='{ + "metadata": { + "annotations": { + "monitor.stakater.com/enabled": null, + "monitor.stakater.com/overridePath": null, + "uptimerobot.monitor.stakater.com/alert-contacts": null, + "uptimerobot.monitor.stakater.com/interval": null, + "uptimerobot.monitor.stakater.com/status-pages": null + }, + "labels": { + "route.lagoon.sh/primary": "'${PRIMARY}'" + } + } +}' + # if the ingress has a stakater override path annotation defined, change it to the new annotation + if [ ! -z "${OVERRIDE}" ]; then + PATCH=$(echo "${PATCH}" | jq '.metadata.annotations += {"route.lagoon.sh/path-override":"'${OVERRIDE}'"}') + fi + kubectl -n ${NAMESPACE} patch ingress ${INGRESS_NAME} -p "${PATCH}" +done + # Active / Standby routes ACTIVE_ROUTES="" STANDBY_ROUTES="" diff --git a/test-resources/template-autogenerated/test1-results/node.yaml b/test-resources/template-autogenerated/test1-results/node.yaml index 69dad14f..16b1ae40 100644 --- a/test-resources/template-autogenerated/test1-results/node.yaml +++ b/test-resources/template-autogenerated/test1-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test10-results/node.yaml b/test-resources/template-autogenerated/test10-results/node.yaml index 7c5b1066..aabf672b 100644 --- a/test-resources/template-autogenerated/test10-results/node.yaml +++ b/test-resources/template-autogenerated/test10-results/node.yaml @@ -10,7 +10,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -28,6 +27,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test18-results/node.yaml b/test-resources/template-autogenerated/test18-results/node.yaml index 484c4990..55595024 100644 --- a/test-resources/template-autogenerated/test18-results/node.yaml +++ b/test-resources/template-autogenerated/test18-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "false" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test19-results/node.yaml b/test-resources/template-autogenerated/test19-results/node.yaml index 484c4990..55595024 100644 --- a/test-resources/template-autogenerated/test19-results/node.yaml +++ b/test-resources/template-autogenerated/test19-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "false" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test2-results/node.yaml b/test-resources/template-autogenerated/test2-results/node.yaml index 2f8260f8..0443748f 100644 --- a/test-resources/template-autogenerated/test2-results/node.yaml +++ b/test-resources/template-autogenerated/test2-results/node.yaml @@ -10,7 +10,6 @@ metadata: lagoon.sh/prHeadBranch: main lagoon.sh/prNumber: "123" lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -28,6 +27,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test23-results/node.yaml b/test-resources/template-autogenerated/test23-results/node.yaml index 69dad14f..16b1ae40 100644 --- a/test-resources/template-autogenerated/test23-results/node.yaml +++ b/test-resources/template-autogenerated/test23-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test24-results/node.yaml b/test-resources/template-autogenerated/test24-results/node.yaml index 69dad14f..16b1ae40 100644 --- a/test-resources/template-autogenerated/test24-results/node.yaml +++ b/test-resources/template-autogenerated/test24-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test4-results/node.yaml b/test-resources/template-autogenerated/test4-results/node.yaml index a21067b9..880bc221 100644 --- a/test-resources/template-autogenerated/test4-results/node.yaml +++ b/test-resources/template-autogenerated/test4-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test5-results/node.yaml b/test-resources/template-autogenerated/test5-results/node.yaml index 1588e438..0b79fc36 100644 --- a/test-resources/template-autogenerated/test5-results/node.yaml +++ b/test-resources/template-autogenerated/test5-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: short-router-url-from-a-very-long-environment-name-like-this lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: ci-features-control-k8s lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test7-results/node.yaml b/test-resources/template-autogenerated/test7-results/node.yaml index 69dad14f..16b1ae40 100644 --- a/test-resources/template-autogenerated/test7-results/node.yaml +++ b/test-resources/template-autogenerated/test7-results/node.yaml @@ -8,7 +8,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -26,6 +25,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test8-results/node.yaml b/test-resources/template-autogenerated/test8-results/node.yaml index dc4d1be0..7ce190e1 100644 --- a/test-resources/template-autogenerated/test8-results/node.yaml +++ b/test-resources/template-autogenerated/test8-results/node.yaml @@ -9,7 +9,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -27,6 +26,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-autogenerated/test9-results/node.yaml b/test-resources/template-autogenerated/test9-results/node.yaml index dc4d1be0..7ce190e1 100644 --- a/test-resources/template-autogenerated/test9-results/node.yaml +++ b/test-resources/template-autogenerated/test9-results/node.yaml @@ -9,7 +9,6 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" nginx.ingress.kubernetes.io/server-snippet: | add_header X-Robots-Tag "noindex, nofollow"; nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -27,6 +26,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: node lagoon.sh/service-type: node + route.lagoon.sh/primary: "false" name: node spec: rules: diff --git a/test-resources/template-ingress/test1-results/example.com.yaml b/test-resources/template-ingress/test1-results/example.com.yaml index b7516b9c..b83026d9 100644 --- a/test-resources/template-ingress/test1-results/example.com.yaml +++ b/test-resources/template-ingress/test1-results/example.com.yaml @@ -10,12 +10,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -27,10 +23,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test10-results/main2.example.com.yaml b/test-resources/template-ingress/test10-results/main2.example.com.yaml index eb166e30..9aa80da8 100644 --- a/test-resources/template-ingress/test10-results/main2.example.com.yaml +++ b/test-resources/template-ingress/test10-results/main2.example.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main2 lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: main2.example.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: main2.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: main2.example.com spec: rules: diff --git a/test-resources/template-ingress/test10-results/standby.example.com.yaml b/test-resources/template-ingress/test10-results/standby.example.com.yaml index e674e1e3..72692539 100644 --- a/test-resources/template-ingress/test10-results/standby.example.com.yaml +++ b/test-resources/template-ingress/test10-results/standby.example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main2 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: standby.example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main2 lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: standby.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: standby.example.com spec: rules: diff --git a/test-resources/template-ingress/test11-results/content.example.com.yaml b/test-resources/template-ingress/test11-results/content.example.com.yaml index ecfde9c6..6ec7f62a 100644 --- a/test-resources/template-ingress/test11-results/content.example.com.yaml +++ b/test-resources/template-ingress/test11-results/content.example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "false" lagoon.sh/branch: production lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: /api/v1 nginx.ingress.kubernetes.io/ssl-redirect: "false" - uptimerobot.monitor.stakater.com/alert-contacts: alertcontact - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: /api/v1 creationTimestamp: null labels: app.kubernetes.io/instance: content.example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: production lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: content-example-com lagoon.sh/service: content.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: content.example.com spec: rules: diff --git a/test-resources/template-ingress/test12-results/test1.example.com.yaml b/test-resources/template-ingress/test12-results/test1.example.com.yaml index 1f3b9f9b..e7ecba4a 100644 --- a/test-resources/template-ingress/test12-results/test1.example.com.yaml +++ b/test-resources/template-ingress/test12-results/test1.example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "false" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: /bypass-cache nginx.ingress.kubernetes.io/ssl-redirect: "true" - uptimerobot.monitor.stakater.com/alert-contacts: alertcontact - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: /bypass-cache creationTimestamp: null labels: app.kubernetes.io/instance: test1.example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: test1.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: test1.example.com spec: rules: diff --git a/test-resources/template-ingress/test13-results/example.com.yaml b/test-resources/template-ingress/test13-results/example.com.yaml index b53adb5d..f0eeb1bc 100644 --- a/test-resources/template-ingress/test13-results/example.com.yaml +++ b/test-resources/template-ingress/test13-results/example.com.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: ingressClassName: nginx diff --git a/test-resources/template-ingress/test14-results/example.com.yaml b/test-resources/template-ingress/test14-results/example.com.yaml index add5f795..43e68a95 100644 --- a/test-resources/template-ingress/test14-results/example.com.yaml +++ b/test-resources/template-ingress/test14-results/example.com.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: ingressClassName: custom-ingress diff --git a/test-resources/template-ingress/test15-results/example.com.yaml b/test-resources/template-ingress/test15-results/example.com.yaml index add5f795..43e68a95 100644 --- a/test-resources/template-ingress/test15-results/example.com.yaml +++ b/test-resources/template-ingress/test15-results/example.com.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: ingressClassName: custom-ingress diff --git a/test-resources/template-ingress/test16-results/example.com.yaml b/test-resources/template-ingress/test16-results/example.com.yaml index e0441e20..70e056c8 100644 --- a/test-resources/template-ingress/test16-results/example.com.yaml +++ b/test-resources/template-ingress/test16-results/example.com.yaml @@ -10,14 +10,10 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/configuration-snippet: | more_set_headers "Strict-Transport-Security: max-age=10000"; nginx.ingress.kubernetes.io/ssl-redirect: "true" - uptimerobot.monitor.stakater.com/alert-contacts: alertcontact - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -29,10 +25,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test17-results/example.com.yaml b/test-resources/template-ingress/test17-results/example.com.yaml index bd6e004b..c2feb003 100644 --- a/test-resources/template-ingress/test17-results/example.com.yaml +++ b/test-resources/template-ingress/test17-results/example.com.yaml @@ -10,14 +10,10 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: main lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "true" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/configuration-snippet: | more_set_headers "Strict-Transport-Security: max-age=10000;includeSubDomains;preload"; nginx.ingress.kubernetes.io/ssl-redirect: "true" - uptimerobot.monitor.stakater.com/alert-contacts: alertcontact - uptimerobot.monitor.stakater.com/interval: "60" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -29,10 +25,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test18-results/example.com.yaml b/test-resources/template-ingress/test18-results/example.com.yaml index e672bd8c..35319b6f 100644 --- a/test-resources/template-ingress/test18-results/example.com.yaml +++ b/test-resources/template-ingress/test18-results/example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test18-results/www.example.com.yaml b/test-resources/template-ingress/test18-results/www.example.com.yaml index 9f94b2bd..79a48c99 100644 --- a/test-resources/template-ingress/test18-results/www.example.com.yaml +++ b/test-resources/template-ingress/test18-results/www.example.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: www.example.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: www.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: www.example.com spec: rules: diff --git a/test-resources/template-ingress/test2-results/example.com.yaml b/test-resources/template-ingress/test2-results/example.com.yaml index dbab25cc..e61f2722 100644 --- a/test-resources/template-ingress/test2-results/example.com.yaml +++ b/test-resources/template-ingress/test2-results/example.com.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test21-results/example.com.yaml b/test-resources/template-ingress/test21-results/example.com.yaml index e143e7f9..b9fd1514 100644 --- a/test-resources/template-ingress/test21-results/example.com.yaml +++ b/test-resources/template-ingress/test21-results/example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test22-results/example.com.yaml b/test-resources/template-ingress/test22-results/example.com.yaml index ce022329..476e17d3 100644 --- a/test-resources/template-ingress/test22-results/example.com.yaml +++ b/test-resources/template-ingress/test22-results/example.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "false" 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" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: wildcard-example.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: wildcard-example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: wildcard-example.com spec: rules: diff --git a/test-resources/template-ingress/test3-results/example.com.yaml b/test-resources/template-ingress/test3-results/example.com.yaml index dbab25cc..e61f2722 100644 --- a/test-resources/template-ingress/test3-results/example.com.yaml +++ b/test-resources/template-ingress/test3-results/example.com.yaml @@ -9,12 +9,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -26,10 +22,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test4-results/example.com.yaml b/test-resources/template-ingress/test4-results/example.com.yaml index e672bd8c..35319b6f 100644 --- a/test-resources/template-ingress/test4-results/example.com.yaml +++ b/test-resources/template-ingress/test4-results/example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test5-results/multiproject1.com.yaml b/test-resources/template-ingress/test5-results/multiproject1.com.yaml index c3caafd5..bfa42adb 100644 --- a/test-resources/template-ingress/test5-results/multiproject1.com.yaml +++ b/test-resources/template-ingress/test5-results/multiproject1.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: multiproject 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: multiproject1.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: multiproject lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: multiproject1 lagoon.sh/service: multiproject1.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: multiproject1.com spec: rules: diff --git a/test-resources/template-ingress/test6-results/multiproject2.com.yaml b/test-resources/template-ingress/test6-results/multiproject2.com.yaml index 784d6c30..0643ff98 100644 --- a/test-resources/template-ingress/test6-results/multiproject2.com.yaml +++ b/test-resources/template-ingress/test6-results/multiproject2.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: multiproject 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: multiproject2.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: multiproject lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: multiproject2 lagoon.sh/service: multiproject2.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: multiproject2.com spec: rules: diff --git a/test-resources/template-ingress/test7-results/example.com.yaml b/test-resources/template-ingress/test7-results/example.com.yaml index e672bd8c..35319b6f 100644 --- a/test-resources/template-ingress/test7-results/example.com.yaml +++ b/test-resources/template-ingress/test7-results/example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: example.com spec: rules: diff --git a/test-resources/template-ingress/test7-results/www.example.com.yaml b/test-resources/template-ingress/test7-results/www.example.com.yaml index 9f94b2bd..79a48c99 100644 --- a/test-resources/template-ingress/test7-results/www.example.com.yaml +++ b/test-resources/template-ingress/test7-results/www.example.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: www.example.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: www.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: www.example.com spec: rules: diff --git a/test-resources/template-ingress/test8-results/customdomain-will-be-main-domain.com.yaml b/test-resources/template-ingress/test8-results/customdomain-will-be-main-domain.com.yaml index 58820438..a74ecede 100644 --- a/test-resources/template-ingress/test8-results/customdomain-will-be-main-domain.com.yaml +++ b/test-resources/template-ingress/test8-results/customdomain-will-be-main-domain.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: branch/routes 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: customdomain-will-be-main-domain.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: branch-routes lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: customdomain-will-be-main-domain.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: customdomain-will-be-main-domain.com spec: rules: diff --git a/test-resources/template-ingress/test8-results/customdomain-will-be-not-be-main-domain.com.yaml b/test-resources/template-ingress/test8-results/customdomain-will-be-not-be-main-domain.com.yaml index 78bacd1f..6887aaf3 100644 --- a/test-resources/template-ingress/test8-results/customdomain-will-be-not-be-main-domain.com.yaml +++ b/test-resources/template-ingress/test8-results/customdomain-will-be-not-be-main-domain.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" lagoon.sh/branch: branch/routes lagoon.sh/version: v2.7.x - monitor.stakater.com/enabled: "false" - monitor.stakater.com/overridePath: / nginx.ingress.kubernetes.io/ssl-redirect: "true" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: customdomain-will-be-not-be-main-domain.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: customdomain-will-be-not-be-main-domain.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: customdomain-will-be-not-be-main-domain.com spec: rules: diff --git a/test-resources/template-ingress/test9-results/active.example.com.yaml b/test-resources/template-ingress/test9-results/active.example.com.yaml index cf5103f5..2223a6f3 100644 --- a/test-resources/template-ingress/test9-results/active.example.com.yaml +++ b/test-resources/template-ingress/test9-results/active.example.com.yaml @@ -8,12 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" - uptimerobot.monitor.stakater.com/status-pages: statuspageid + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: active.example.com @@ -25,10 +21,10 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: active.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "true" name: active.example.com spec: rules: diff --git a/test-resources/template-ingress/test9-results/main.example.com.yaml b/test-resources/template-ingress/test9-results/main.example.com.yaml index 878f5a34..326ba8ba 100644 --- a/test-resources/template-ingress/test9-results/main.example.com.yaml +++ b/test-resources/template-ingress/test9-results/main.example.com.yaml @@ -8,9 +8,8 @@ metadata: kubernetes.io/tls-acme: "true" 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" + route.lagoon.sh/path-override: / creationTimestamp: null labels: app.kubernetes.io/instance: main.example.com @@ -25,6 +24,7 @@ metadata: lagoon.sh/project: example-project lagoon.sh/service: main.example.com lagoon.sh/service-type: custom-ingress + route.lagoon.sh/primary: "false" name: main.example.com spec: rules: