Skip to content

Commit 6822b1d

Browse files
backport of commit 5f5b34d (#20114)
Co-authored-by: carrychair <137268757+carrychair@users.noreply.github.com>
1 parent c44c308 commit 6822b1d

File tree

14 files changed

+17
-17
lines changed

14 files changed

+17
-17
lines changed

api/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ func cloneWithTimeout(httpClient *http.Client, t time.Duration) (*http.Client, e
435435
return &nc, nil
436436
}
437437

438-
// ConfigureTLS applies a set of TLS configurations to the the HTTP client.
438+
// ConfigureTLS applies a set of TLS configurations to the HTTP client.
439439
func ConfigureTLS(httpClient *http.Client, tlsConfig *TLSConfig) error {
440440
if tlsConfig == nil {
441441
return nil

api/csi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ type CSISnapshotCreateResponse struct {
507507
}
508508

509509
// CSISnapshotListRequest is a request to a controller plugin to list all the
510-
// snapshot known to the the storage provider. This request is paginated by
510+
// snapshot known to the storage provider. This request is paginated by
511511
// the plugin and accepts the QueryOptions.PerPage and QueryOptions.NextToken
512512
// fields
513513
type CSISnapshotListRequest struct {

client/allocrunner/network_manager_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func newNetworkManager(alloc *structs.Allocation, driverManager drivermanager.Ma
4747
// to do extra work
4848
driverCaps := make(map[string]struct{})
4949
for _, task := range tg.Tasks {
50-
// the task's netmode defaults to the the task group but can be overridden
50+
// the task's netmode defaults to the task group but can be overridden
5151
taskNetMode := tgNetMode
5252
if len(task.Resources.Networks) > 0 && task.Resources.Networks[0].Mode != "" {
5353
taskNetMode = task.Resources.Networks[0].Mode

client/allocrunner/tasklifecycle/coordinator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ func TestCoordinator_PoststartStartsAfterMain(t *testing.T) {
374374
// Only use the tasks that we care about.
375375
tasks = []*structs.Task{mainTask, sideTask, postTask}
376376

377-
// Make the the third task is a poststart hook
377+
// Make the third task is a poststart hook
378378
postTask.Lifecycle.Hook = structs.TaskLifecycleHookPoststart
379379

380380
shutdownCh := make(chan struct{})

command/alloc_stop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Stop Specific Options:
4242
eval-status command.
4343
4444
-no-shutdown-delay
45-
Ignore the the group and task shutdown_delay configuration so there is no
45+
Ignore the group and task shutdown_delay configuration so there is no
4646
delay between service deregistration and task shutdown. Note that using
4747
this flag will result in failed network connections to the allocation
4848
being stopped.

drivers/shared/capabilities/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func LegacySupported() *Set {
135135
//
136136
// The task will drop any capabilities specified in cap_drop, and add back
137137
// capabilities specified in cap_add. The task will not be allowed to add capabilities
138-
// not set in the the allow_caps setting (which by default is the same as the basis).
138+
// not set in the allow_caps setting (which by default is the same as the basis).
139139
//
140140
// cap_add takes precedence over cap_drop, enabling the common pattern of dropping
141141
// all capabilities, then adding back the desired smaller set. e.g.

drivers/shared/executor/executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ type ExecCommand struct {
142142
// Mounts are the host paths to be be made available inside rootfs
143143
Mounts []*drivers.MountConfig
144144

145-
// Devices are the the device nodes to be created in isolation environment
145+
// Devices are the device nodes to be created in isolation environment
146146
Devices []*drivers.DeviceConfig
147147

148148
// NetworkIsolation is the network isolation configuration.

nomad/csi_endpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ func (v *CSIVolume) lookupExternalNodeID(vol *structs.CSIVolume, claim *structs.
992992
return "", fmt.Errorf("%s: %s", structs.ErrUnknownNodePrefix, claim.NodeID)
993993
}
994994

995-
// get the the storage provider's ID for the client node (not
995+
// get the storage provider's ID for the client node (not
996996
// Nomad's ID for the node)
997997
targetCSIInfo, ok := targetNode.CSINodePlugins[vol.PluginID]
998998
if !ok || targetCSIInfo.NodeInfo == nil {

nomad/structs/csi.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ type CSIVolumeListResponse struct {
967967
}
968968

969969
// CSIVolumeExternalListRequest is a request to a controller plugin to list
970-
// all the volumes known to the the storage provider. This request is
970+
// all the volumes known to the storage provider. This request is
971971
// paginated by the plugin and accepts the QueryOptions.PerPage and
972972
// QueryOptions.NextToken fields
973973
type CSIVolumeExternalListRequest struct {
@@ -1055,7 +1055,7 @@ type CSISnapshotDeleteResponse struct {
10551055
}
10561056

10571057
// CSISnapshotListRequest is a request to a controller plugin to list all the
1058-
// snapshot known to the the storage provider. This request is paginated by
1058+
// snapshot known to the storage provider. This request is paginated by
10591059
// the plugin and accepts the QueryOptions.PerPage and QueryOptions.NextToken
10601060
// fields
10611061
type CSISnapshotListRequest struct {

nomad/vault.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const (
7676

7777
var (
7878
// vaultCapabilitiesCapability is the expected capability of Nomad's Vault
79-
// token on the the path. The token must have at least one of the
79+
// token on the path. The token must have at least one of the
8080
// capabilities.
8181
vaultCapabilitiesCapability = []string{"update", "root"}
8282

@@ -95,12 +95,12 @@ var (
9595
// the capabilities.
9696
vaultTokenRevokeCapability = []string{"update", "root"}
9797

98-
// vaultRoleLookupCapability is the the expected capability Nomad's Vault
98+
// vaultRoleLookupCapability is the expected capability Nomad's Vault
9999
// token should have on the path. The token must have at least one of the
100100
// capabilities.
101101
vaultRoleLookupCapability = []string{"read", "root"}
102102

103-
// vaultTokenRoleCreateCapability is the the expected capability Nomad's Vault
103+
// vaultTokenRoleCreateCapability is the expected capability Nomad's Vault
104104
// token should have on the path. The token must have at least one of the
105105
// capabilities.
106106
vaultTokenRoleCreateCapability = []string{"update", "root"}

plugins/device/proto/device.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/device/proto/device.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ message ReserveRequest {
9292
}
9393

9494
// ReserveResponse informs Nomad how to expose the requested devices
95-
// to the the task.
95+
// to the task.
9696
message ReserveResponse {
9797
// container_res contains information on how to mount the device
9898
// into a task isolated using container technologies (where the

plugins/drivers/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
var _ plugin.GRPCPlugin = &PluginDriver{}
1818

1919
// PluginDriver wraps a DriverPlugin and implements go-plugins GRPCPlugin
20-
// interface to expose the the interface over gRPC
20+
// interface to expose the interface over gRPC
2121
type PluginDriver struct {
2222
plugin.NetRPCUnsupportedPlugin
2323
impl DriverPlugin

scheduler/benchmarks/helpers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package benchmarks
55

66
// Test helper functions for running scheduling tests and benchmarks
77
// against real world state snapshots or data directories. These live
8-
// here and not in the the parent scheduler package because it would
8+
// here and not in the parent scheduler package because it would
99
// create circular imports between the scheduler and raftutils package
1010
// (via the nomad package)
1111

0 commit comments

Comments
 (0)