Skip to content

feature: Promote gRPC UpdateService to v1 #581

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
frhuelsz merged 2 commits into from
Apr 1, 2026
Merged

feature: Promote gRPC UpdateService to v1 #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3577705
Promote UpdateService
frhuelsz Mar 27, 2026
ce7d1f5
Fix tool build.
frhuelsz Mar 31, 2026
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
24 changes: 13 additions & 11 deletions crates/trident/src/grpc_client/tridentclient.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,20 @@ use url::Url;

use trident_proto::v1::{
servicing_response::Response as ResponseBody, streaming_service_client::StreamingServiceClient,
version_service_client::VersionServiceClient, RebootHandling as ProtoRebootHandling,
RebootManagement, RebootStatus, ServicingResponse, StatusCode, StreamDiskRequest,
VersionRequest,
update_service_client::UpdateServiceClient, version_service_client::VersionServiceClient,
RebootHandling as ProtoRebootHandling, RebootManagement, RebootStatus, ServicingResponse,
StatusCode, StreamDiskRequest, VersionRequest,
};

#[cfg(feature = "grpc-preview")]
use trident_proto::v1::HostConfiguration;
#[cfg(feature = "grpc-preview")]
use trident_proto::v1preview::{
commit_service_client::CommitServiceClient, install_service_client::InstallServiceClient,
rebuild_raid_service_client::RebuildRaidServiceClient,
rollback_service_client::RollbackServiceClient, status_service_client::StatusServiceClient,
update_service_client::UpdateServiceClient, validation_service_client::ValidationServiceClient,
CommitRequest, FinalizeInstallRequest, HostConfiguration, InstallRequest, StageInstallRequest,
validation_service_client::ValidationServiceClient, CommitRequest, FinalizeInstallRequest,
InstallRequest, StageInstallRequest,
};

