diff --git a/internal/generator/services.go b/internal/generator/services.go index 67f4e4f4..b32a2ce6 100644 --- a/internal/generator/services.go +++ b/internal/generator/services.go @@ -264,8 +264,6 @@ func composeToServiceValues( } return cService, nil } - // service is not destined for Lagoon, return null - return ServiceValues{}, nil } // getDBaasEnvironment will check the dbaas provider to see if an environment exists or not diff --git a/internal/templating/ingress/templates_ingress.go b/internal/templating/ingress/templates_ingress.go index a2a687f9..2fee60c9 100644 --- a/internal/templating/ingress/templates_ingress.go +++ b/internal/templating/ingress/templates_ingress.go @@ -90,7 +90,7 @@ func GenerateIngressTemplate( // 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 == routeDomain { - additionalLabels["lagoon.sh/primaryingress"] = "true" + additionalLabels["lagoon.sh/primaryIngress"] = "true" // only add the monitring annotations if monitoring is enabled additionalAnnotations["monitor.stakater.com/enabled"] = "true" diff --git a/internal/templating/ingress/test-resources/result-active-standby1.yaml b/internal/templating/ingress/test-resources/result-active-standby1.yaml index 0403c6fd..39406101 100644 --- a/internal/templating/ingress/test-resources/result-active-standby1.yaml +++ b/internal/templating/ingress/test-resources/result-active-standby1.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: environment-with-really-really-reall-3fdb lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: extra-long-name-f6c8a lagoon.sh/service-type: custom-ingress diff --git a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml index b83eab4a..2d904d3e 100644 --- a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml +++ b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: environment-with-really-really-reall-3fdb lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: extra-long-name-f6c8a lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test1-results/example.com.yaml b/test-resources/template-ingress/test1-results/example.com.yaml index 03961f71..b7516b9c 100644 --- a/test-resources/template-ingress/test1-results/example.com.yaml +++ b/test-resources/template-ingress/test1-results/example.com.yaml @@ -27,7 +27,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress 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 2903a40c..e674e1e3 100644 --- a/test-resources/template-ingress/test10-results/standby.example.com.yaml +++ b/test-resources/template-ingress/test10-results/standby.example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main2 lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: standby.example.com lagoon.sh/service-type: custom-ingress 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 6f345091..ecfde9c6 100644 --- a/test-resources/template-ingress/test11-results/content.example.com.yaml +++ b/test-resources/template-ingress/test11-results/content.example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: production lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: content-example-com lagoon.sh/service: content.example.com lagoon.sh/service-type: custom-ingress 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 4378214c..1f3b9f9b 100644 --- a/test-resources/template-ingress/test12-results/test1.example.com.yaml +++ b/test-resources/template-ingress/test12-results/test1.example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: test1.example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test13-results/example.com.yaml b/test-resources/template-ingress/test13-results/example.com.yaml index 26015585..b53adb5d 100644 --- a/test-resources/template-ingress/test13-results/example.com.yaml +++ b/test-resources/template-ingress/test13-results/example.com.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test14-results/example.com.yaml b/test-resources/template-ingress/test14-results/example.com.yaml index a84e825b..add5f795 100644 --- a/test-resources/template-ingress/test14-results/example.com.yaml +++ b/test-resources/template-ingress/test14-results/example.com.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: 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 a84e825b..add5f795 100644 --- a/test-resources/template-ingress/test15-results/example.com.yaml +++ b/test-resources/template-ingress/test15-results/example.com.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: 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 2658b879..e0441e20 100644 --- a/test-resources/template-ingress/test16-results/example.com.yaml +++ b/test-resources/template-ingress/test16-results/example.com.yaml @@ -29,7 +29,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test17-results/example.com.yaml b/test-resources/template-ingress/test17-results/example.com.yaml index 95dff4fe..bd6e004b 100644 --- a/test-resources/template-ingress/test17-results/example.com.yaml +++ b/test-resources/template-ingress/test17-results/example.com.yaml @@ -29,7 +29,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test18-results/example.com.yaml b/test-resources/template-ingress/test18-results/example.com.yaml index 721bda7c..e672bd8c 100644 --- a/test-resources/template-ingress/test18-results/example.com.yaml +++ b/test-resources/template-ingress/test18-results/example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test2-results/example.com.yaml b/test-resources/template-ingress/test2-results/example.com.yaml index 910ce5b3..dbab25cc 100644 --- a/test-resources/template-ingress/test2-results/example.com.yaml +++ b/test-resources/template-ingress/test2-results/example.com.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test3-results/example.com.yaml b/test-resources/template-ingress/test3-results/example.com.yaml index 910ce5b3..dbab25cc 100644 --- a/test-resources/template-ingress/test3-results/example.com.yaml +++ b/test-resources/template-ingress/test3-results/example.com.yaml @@ -26,7 +26,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test4-results/example.com.yaml b/test-resources/template-ingress/test4-results/example.com.yaml index 721bda7c..e672bd8c 100644 --- a/test-resources/template-ingress/test4-results/example.com.yaml +++ b/test-resources/template-ingress/test4-results/example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test5-results/multiproject1.com.yaml b/test-resources/template-ingress/test5-results/multiproject1.com.yaml index e4d99686..c3caafd5 100644 --- a/test-resources/template-ingress/test5-results/multiproject1.com.yaml +++ b/test-resources/template-ingress/test5-results/multiproject1.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: multiproject lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: multiproject1 lagoon.sh/service: multiproject1.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test6-results/multiproject2.com.yaml b/test-resources/template-ingress/test6-results/multiproject2.com.yaml index 0c0d6fbf..784d6c30 100644 --- a/test-resources/template-ingress/test6-results/multiproject2.com.yaml +++ b/test-resources/template-ingress/test6-results/multiproject2.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: multiproject lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: multiproject2 lagoon.sh/service: multiproject2.com lagoon.sh/service-type: custom-ingress diff --git a/test-resources/template-ingress/test7-results/example.com.yaml b/test-resources/template-ingress/test7-results/example.com.yaml index 721bda7c..e672bd8c 100644 --- a/test-resources/template-ingress/test7-results/example.com.yaml +++ b/test-resources/template-ingress/test7-results/example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: example.com lagoon.sh/service-type: custom-ingress 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 ae3b1082..58820438 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 @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: branch-routes lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: customdomain-will-be-main-domain.com lagoon.sh/service-type: custom-ingress 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 44e060cc..cf5103f5 100644 --- a/test-resources/template-ingress/test9-results/active.example.com.yaml +++ b/test-resources/template-ingress/test9-results/active.example.com.yaml @@ -25,7 +25,7 @@ metadata: lagoon.sh/buildType: branch lagoon.sh/environment: main lagoon.sh/environmentType: production - lagoon.sh/primaryingress: "true" + lagoon.sh/primaryIngress: "true" lagoon.sh/project: example-project lagoon.sh/service: active.example.com lagoon.sh/service-type: custom-ingress