Skip to content

Commit 6979c88

Browse files
author
Aalyria Technologies, Inc
committed
Import changes.
- b16f226c6c36b64dd1216c6a69e38aeb7dd4f499 GitOrigin-RevId: b16f226c6c36b64dd1216c6a69e38aeb7dd4f499
1 parent a923bcd commit 6979c88

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

agent/enactment_service.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"aalyria.com/spacetime/agent/internal/channels"
3232
"aalyria.com/spacetime/agent/internal/loggable"
3333
"aalyria.com/spacetime/agent/internal/task"
34-
apipb "aalyria.com/spacetime/api/common"
3534
schedpb "aalyria.com/spacetime/api/scheduling/v1alpha"
3635
)
3736

@@ -43,11 +42,10 @@ const attemptedUpdateKeepAliveTimeout = 1 * time.Minute
4342
func OK() *status.Status { return status.New(codes.OK, "") }
4443

4544
type enactmentService struct {
46-
sc schedpb.SchedulingClient
47-
ed enactment.Driver
48-
clock clockwork.Clock
49-
initState *apipb.ControlPlaneState
50-
nodeID string
45+
sc schedpb.SchedulingClient
46+
ed enactment.Driver
47+
clock clockwork.Clock
48+
nodeID string
5149

5250
scheduleManipulationToken string
5351
schedMgr *scheduleManager
@@ -63,7 +61,6 @@ func (nc *nodeController) newEnactmentService(sc schedpb.SchedulingClient, ed en
6361
sc: sc,
6462
clock: nc.clock,
6563
nodeID: nc.id,
66-
initState: nc.initState,
6764
scheduleManipulationToken: manipToken,
6865
schedMgr: newScheduleManager(),
6966
reqsFromController: make(chan *schedpb.ReceiveRequestsMessageFromController),

agent/internal/configpb/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ proto_library(
2121
name = "configpb_proto",
2222
srcs = ["config.proto"],
2323
deps = [
24-
"//api/common:common_proto",
2524
"@protobuf//:any_proto",
2625
"@protobuf//:duration_proto",
2726
"@protobuf//:empty_proto",
@@ -32,7 +31,4 @@ go_proto_library(
3231
name = "configpb_go_proto",
3332
importpath = "aalyria.com/spacetime/agent/internal/configpb",
3433
proto = ":configpb_proto",
35-
deps = [
36-
"//api/common:common_go_proto",
37-
],
3834
)

agent/internal/configpb/config.proto

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package aalyria.spacetime.agent.cmd.agent;
2121
import "google/protobuf/duration.proto";
2222
import "google/protobuf/empty.proto";
2323
import "google/protobuf/any.proto";
24-
import "api/common/control.proto";
2524

2625
option go_package = "aalyria.com/spacetime/agent/internal/configpb";
2726

@@ -155,9 +154,7 @@ message SdnAgent {
155154

156155
oneof type {
157156
// Use an external command to process enactments. The command will
158-
// receive a ScheduledControlUpdate message over standard input. The
159-
// command may optionally write a new ControlPlaneState message to
160-
// standard out.
157+
// receive a CreateEntryRequest message over standard input.
161158
ExternalCommand external_command = 2;
162159

163160
// Use the Linux-only netlink APIs to process enactments.
@@ -219,7 +216,7 @@ message ObservabilityParams {
219216
string otel_collector_endpoint = 1;
220217
// Whether to connect to the OTEL gRPC collector over a plaintext (insecure)
221218
// connection. Corresponds to the "WithInsecure" exporter option
222-
// https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc#WithInsecure
219+
// https://pkg.go.dev/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc#WithInsecure
223220
bool use_insecure_connection_for_otel_collector = 4;
224221

225222
// Channelz is a gRPC introspection service that can aid in debugging and

0 commit comments

Comments
 (0)