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

Jump to bottom

Return empty path for termination passthrough #773

Merged
merged 4 commits into from Jun 12, 2022
Merged

Return empty path for termination passthrough #773

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f5aa70
Return empty path for temrination passthrough
mosuke5 Jun 8, 2022
92d1420
Use openshift api liberary
mosuke5 Jun 11, 2022
4fe66d7
Merge branch 'master' into fix/route-termination-passthrough
HubertStefanski Jun 12, 2022
1d6e31f
Merge branch 'master' into fix/route-termination-passthrough
HubertStefanski Jun 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions controllers/model/grafanaRoute.go
View file
Open in desktop
Expand Up @@ -21,6 +21,10 @@ func GetPath(cr *v1alpha1.Grafana) string {
return "/"
}

if cr.Spec.Ingress.Termination == "passthrough" {
return ""
}

Copy link
Collaborator

@weisdd weisdd Jun 10, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if cr.Spec.Ingress.Termination == "passthrough" {
return ""
}
if cr.Spec.Ingress.Termination == v1.TLSTerminationPassthrough {
return ""
}

I think it should rather rely on the value that's provided by the github.com/openshift/api/route/v1 library :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weisdd Thank you for your review. I fixed it.

if cr.Spec.Ingress.Path == "" {
return "/"
}
Expand Down