Skip to content

Commit

Permalink
Update offline installer to ignore comments in the manifests.
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigobassil committed Aug 29, 2024
1 parent ce10648 commit 6e863d9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion service/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ func (s *service) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsReque
// Process the source snapshots and make CSI Snapshot
entries, err := s.getCSISnapshots(snaps, req.SourceVolumeId, protocol, arrayID)
if err != nil {
return nil, status.Error(codes.Unknown, utils.GetMessageWithRunID(rid, err.Error()))
return nil, status.Error(codes.Unknown, utils.GetMessageWithRunID(rid, "%s", err.Error()))
}
log.Debugf("ListSnapshot successful for snapid: [%s]", req.SnapshotId)
return &csi.ListSnapshotsResponse{
Expand Down
4 changes: 2 additions & 2 deletions service/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,12 @@ func (s *service) NodeUnstageVolume(
// Get the device mounts
dev, err := GetDevice(ctx, devicePath)
if err != nil {
return nil, status.Error(codes.Internal, utils.GetMessageWithRunID(rid, err.Error()))
return nil, status.Error(codes.Internal, utils.GetMessageWithRunID(rid, "%s", err.Error()))
}
log.Debug("Rechecking dev mounts")
mnts, err := getDevMounts(ctx, dev)
if err != nil {
return nil, status.Error(codes.Internal, utils.GetMessageWithRunID(rid, err.Error()))
return nil, status.Error(codes.Internal, utils.GetMessageWithRunID(rid, "%s", err.Error()))
}
if len(mnts) > 0 {
return nil, status.Error(codes.Internal, utils.GetMessageWithRunID(rid, "Device mounts still present after unmounting target and staging mounts %#v", mnts))
Expand Down

0 comments on commit 6e863d9

Please sign in to comment.