refactor/fix: use primaryIngress as label name (#167)

uselagoon · Jan 5, 2023 · 9281bcb · 9281bcb
1 parent e1c7f8f
commit 9281bcb
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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