Skip to content
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.

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

Use '"' rather than '`' in the log to avoid unexpected new line #8281

Merged
merged 1 commit into from
Oct 9, 2024
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions pkg/backup/item_collector.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ func (nt *nsTracker) init(
for _, namespace := range unstructuredNSs {
if nt.singleLabelSelector != nil &&
nt.singleLabelSelector.Matches(labels.Set(namespace.GetLabels())) {
nt.logger.Debugf(`Track namespace %s,
because its labels match backup LabelSelector.`,
nt.logger.Debugf("Track namespace %s, because its labels match backup LabelSelector.",
namespace.GetName(),
)

Expand All @@ -128,8 +127,7 @@ func (nt *nsTracker) init(
if len(nt.orLabelSelector) > 0 {
for _, selector := range nt.orLabelSelector {
if selector.Matches(labels.Set(namespace.GetLabels())) {
nt.logger.Debugf(`Track namespace %s",
"because its labels match the backup OrLabelSelector.`,
nt.logger.Debugf("Track namespace %s, because its labels match the backup OrLabelSelector.",
namespace.GetName(),
)
nt.track(namespace.GetName())
Expand All @@ -148,8 +146,7 @@ func (nt *nsTracker) init(
}

if nt.namespaceFilter.ShouldInclude(namespace.GetName()) {
nt.logger.Debugf(`Track namespace %s,
because its name match the backup namespace filter.`,
nt.logger.Debugf("Track namespace %s, because its name match the backup namespace filter.",
namespace.GetName(),
)
nt.track(namespace.GetName())
Expand Down
3 changes: 1 addition & 2 deletions pkg/util/csi/volume_snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,7 @@ func GetVolumeSnapshotClassForStorageClass(
return &vsClass, nil
}
return nil, fmt.Errorf(
`failed to get VolumeSnapshotClass for provisioner %s,
ensure that the desired VolumeSnapshot class has the %s label`,
"failed to get VolumeSnapshotClass for provisioner %s, ensure that the desired VolumeSnapshot class has the %s label",
provisioner, velerov1api.VolumeSnapshotClassSelectorLabel)
}

Expand Down
Loading