Skip to content

Change Route Annotation method name and argument for spec <JIRA: OSPRH-10958> #519

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

Merged
openshift-merge-bot merged 1 commit into from
Feb 28, 2025
Merged

Change Route Annotation method name and argument for spec <JIRA: OSPRH-10958> #519

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
4 changes: 2 additions & 2 deletions api/v1beta1/ironic_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ func (spec *IronicSpecCore) ValidateIronicTopology(basePath *field.Path, namespa
}

// SetDefaultRouteAnnotations sets HAProxy timeout values of the route
func (spec *IronicAPISpec) SetDefaultRouteAnnotations(annotations map[string]string) {
func (spec *IronicSpecCore) 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
// The annotation func determines when to overwrite existing HAProxy timeout with the APITimeout
Expand All @@ -684,7 +684,7 @@ func (spec *IronicAPISpec) SetDefaultRouteAnnotations(annotations map[string]str
}

// SetDefaultRouteAnnotations sets HAProxy timeout values of the route
func (spec *IronicInspectorSpec) SetDefaultRouteAnnotations(annotations map[string]string) {
func (spec *IronicSpecCore) SetDefaultInspectorRouteAnnotations(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
// The annotation func determines when to overwrite existing HAProxy timeout with the APITimeout
Expand Down