Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 13 additions & 4 deletions apis/condition_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func (r conditionsImpl) MarkTrueWithReason(t ConditionType, reason, messageForma
Type: t,
Status: corev1.ConditionTrue,
Reason: reason,
Message: fmt.Sprintf(messageFormat, messageA...),
Message: formatMessage(messageFormat, messageA...),
Severity: r.severity(t),
})
r.recomputeHappiness(t)
Expand Down Expand Up @@ -357,7 +357,7 @@ func (r conditionsImpl) MarkUnknown(t ConditionType, reason, messageFormat strin
Type: t,
Status: corev1.ConditionUnknown,
Reason: reason,
Message: fmt.Sprintf(messageFormat, messageA...),
Message: formatMessage(messageFormat, messageA...),
Severity: r.severity(t),
})

Expand Down Expand Up @@ -385,7 +385,7 @@ func (r conditionsImpl) MarkUnknown(t ConditionType, reason, messageFormat strin
Type: r.happy,
Status: corev1.ConditionUnknown,
Reason: reason,
Message: fmt.Sprintf(messageFormat, messageA...),
Message: formatMessage(messageFormat, messageA...),
Severity: r.severity(r.happy),
})
}
Expand All @@ -405,7 +405,7 @@ func (r conditionsImpl) MarkFalse(t ConditionType, reason, messageFormat string,
Type: t,
Status: corev1.ConditionFalse,
Reason: reason,
Message: fmt.Sprintf(messageFormat, messageA...),
Message: formatMessage(messageFormat, messageA...),
Severity: r.severity(t),
})
}
Expand Down Expand Up @@ -448,3 +448,12 @@ func (r conditionsImpl) initializeTerminalCondition(t ConditionType, status core
r.SetCondition(c)
return &c
}

// formatMessage handles message provided as format string to avoid "non-constant format string in call" error
func formatMessage(messageFormat string, messageA ...interface{}) string {
if len(messageA) > 0 {
return fmt.Sprintf(messageFormat, messageA...)
}
// no additional message provided, fallback to default formatting
return fmt.Sprintf("%s", messageFormat)
}
5 changes: 5 additions & 0 deletions apis/duck/enqueue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,11 @@ func (fsii *fakeSharedIndexInformer) HasSynced() bool {
return false
}

func (fsii *fakeSharedIndexInformer) HasSyncedChecker() cache.DoneChecker {
fsii.t.Fatalf("NYI: HasSyncedChecker")
return nil
}

func (fsii *fakeSharedIndexInformer) LastSyncResourceVersion() string {
fsii.t.Fatalf("NYI: LastSyncResourceVersion")
return ""
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading