Skip to content

Commit

Permalink
Merge pull request #2382 from leelavg/revert-5205
Browse files Browse the repository at this point in the history
Revert "Send provider operator version in client heartbeat"
  • Loading branch information
openshift-merge-bot[bot] authored Jan 10, 2024
2 parents 2f5a5cd + 3f93f83 commit b0f1699
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 74 deletions.
119 changes: 53 additions & 66 deletions services/provider/pb/provider.pb.go

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

4 changes: 1 addition & 3 deletions services/provider/proto/provider.proto
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,4 @@ message ReportStatusRequest{
string clientOperatorVersion = 3;
}

message ReportStatusResponse{
string desiredClientOperatorVersion = 1;
}
message ReportStatusResponse{}
6 changes: 1 addition & 5 deletions services/provider/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -688,9 +688,5 @@ func (s *OCSProviderServer) ReportStatus(ctx context.Context, req *pb.ReportStat
return nil, status.Errorf(codes.Internal, "Failed to update lastHeartbeat payload in the storageConsumer resource: %v", err)
}

// trims X.Y.Z -> X.Y, version value is set during build time, so no additional checks are required
desiredVerison := ocsVersion.Version[0:strings.LastIndex(ocsVersion.Version, ".")]
return &pb.ReportStatusResponse{
DesiredClientOperatorVersion: desiredVerison,
}, nil
return &pb.ReportStatusResponse{}, nil
}

0 comments on commit b0f1699

Please sign in to comment.