use crate::ExitKind;
Expand Down Expand Up @@ -55,14 +58,14 @@ impl From<RebootHandling> for i32 {
pub struct TridentClient {
version_client: VersionServiceClient<Channel>,
streaming_client: StreamingServiceClient<Channel>,

#[expect(dead_code)]
update_client: UpdateServiceClient<Channel>,

#[cfg(feature = "grpc-preview")]
install_client: InstallServiceClient<Channel>,
#[cfg(feature = "grpc-preview")]
commit_client: CommitServiceClient<Channel>,

#[expect(dead_code)]
#[cfg(feature = "grpc-preview")]
update_client: UpdateServiceClient<Channel>,
#[expect(dead_code)]
#[cfg(feature = "grpc-preview")]
rollback_client: RollbackServiceClient<Channel>,
Expand Down Expand Up @@ -99,8 +102,6 @@ impl TridentClient {
#[cfg(feature = "grpc-preview")]
commit_client: CommitServiceClient::new(channel.clone()),
#[cfg(feature = "grpc-preview")]
update_client: UpdateServiceClient::new(channel.clone()),
#[cfg(feature = "grpc-preview")]
rollback_client: RollbackServiceClient::new(channel.clone()),
#[cfg(feature = "grpc-preview")]
rebuild_raid_client: RebuildRaidServiceClient::new(channel.clone()),
Expand All @@ -110,6 +111,7 @@ impl TridentClient {
validation_client: ValidationServiceClient::new(channel.clone()),

// Prod clients
update_client: UpdateServiceClient::new(channel.clone()),
version_client: VersionServiceClient::new(channel.clone()),
streaming_client: StreamingServiceClient::new(channel),
})
Expand Down
22 changes: 12 additions & 10 deletions crates/trident/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ use tonic::transport::Server;
use tonic_middleware::MiddlewareFor;

use trident_proto::v1::{
streaming_service_server::StreamingServiceServer, version_service_server::VersionServiceServer,
streaming_service_server::StreamingServiceServer, update_service_server::UpdateServiceServer,
version_service_server::VersionServiceServer,
};

#[cfg(feature = "grpc-preview")]
use trident_proto::v1preview::{
commit_service_server::CommitServiceServer, install_service_server::InstallServiceServer,
rebuild_raid_service_server::RebuildRaidServiceServer,
rollback_service_server::RollbackServiceServer, status_service_server::StatusServiceServer,
update_service_server::UpdateServiceServer, validation_service_server::ValidationServiceServer,
validation_service_server::ValidationServiceServer,
};

use crate::{
Expand Down Expand Up @@ -209,10 +210,15 @@ async fn server_main_inner(
activity_tracker.middleware(),
));

router = router.add_service(MiddlewareFor::new(
StreamingServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
));
router = router
.add_service(MiddlewareFor::new(
StreamingServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
))
.add_service(MiddlewareFor::new(
UpdateServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
));

#[cfg(feature = "grpc-preview")]
{
Expand All @@ -233,10 +239,6 @@ async fn server_main_inner(
StatusServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
))
.add_service(MiddlewareFor::new(
UpdateServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
))
.add_service(MiddlewareFor::new(
ValidationServiceServer::from_arc(trident_server.clone()),
activity_tracker.middleware(),
Expand Down
3 changes: 1 addition & 2 deletions crates/trident/src/server/tridentserver/services/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use trident_proto::v1::{RebootHandling, RebootManagement};
use crate::server::tridentserver::RebootDecision;

mod streaming;
mod update;
mod version;

#[cfg(feature = "grpc-preview")]
Expand All @@ -16,8 +17,6 @@ mod rollback;
#[cfg(feature = "grpc-preview")]
mod status;
#[cfg(feature = "grpc-preview")]
mod update;
#[cfg(feature = "grpc-preview")]
mod validation;

/// Returns a `RebootDecision` indicating whether Trident can perform a reboot
Expand Down
2 changes: 1 addition & 1 deletion crates/trident/src/server/tridentserver/services/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use trident_api::{
config::{HostConfigurationSource, Operation, Operations},
error::TridentResultExt,
};
use trident_proto::v1preview::{
use trident_proto::v1::{
update_service_server::UpdateService, FinalizeUpdateRequest, StageUpdateRequest, UpdateRequest,
};

Expand Down
2 changes: 1 addition & 1 deletion proto/trident/v1preview/host_config.proto → proto/trident/v1/host_config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

syntax = "proto3";

package trident.v1preview;
package trident.v1;

message HostConfiguration {
// The Host Configuration YAML.
Expand Down
12 changes: 6 additions & 6 deletions proto/trident/v1preview/update_service.proto → proto/trident/v1/update_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

syntax = "proto3";

package trident.v1preview;
package trident.v1;

import "trident/v1/servicing.proto";
import "trident/v1preview/host_config.proto";
import "trident/v1/host_config.proto";

// UpdateService provides methods for performing OS updates.
service UpdateService {
// Update performs an OS update.
rpc Update(UpdateRequest) returns (stream trident.v1.ServicingResponse);
rpc Update(UpdateRequest) returns (stream ServicingResponse);

// UpdateStage performs the stage operation of an OS update.
rpc UpdateStage(StageUpdateRequest) returns (stream trident.v1.ServicingResponse);
rpc UpdateStage(StageUpdateRequest) returns (stream ServicingResponse);

// UpdateFinalize performs the finalize operation of an OS update.
rpc UpdateFinalize(FinalizeUpdateRequest) returns (stream trident.v1.ServicingResponse);
rpc UpdateFinalize(FinalizeUpdateRequest) returns (stream ServicingResponse);
}

message UpdateRequest {
Expand All @@ -33,5 +33,5 @@ message StageUpdateRequest {

message FinalizeUpdateRequest {
// Reboot handling configuration.
trident.v1.RebootManagement reboot = 1;
RebootManagement reboot = 1;
}
4 changes: 2 additions & 2 deletions proto/trident/v1preview/install_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ syntax = "proto3";
package trident.v1preview;

import "trident/v1/servicing.proto";
import "trident/v1preview/host_config.proto";
import "trident/v1/host_config.proto";

// InstallService provides methods for performing OS installations.
service InstallService {
Expand All @@ -28,7 +28,7 @@ message InstallRequest {

message StageInstallRequest {
// The target Host Configuration.
HostConfiguration config = 1;
trident.v1.HostConfiguration config = 1;
}

message FinalizeInstallRequest {
Expand Down
4 changes: 2 additions & 2 deletions proto/trident/v1preview/status_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package trident.v1preview;

import "trident/v1/error.proto";
import "trident/v1/servicing.proto";
import "trident/v1preview/host_config.proto";
import "trident/v1/host_config.proto";

// StatusService provides methods for retrieving the status of the host and
// various operations.
Expand All @@ -32,7 +32,7 @@ message GetConfigRequest {}

message GetConfigResponse {
// The Host Configuration content as a string.
HostConfiguration config = 1;
trident.v1.HostConfiguration config = 1;
}

message GetLastErrorRequest {}
Expand Down
6 changes: 3 additions & 3 deletions proto/trident/v1preview/validation_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package trident.v1preview;

import "trident/v1/error.proto";
import "trident/v1/servicing.proto";
import "trident/v1preview/host_config.proto";
import "trident/v1/host_config.proto";

// ValidationService provides methods for performing configuration validations.
service ValidationService {
Expand All @@ -20,7 +20,7 @@ service ValidationService {

message ValidateHostConfigurationRequest {
// The Host Configuration to be validated.
HostConfiguration config = 1;
trident.v1.HostConfiguration config = 1;
}

message ValidateHostConfigurationResponse {
Expand All @@ -44,7 +44,7 @@ enum ServicingType {

message GetRequiredServicingTypeRequest {
// The target Host Configuration.
HostConfiguration config = 1;
trident.v1.HostConfiguration config = 1;
}

message GetRequiredServicingTypeResponse {
Expand Down
2 changes: 1 addition & 1 deletion tools/pkg/netlaunch/netlaunch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ func doGrpcInstall(ctx context.Context, conn net.Conn, hostConfiguration string)

stream, err := tridentClient.Install(ctx, &tridentpbv1preview.InstallRequest{
Stage: &tridentpbv1preview.StageInstallRequest{
Config: &tridentpbv1preview.HostConfiguration{
Config: &tridentpbv1.HostConfiguration{
Config: hostConfiguration,
},
},
Expand Down
Loading