Skip to content

Commit

Permalink
Revert "remove nosandbox default (#353)"
Browse files Browse the repository at this point in the history
This reverts commit e5e569c.
  • Loading branch information
jordan-rash committed Aug 16, 2024
1 parent c5899ff commit 884b1d7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion internal/models/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ type NodeOptions struct {
OutJSON bool `json:"-"`
NexusName string `json:"-"`

NoSandbox *bool `json:"-"`
NoSandbox bool `json:"-"`
Tags map[string]string `json:"-"`

Errors []error `json:"errors,omitempty"`
Expand Down
4 changes: 1 addition & 3 deletions internal/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -500,9 +500,7 @@ func (n *Node) loadNodeConfig() error {
n.config.OtelMetricsPort = n.nodeOpts.OtelMetricsPort
n.config.OtelTraces = n.nodeOpts.OtelTraces
n.config.OtelTracesExporter = n.nodeOpts.OtelTracesExporter
if n.nodeOpts.NoSandbox != nil {
n.config.NoSandbox = *n.nodeOpts.NoSandbox
}
n.config.NoSandbox = n.nodeOpts.NoSandbox
for k, v := range n.nodeOpts.Tags {
n.config.Tags[k] = v
}
Expand Down
2 changes: 1 addition & 1 deletion nex/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func setConditionalCommands() {
nodeUp.Flag("traces", "enable open telemetry traces").Default("false").UnNegatableBoolVar(&NodeOpts.OtelTraces)
nodeUp.Flag("otel_traces_exporter", "OTel exporter for traces").Default("file").EnumVar(&NodeOpts.OtelTracesExporter, "file", "grpc", "http")
nodeUp.Flag("nexus", "Name for cluster of nex nodes").Default("nexus").StringVar(&NodeOpts.NexusName)
nodeUp.Flag("no-sandbox", "Disable sandbox").Envar("NEX_NODE_NOSANDBOX").UnNegatableBoolVar(NodeOpts.NoSandbox)
nodeUp.Flag("no-sandbox", "Disable sandbox").Default("false").Envar("NEX_NODE_NOSANDBOX").UnNegatableBoolVar(&NodeOpts.NoSandbox)
nodeUp.Flag("tags", "Tags to apply to the node").Envar("NEX_NODE_TAGS").StringMapVar(&NodeOpts.Tags)

nodePreflight = nodes.Command("preflight", "Checks system for node requirements and installs missing")
Expand Down

0 comments on commit 884b1d7

Please sign in to comment.