Merge pull request #198 from Deydra71/httpd-config

openshift-merge-bot[bot] · web-flow · commit ffbe4b44312c · 2025-01-14T10:51:37.000Z
Update the route timeout webhook reference
diff --git a/api/v1beta1/barbican_webhook.go b/api/v1beta1/barbican_webhook.go
@@ -229,7 +229,7 @@ func (spec *BarbicanSpecCore) GetDefaultRouteAnnotations() (annotations map[stri
 }
 
 // SetDefaultRouteAnnotations sets HAProxy timeout values for Barbican API routes
-func (spec *BarbicanAPITemplateCore) SetDefaultRouteAnnotations(annotations map[string]string) {
+func (spec *BarbicanSpecCore) SetDefaultRouteAnnotations(annotations map[string]string) {
 	const haProxyAnno = "haproxy.router.openshift.io/timeout"
 	// Use a custom annotation to flag when the operator has set the default HAProxy timeout
 	// With the annotation func determines when to overwrite existing HAProxy timeout with the APITimeout

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func (spec *BarbicanSpecCore) GetDefaultRouteAnnotations() (annotations map[stri`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`// SetDefaultRouteAnnotations sets HAProxy timeout values for Barbican API routes`
`232`		`-func (spec *BarbicanAPITemplateCore) SetDefaultRouteAnnotations(annotations map[string]string) {`
	`232`	`+func (spec *BarbicanSpecCore) SetDefaultRouteAnnotations(annotations map[string]string) {`
`233`	`233`	`const haProxyAnno = "haproxy.router.openshift.io/timeout"`
`234`	`234`	`// Use a custom annotation to flag when the operator has set the default HAProxy timeout`
`235`	`235`	`// With the annotation func determines when to overwrite existing HAProxy timeout with the APITimeout`