Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor/fix: use primaryIngress as label name #167

Merged
merged 1 commit into from
Jan 5, 2023
Merged

refactor/fix: use primaryIngress as label name #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internal/generator/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/templating/ingress/templates_ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/templating/ingress/test-resources/result-active-standby1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/templating/ingress/test-resources/result-custom-ingress1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test1-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test10-results/standby.example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test11-results/content.example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test12-results/test1.example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test13-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test14-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test15-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test16-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test17-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test18-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test2-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test3-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test4-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test5-results/multiproject1.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test6-results/multiproject2.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test7-results/example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test8-results/customdomain-will-be-main-domain.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test-resources/template-ingress/test9-results/active.example.com.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down