Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 36714b0

Browse files
authored
Merge pull request #39988 from microsoft/jjh/jjh-gocode
Remove refs to jhowardmsft from .go code Upstream-commit: 4e9cffae051a85e045d72f1fc048846edfb31db4 Component: engine
2 parents 92150df + b2189c8 commit 36714b0

File tree

12 files changed

+14
-16
lines changed

12 files changed

+14
-16
lines changed

components/engine/.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
builder/** @tonistiigi
77
contrib/mkimage/** @tianon
88
daemon/graphdriver/devmapper/** @rhvgoyal
9-
daemon/graphdriver/lcow/** @johnstep @jhowardmsft
9+
daemon/graphdriver/lcow/** @johnstep
1010
daemon/graphdriver/overlay/** @dmcgowan
1111
daemon/graphdriver/overlay2/** @dmcgowan
12-
daemon/graphdriver/windows/** @johnstep @jhowardmsft
12+
daemon/graphdriver/windows/** @johnstep
1313
daemon/logger/awslogs/** @samuelkarp
1414
hack/** @tianon
1515
plugin/** @cpuguy83

components/engine/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func (container *Container) WriteHostConfig() (*containertypes.HostConfig, error
257257

258258
// SetupWorkingDirectory sets up the container's working directory as set in container.Config.WorkingDir
259259
func (container *Container) SetupWorkingDirectory(rootIdentity idtools.Identity) error {
260-
// TODO @jhowardmsft, @gupta-ak LCOW Support. This will need revisiting.
260+
// TODO: LCOW Support. This will need revisiting.
261261
// We will need to do remote filesystem operations here.
262262
if container.OS != runtime.GOOS {
263263
return nil

components/engine/daemon/cluster/executor/container/adapter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error {
9797
pr, pw := io.Pipe()
9898
metaHeaders := map[string][]string{}
9999
go func() {
100-
// TODO @jhowardmsft LCOW Support: This will need revisiting as
100+
// TODO LCOW Support: This will need revisiting as
101101
// the stack is built up to include LCOW support for swarm.
102102
err := c.imageBackend.PullImage(ctx, c.container.image(), "", nil, metaHeaders, authConfig, pw)
103103
pw.CloseWithError(err)

components/engine/daemon/daemon_windows.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
201201
// On RS5, we allow (but don't strictly support) process isolation on Client SKUs.
202202
// Prior to RS5, we don't allow process isolation on Client SKUs.
203203
// @engine maintainers. This block should not be removed. It partially enforces licensing
204-
// restrictions on Windows. Ping @jhowardmsft if there are concerns or PRs to change this.
204+
// restrictions on Windows. Ping Microsoft folks if there are concerns or PRs to change this.
205205
if !hyperv && system.IsWindowsClient() && osv.Build < 17763 {
206206
return warnings, fmt.Errorf("Windows client operating systems earlier than version 1809 can only run Hyper-V containers")
207207
}
@@ -604,7 +604,7 @@ func (daemon *Daemon) setDefaultIsolation() error {
604604
osv := system.GetOSVersion()
605605

606606
// On client SKUs, default to Hyper-V. @engine maintainers. This
607-
// should not be removed. Ping @jhowardmsft is there are PRs to
607+
// should not be removed. Ping Microsoft folks is there are PRs to
608608
// to change this.
609609
if system.IsWindowsClient() {
610610
daemon.defaultIsolation = containertypes.Isolation("hyperv")
@@ -628,7 +628,7 @@ func (daemon *Daemon) setDefaultIsolation() error {
628628
if system.IsWindowsClient() && osv.Build < 17763 {
629629
// On RS5, we allow (but don't strictly support) process isolation on Client SKUs.
630630
// @engine maintainers. This block should not be removed. It partially enforces licensing
631-
// restrictions on Windows. Ping @jhowardmsft if there are concerns or PRs to change this.
631+
// restrictions on Windows. Ping Microsoft folks if there are concerns or PRs to change this.
632632
return fmt.Errorf("Windows client operating systems earlier than version 1809 can only run Hyper-V containers")
633633
}
634634
daemon.defaultIsolation = containertypes.Isolation("process")

components/engine/daemon/graphdriver/lcow/lcow.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// +build windows
22

3-
// Maintainer: jhowardmsft
43
// Locale: en-gb
54
// About: Graph-driver for Linux Containers On Windows (LCOW)
65
//

components/engine/daemon/graphdriver/windows/windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (d *Driver) Remove(id string) error {
286286
// in RS1 and RS2 building during enumeration when a silo is going away
287287
// for example under it, in HCS. AccessIsDenied added to fix 30278.
288288
//
289-
// TODO @jhowardmsft - For RS3, we can remove the retries. Also consider
289+
// TODO: For RS3, we can remove the retries. Also consider
290290
// using platform APIs (if available) to get this more succinctly. Also
291291
// consider enhancing the Remove() interface to have context of why
292292
// the remove is being called - that could improve efficiency by not

components/engine/daemon/oci_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func (daemon *Daemon) setWindowsCredentialSpec(c *container.Container, s *specs.
370370
}
371371

372372
// Sets the Linux-specific fields of the OCI spec
373-
// TODO: @jhowardmsft LCOW Support. We need to do a lot more pulling in what can
373+
// TODO: LCOW Support. We need to do a lot more pulling in what can
374374
// be pulled in from oci_linux.go.
375375
func (daemon *Daemon) createSpecLinuxFields(c *container.Container, s *specs.Spec) error {
376376
s.Root = &specs.Root{

components/engine/daemon/start_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
1515
return opts, nil
1616
}
1717

18-
// TODO @jhowardmsft (containerd) - Probably need to revisit LCOW options here
18+
// TODO (containerd) - Probably need to revisit LCOW options here
1919
// rather than blindly ignoring them.
2020

2121
// LCOW options.

components/engine/integration-cli/docker_cli_attach_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (s *DockerSuite) TestAttachMultipleAndRestart(c *testing.T) {
8989
}
9090

9191
func (s *DockerSuite) TestAttachTTYWithoutStdin(c *testing.T) {
92-
// TODO @jhowardmsft. Figure out how to get this running again reliable on Windows.
92+
// TODO: Figure out how to get this running again reliable on Windows.
9393
// It works by accident at the moment. Sometimes. I've gone back to v1.13.0 and see the same.
9494
// On Windows, docker run -d -ti busybox causes the container to exit immediately.
9595
// Obviously a year back when I updated the test, that was not the case. However,

components/engine/integration-cli/docker_cli_build_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func (s *DockerSuite) TestBuildCacheAdd(c *testing.T) {
390390
}
391391

392392
func (s *DockerSuite) TestBuildLastModified(c *testing.T) {
393-
// Temporary fix for #30890. TODO @jhowardmsft figure out what
393+
// Temporary fix for #30890. TODO: figure out what
394394
// has changed in the master busybox image.
395395
testRequires(c, DaemonIsLinux)
396396

@@ -1347,7 +1347,7 @@ func (s *DockerSuite) TestBuildWindowsWorkdirProcessing(c *testing.T) {
13471347
// One functional test for end-to-end
13481348
func (s *DockerSuite) TestBuildWindowsAddCopyPathProcessing(c *testing.T) {
13491349
testRequires(c, DaemonIsWindows)
1350-
// TODO Windows (@jhowardmsft). Needs a follow-up PR to 22181 to
1350+
// TODO Windows. Needs a follow-up PR to 22181 to
13511351
// support backslash such as .\\ being equivalent to ./ and c:\\ being
13521352
// equivalent to c:/. This is not currently (nor ever has been) supported
13531353
// by docker on the Windows platform.

0 commit comments

Comments
 (0)