diff --git a/internal/templating/ingress/templates_ingress.go b/internal/templating/ingress/templates_ingress.go index 88bb863b..dd0da00c 100644 --- a/internal/templating/ingress/templates_ingress.go +++ b/internal/templating/ingress/templates_ingress.go @@ -91,11 +91,11 @@ func GenerateIngressTemplate( } additionalAnnotations := map[string]string{} - if lValues.EnvironmentType == "production" { + if lValues.EnvironmentType == "production" && !route.Autogenerated { if route.Migrate != nil { - additionalLabels["dioscuri.amazee.io/migrate"] = strconv.FormatBool(*route.Migrate) + additionalLabels["activestandby.lagoon.sh/migrate"] = strconv.FormatBool(*route.Migrate) } else { - additionalLabels["dioscuri.amazee.io/migrate"] = "false" + additionalLabels["activestandby.lagoon.sh/migrate"] = "false" } } if lValues.EnvironmentType == "production" { diff --git a/internal/templating/ingress/test-resources/result-active-standby1.yaml b/internal/templating/ingress/test-resources/result-active-standby1.yaml index 39406101..8bd9da23 100644 --- a/internal/templating/ingress/test-resources/result-active-standby1.yaml +++ b/internal/templating/ingress/test-resources/result-active-standby1.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: "12345" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "true" app.kubernetes.io/instance: extra-long-name-f6c8a app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "true" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml index 2d904d3e..32bdda45 100644 --- a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml +++ b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: "12345" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: extra-long-name-f6c8a app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/legacy/build-deploy-docker-compose.sh b/legacy/build-deploy-docker-compose.sh index 12170d70..a34fe20f 100755 --- a/legacy/build-deploy-docker-compose.sh +++ b/legacy/build-deploy-docker-compose.sh @@ -1281,12 +1281,31 @@ 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}}') +# swap dioscuri for activestanby label +for ingress in $(kubectl -n ${NAMESPACE} get ingress -l "dioscuri.amazee.io/migrate" -o json | jq -r '.items[] | @base64'); do + _jq() { + echo ${ingress} | base64 --decode | jq -r ${1} + } + INGRESS_NAME=$(echo $(_jq '.') | jq -r '.metadata.name') + MIGRATE_VALUE=$(echo $(_jq '.') | jq -r '.metadata.labels["dioscuri.amazee.io/migrate"] // false ') + PATCH='{ + "metadata": { + "labels": { + "activestandby.lagoon.sh/migrate": "'${MIGRATE_VALUE}'", + "dioscuri.amazee.io/migrate": null, + "dioscuri.amazee.io/migrated-from": null + } + } +}' + kubectl -n ${NAMESPACE} patch ingress ${INGRESS_NAME} -p "${PATCH}" +done + # Active / Standby routes ACTIVE_ROUTES="" STANDBY_ROUTES="" if [ ! -z "${STANDBY_ENVIRONMENT}" ]; then -ACTIVE_ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "dioscuri.amazee.io/migrate=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}}') -STANDBY_ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "dioscuri.amazee.io/migrate=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}}') +ACTIVE_ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "activestandby.lagoon.sh/migrate=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}}') +STANDBY_ROUTES=$(kubectl -n ${NAMESPACE} get ingress --sort-by='{.metadata.name}' -l "activestandby.lagoon.sh/migrate=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}}') fi # Get list of autogenerated routes diff --git a/test-resources/template-autogenerated/test1-results/node.yaml b/test-resources/template-autogenerated/test1-results/node.yaml index 69dad14f..edc3b5c2 100644 --- a/test-resources/template-autogenerated/test1-results/node.yaml +++ b/test-resources/template-autogenerated/test1-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test10-results/node.yaml b/test-resources/template-autogenerated/test10-results/node.yaml index 7c5b1066..9433b409 100644 --- a/test-resources/template-autogenerated/test10-results/node.yaml +++ b/test-resources/template-autogenerated/test10-results/node.yaml @@ -19,7 +19,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test18-results/node.yaml b/test-resources/template-autogenerated/test18-results/node.yaml index 484c4990..e04cfe96 100644 --- a/test-resources/template-autogenerated/test18-results/node.yaml +++ b/test-resources/template-autogenerated/test18-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test19-results/node.yaml b/test-resources/template-autogenerated/test19-results/node.yaml index 484c4990..e04cfe96 100644 --- a/test-resources/template-autogenerated/test19-results/node.yaml +++ b/test-resources/template-autogenerated/test19-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test2-results/node.yaml b/test-resources/template-autogenerated/test2-results/node.yaml index 2f8260f8..c0c6cd9e 100644 --- a/test-resources/template-autogenerated/test2-results/node.yaml +++ b/test-resources/template-autogenerated/test2-results/node.yaml @@ -19,7 +19,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: pullrequest diff --git a/test-resources/template-autogenerated/test23-results/node.yaml b/test-resources/template-autogenerated/test23-results/node.yaml index 69dad14f..edc3b5c2 100644 --- a/test-resources/template-autogenerated/test23-results/node.yaml +++ b/test-resources/template-autogenerated/test23-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test24-results/node.yaml b/test-resources/template-autogenerated/test24-results/node.yaml index 69dad14f..edc3b5c2 100644 --- a/test-resources/template-autogenerated/test24-results/node.yaml +++ b/test-resources/template-autogenerated/test24-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test4-results/node.yaml b/test-resources/template-autogenerated/test4-results/node.yaml index a21067b9..3a8410d0 100644 --- a/test-resources/template-autogenerated/test4-results/node.yaml +++ b/test-resources/template-autogenerated/test4-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test5-results/node.yaml b/test-resources/template-autogenerated/test5-results/node.yaml index 1588e438..531ed222 100644 --- a/test-resources/template-autogenerated/test5-results/node.yaml +++ b/test-resources/template-autogenerated/test5-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test7-results/node.yaml b/test-resources/template-autogenerated/test7-results/node.yaml index 69dad14f..edc3b5c2 100644 --- a/test-resources/template-autogenerated/test7-results/node.yaml +++ b/test-resources/template-autogenerated/test7-results/node.yaml @@ -17,7 +17,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test8-results/node.yaml b/test-resources/template-autogenerated/test8-results/node.yaml index dc4d1be0..74f116a4 100644 --- a/test-resources/template-autogenerated/test8-results/node.yaml +++ b/test-resources/template-autogenerated/test8-results/node.yaml @@ -18,7 +18,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-autogenerated/test9-results/node.yaml b/test-resources/template-autogenerated/test9-results/node.yaml index dc4d1be0..74f116a4 100644 --- a/test-resources/template-autogenerated/test9-results/node.yaml +++ b/test-resources/template-autogenerated/test9-results/node.yaml @@ -18,7 +18,6 @@ metadata: app.kubernetes.io/instance: node app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: autogenerated-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: autogenerated-ingress-0.1.0 lagoon.sh/autogenerated: "true" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test1-results/example.com.yaml b/test-resources/template-ingress/test1-results/example.com.yaml index b7516b9c..5cf0fc38 100644 --- a/test-resources/template-ingress/test1-results/example.com.yaml +++ b/test-resources/template-ingress/test1-results/example.com.yaml @@ -18,10 +18,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..53517c65 100644 --- a/test-resources/template-ingress/test10-results/main2.example.com.yaml +++ b/test-resources/template-ingress/test10-results/main2.example.com.yaml @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: main2.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..0fa3ec56 100644 --- a/test-resources/template-ingress/test10-results/standby.example.com.yaml +++ b/test-resources/template-ingress/test10-results/standby.example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "true" app.kubernetes.io/instance: standby.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "true" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..fd8bc2a1 100644 --- a/test-resources/template-ingress/test11-results/content.example.com.yaml +++ b/test-resources/template-ingress/test11-results/content.example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: content.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..af1c4ab8 100644 --- a/test-resources/template-ingress/test12-results/test1.example.com.yaml +++ b/test-resources/template-ingress/test12-results/test1.example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: test1.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test13-results/example.com.yaml b/test-resources/template-ingress/test13-results/example.com.yaml index b53adb5d..19068094 100644 --- a/test-resources/template-ingress/test13-results/example.com.yaml +++ b/test-resources/template-ingress/test13-results/example.com.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test14-results/example.com.yaml b/test-resources/template-ingress/test14-results/example.com.yaml index add5f795..665e6cc7 100644 --- a/test-resources/template-ingress/test14-results/example.com.yaml +++ b/test-resources/template-ingress/test14-results/example.com.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test15-results/example.com.yaml b/test-resources/template-ingress/test15-results/example.com.yaml index add5f795..665e6cc7 100644 --- a/test-resources/template-ingress/test15-results/example.com.yaml +++ b/test-resources/template-ingress/test15-results/example.com.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test16-results/example.com.yaml b/test-resources/template-ingress/test16-results/example.com.yaml index e0441e20..7424cf1e 100644 --- a/test-resources/template-ingress/test16-results/example.com.yaml +++ b/test-resources/template-ingress/test16-results/example.com.yaml @@ -20,10 +20,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test17-results/example.com.yaml b/test-resources/template-ingress/test17-results/example.com.yaml index bd6e004b..f21534da 100644 --- a/test-resources/template-ingress/test17-results/example.com.yaml +++ b/test-resources/template-ingress/test17-results/example.com.yaml @@ -20,10 +20,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test18-results/example.com.yaml b/test-resources/template-ingress/test18-results/example.com.yaml index e672bd8c..457648e1 100644 --- a/test-resources/template-ingress/test18-results/example.com.yaml +++ b/test-resources/template-ingress/test18-results/example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..31b9beb3 100644 --- a/test-resources/template-ingress/test18-results/www.example.com.yaml +++ b/test-resources/template-ingress/test18-results/www.example.com.yaml @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: www.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test2-results/example.com.yaml b/test-resources/template-ingress/test2-results/example.com.yaml index dbab25cc..cd9b2309 100644 --- a/test-resources/template-ingress/test2-results/example.com.yaml +++ b/test-resources/template-ingress/test2-results/example.com.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test21-results/example.com.yaml b/test-resources/template-ingress/test21-results/example.com.yaml index e143e7f9..ffa20d7e 100644 --- a/test-resources/template-ingress/test21-results/example.com.yaml +++ b/test-resources/template-ingress/test21-results/example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test22-results/example.com.yaml b/test-resources/template-ingress/test22-results/example.com.yaml index ce022329..28bb7e42 100644 --- a/test-resources/template-ingress/test22-results/example.com.yaml +++ b/test-resources/template-ingress/test22-results/example.com.yaml @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: wildcard-example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test3-results/example.com.yaml b/test-resources/template-ingress/test3-results/example.com.yaml index dbab25cc..cd9b2309 100644 --- a/test-resources/template-ingress/test3-results/example.com.yaml +++ b/test-resources/template-ingress/test3-results/example.com.yaml @@ -17,10 +17,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test4-results/example.com.yaml b/test-resources/template-ingress/test4-results/example.com.yaml index e672bd8c..457648e1 100644 --- a/test-resources/template-ingress/test4-results/example.com.yaml +++ b/test-resources/template-ingress/test4-results/example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test5-results/multiproject1.com.yaml b/test-resources/template-ingress/test5-results/multiproject1.com.yaml index c3caafd5..cf95f661 100644 --- a/test-resources/template-ingress/test5-results/multiproject1.com.yaml +++ b/test-resources/template-ingress/test5-results/multiproject1.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: multiproject1.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test6-results/multiproject2.com.yaml b/test-resources/template-ingress/test6-results/multiproject2.com.yaml index 784d6c30..62a2692a 100644 --- a/test-resources/template-ingress/test6-results/multiproject2.com.yaml +++ b/test-resources/template-ingress/test6-results/multiproject2.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: multiproject2.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch diff --git a/test-resources/template-ingress/test7-results/example.com.yaml b/test-resources/template-ingress/test7-results/example.com.yaml index e672bd8c..457648e1 100644 --- a/test-resources/template-ingress/test7-results/example.com.yaml +++ b/test-resources/template-ingress/test7-results/example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..31b9beb3 100644 --- a/test-resources/template-ingress/test7-results/www.example.com.yaml +++ b/test-resources/template-ingress/test7-results/www.example.com.yaml @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: www.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..d3daccbe 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 @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: customdomain-will-be-main-domain.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..3bce70ac 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 @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: customdomain-will-be-not-be-main-domain.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..e4b7668e 100644 --- a/test-resources/template-ingress/test9-results/active.example.com.yaml +++ b/test-resources/template-ingress/test9-results/active.example.com.yaml @@ -16,10 +16,10 @@ metadata: uptimerobot.monitor.stakater.com/status-pages: statuspageid creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "true" app.kubernetes.io/instance: active.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "true" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch 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..f643f3ad 100644 --- a/test-resources/template-ingress/test9-results/main.example.com.yaml +++ b/test-resources/template-ingress/test9-results/main.example.com.yaml @@ -13,10 +13,10 @@ metadata: nginx.ingress.kubernetes.io/ssl-redirect: "true" creationTimestamp: null labels: + activestandby.lagoon.sh/migrate: "false" app.kubernetes.io/instance: main.example.com app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: custom-ingress - dioscuri.amazee.io/migrate: "false" helm.sh/chart: custom-ingress-0.1.0 lagoon.sh/autogenerated: "false" lagoon.sh/buildType: branch