Skip to content
Snippets Groups Projects
Commit 2b0d7d7e authored by Francisco Borges Aurindo Barros's avatar Francisco Borges Aurindo Barros
Browse files

Revert "Remove ip_whitelist functionality from Operator" 

This reverts commit e584708e.
parent e584708e
No related branches found
No related tags found
No related merge requests found
Pipeline #5531231 passed
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
controllers/drupalsite_resources.go
+ 3
− 0
View file @ 2b0d7d7e
...@@ -1257,6 +1257,9 @@ func routeForDrupalSite(currentobject *routev1.Route, d *webservicesv1a1.DrupalS ...@@ -1257,6 +1257,9 @@ func routeForDrupalSite(currentobject *routev1.Route, d *webservicesv1a1.DrupalS
currentobject.Labels[k] = v currentobject.Labels[k] = v
} }
if _, exists := d.Annotations["haproxy.router.openshift.io/ip_whitelist"]; exists {
currentobject.Annotations["haproxy.router.openshift.io/ip_whitelist"] = d.Annotations["haproxy.router.openshift.io/ip_whitelist"]
}
// Set timeout to 60sec: https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/642 // Set timeout to 60sec: https://gitlab.cern.ch/webservices/webframeworks-planning/-/issues/642
currentobject.Annotations["haproxy.router.openshift.io/timeout"] = "200s" currentobject.Annotations["haproxy.router.openshift.io/timeout"] = "200s"
currentobject.Spec.Host = Url currentobject.Spec.Host = Url
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment