fixup: review changes

Author: tehut

client/client.go

@@ -1629,9 +1629,8 @@ func (c *Client) setupNode() error {
 		node.Meta[envoy.DefaultTransparentProxyOutboundPortParam] = envoy.DefaultTransparentProxyOutboundPort
 	}
 	// Set NodeMaxAllocs before dynamic configuration is set
-	if newConfig.NodeMaxAllocs != 0 {
-		node.NodeMaxAllocs = newConfig.NodeMaxAllocs
-	}
+	node.NodeMaxAllocs = newConfig.NodeMaxAllocs
+
 	// Since node.Meta will get dynamic metadata merged in, save static metadata
 	// here.
 	c.metaStatic = maps.Clone(node.Meta)

command/agent/agent.go

@@ -787,9 +787,7 @@ func convertClientConfig(agentConfig *Config) (*clientconfig.Config, error) {
 	if agentConfig.Client.NetworkInterface != "" {
 		conf.NetworkInterface = agentConfig.Client.NetworkInterface
 	}
-	if agentConfig.Client.NodeMaxAllocs != 0 {
-		conf.NodeMaxAllocs = agentConfig.Client.NodeMaxAllocs
-	}
+	conf.NodeMaxAllocs = agentConfig.Client.NodeMaxAllocs
 
 	// handle rpc yamux configuration
 	conf.RPCSessionConfig = yamux.DefaultConfig()

command/agent/test-resources/client_with_maxallocs.hcl

@@ -1,7 +1,7 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-client {
-  enabled         = true
-  node_max_allocs = 5
-}
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: BUSL-1.1
+
+client {
+  enabled         = true
+  node_max_allocs = 5
+}

command/agent/test-resources/client_with_maxallocs.json

@@ -1,6 +1,6 @@
 {
-  "client": {
-    "enabled": true,
-    "node_max_allocs": 5
-  }
-}
+	"client": {
+		"enabled": true,
+		"node_max_allocs": 5
+	}
+}\n

scheduler/rank_test.go

@@ -2144,9 +2144,9 @@ func TestBinPackIterator_MaxAlloc(t *testing.T) {
 		ClientStatus:       structs.AllocClientStatusPending,
 		TaskGroup:          "web",
 	}
-	require.NoError(t, state.UpsertJobSummary(998, mock.JobSummary(alloc1.JobID)))
-	require.NoError(t, state.UpsertJobSummary(999, mock.JobSummary(alloc2.JobID)))
-	require.NoError(t, state.UpsertAllocs(structs.MsgTypeTestSetup, 1000, []*structs.Allocation{alloc1, alloc2}))
+	must.NoError(t, state.UpsertJobSummary(998, mock.JobSummary(alloc1.JobID)))
+	must.NoError(t, state.UpsertJobSummary(999, mock.JobSummary(alloc2.JobID)))
+	must.NoError(t, state.UpsertAllocs(structs.MsgTypeTestSetup, 1000, []*structs.Allocation{alloc1, alloc2}))
 
 	testCases := []struct {
 		name          string

website/content/docs/commands/node/status.mdx

@@ -276,7 +276,7 @@ Time                  Subsystem       Message
 
 
 Allocated Resources
-CPU           Memory           Disk              Alloc Count
+CPU            Memory           Disk               Alloc Count
 2500/2600 MHz  1.3 GiB/2.0 GiB  1.5 GiB/32 GiB     5/50
 
 Allocation Resource Utilization

website/content/docs/configuration/client.mdx

@@ -113,8 +113,8 @@ client {
   where [variable interpolation][runtime_var_interpolation] is supported.
 
 - `node_max_allocs` `(int: 0)` - Specifies the maximum number of allocations
-  allowed on a client node and is not enforced if unset.  This value can be
-  seen in `nomad node status` under Allocated Resources.
+  that may be scheduled on a client node and is not enforced if unset. This
+  value can be seen in `nomad node status` under Allocated Resources.
 
 - `node_pool` `(string: "default")` - Specifies the node pool in which the
   client is registered. If the node pool does not exist yet, it will be created