Skip to content

Try to only include separators when necessary (#2766) #2767

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
merged 4 commits into from
Jul 15, 2022
Merged

Try to only include separators when necessary (#2766) #2767

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2dede6
Try to only include separators when necessary (#2766)
jsoref Jun 17, 2022
b0031bc
Merge branch 'main' into issue-2766
lucacome Jul 8, 2022
257de73
Merge branch 'main' into issue-2766
lucacome Jul 11, 2022
06128f3
Merge branch 'main' into issue-2766
ciarams87 Jul 15, 2022
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
35 changes: 26 additions & 9 deletions internal/k8s/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,53 +1509,70 @@ func (lbc *LoadBalancerController) updateMergeableIngressStatusAndEvents(ingConf
eventType := api_v1.EventTypeNormal
eventTitle := "AddedOrUpdated"
eventWarningMessage := ""
eventWarningSuffix := ""

if len(ingConfig.Warnings) > 0 {
eventType = api_v1.EventTypeWarning
eventTitle = "AddedOrUpdatedWithWarning"
eventWarningMessage = fmt.Sprintf("with warning(s): %s", formatWarningMessages(ingConfig.Warnings))
eventWarningSuffix = "; "
}

if messages, ok := warnings[ingConfig.Ingress]; ok {
eventType = api_v1.EventTypeWarning
eventTitle = "AddedOrUpdatedWithWarning"
eventWarningMessage = fmt.Sprintf("%s; with warning(s): %v", eventWarningMessage, formatWarningMessages(messages))
eventWarningMessage = fmt.Sprintf("%s%swith warning(s): %v", eventWarningMessage, eventWarningSuffix, formatWarningMessages(messages))
eventWarningSuffix = "; "
}

if operationErr != nil {
eventType = api_v1.EventTypeWarning
eventTitle = "AddedOrUpdatedWithError"
eventWarningMessage = fmt.Sprintf("%s; but was not applied: %v", eventWarningMessage, operationErr)
eventWarningMessage = fmt.Sprintf("%s%sbut was not applied: %v", eventWarningMessage, eventWarningSuffix, operationErr)
}

msg := fmt.Sprintf("Configuration for %v was added or updated %s", getResourceKey(&ingConfig.Ingress.ObjectMeta), eventWarningMessage)
eventWarningPrefixed := ""
if eventWarningMessage != "" {
eventWarningPrefixed = fmt.Sprintf(" %s", eventWarningMessage)
}

msg := fmt.Sprintf("Configuration for %v was added or updated%s", getResourceKey(&ingConfig.Ingress.ObjectMeta), eventWarningPrefixed)
lbc.recorder.Eventf(ingConfig.Ingress, eventType, eventTitle, msg)

for _, fm := range ingConfig.Minions {
minionEventType := api_v1.EventTypeNormal
minionEventTitle := "AddedOrUpdated"
minionEventWarningMessage := ""
minionEventWarningSuffix := ""

minionChangeWarnings := ingConfig.ChildWarnings[getResourceKey(&fm.Ingress.ObjectMeta)]

if len(minionChangeWarnings) > 0 {
minionEventType = api_v1.EventTypeWarning
minionEventTitle = "AddedOrUpdatedWithWarning"
minionEventWarningMessage = fmt.Sprintf("with warning(s): %s", formatWarningMessages(minionChangeWarnings))
minionEventWarningSuffix = "; "
}

if messages, ok := warnings[fm.Ingress]; ok {
minionEventType = api_v1.EventTypeWarning
minionEventTitle = "AddedOrUpdatedWithWarning"
minionEventWarningMessage = fmt.Sprintf("%s; with warning(s): %v", minionEventWarningMessage, formatWarningMessages(messages))
minionEventWarningMessage = fmt.Sprintf("%s%swith warning(s): %v", minionEventWarningMessage, minionEventWarningSuffix, formatWarningMessages(messages))
minionEventWarningSuffix = "; "
}

if operationErr != nil {
minionEventType = api_v1.EventTypeWarning
minionEventTitle = "AddedOrUpdatedWithError"
minionEventWarningMessage = fmt.Sprintf("%s; but was not applied: %v", minionEventWarningMessage, operationErr)
minionEventWarningMessage = fmt.Sprintf("%s%s; but was not applied: %v", minionEventWarningMessage, minionEventWarningSuffix, operationErr)
minionEventWarningSuffix = "; "
}

minionMsg := fmt.Sprintf("Configuration for %v/%v was added or updated %s", fm.Ingress.Namespace, fm.Ingress.Name, minionEventWarningMessage)
minionEventWarningPrefixed := ""
if minionEventWarningMessage != "" {
minionEventWarningPrefixed = fmt.Sprintf(" %s", minionEventWarningMessage)
}
minionMsg := fmt.Sprintf("Configuration for %v/%v was added or updated%s", fm.Ingress.Namespace, fm.Ingress.Name, minionEventWarningPrefixed)
lbc.recorder.Eventf(fm.Ingress, minionEventType, minionEventTitle, minionMsg)
}

Expand Down Expand Up @@ -1684,18 +1701,18 @@ func (lbc *LoadBalancerController) updateVirtualServerStatusAndEvents(vsConfig *
if messages, ok := warnings[vsr]; ok {
vsrEventType = api_v1.EventTypeWarning
vsrEventTitle = "AddedOrUpdatedWithWarning"
vsrEventWarningMessage = fmt.Sprintf("with warning(s): %v", formatWarningMessages(messages))
vsrEventWarningMessage = fmt.Sprintf(" with warning(s): %v", formatWarningMessages(messages))
vsrState = conf_v1.StateWarning
}

if operationErr != nil {
vsrEventType = api_v1.EventTypeWarning
vsrEventTitle = "AddedOrUpdatedWithError"
vsrEventWarningMessage = fmt.Sprintf("%s; but was not applied: %v", vsrEventWarningMessage, operationErr)
vsrEventWarningMessage = fmt.Sprintf(" %s; but was not applied:%v", vsrEventWarningMessage, operationErr)
vsrState = conf_v1.StateInvalid
}

msg := fmt.Sprintf("Configuration for %v/%v was added or updated %s", vsr.Namespace, vsr.Name, vsrEventWarningMessage)
msg := fmt.Sprintf("Configuration for %v/%v was added or updated%s", vsr.Namespace, vsr.Name, vsrEventWarningMessage)
lbc.recorder.Eventf(vsr, vsrEventType, vsrEventTitle, msg)

if lbc.reportCustomResourceStatusEnabled() {
Expand Down