Commit Graph

26 Commits

Author SHA1 Message Date
openshift-ci[bot] a9fd30516c
Merge pull request #4169 from dfr/freebsd-stdio
Don't try to call runLabelStdioPipes if spec.Linux is not set
2022-08-08 05:49:46 +00:00
Doug Rabson fb6da9916a Don't try to call runLabelStdioPipes if spec.Linux is not set
On FreeBSD, the Linux section of the spec is not populated. FreeBSD does
have a similar labelling facility in its MAC framework but that would be
better managed via a future addition of a FreeBSD section to the runtime
spec rather than trying to make it look like Linux.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-08-05 09:35:59 +01:00
Nalin Dahyabhai bb149ea686 Use errors.Is() instead of os.Is{Not,}Exist
If errors for which os.IsExist() or os.IsNotExist() would have returned
true have been wrapped using fmt.Errorf()'s "%w" verb, os.IsExist() and
os.IsNotExist(), not having been retrofitted to use errors.Is(), will
return false.

Use errors.Is() to check if an error is an os.ErrExist or os.ErrNotExist
error instead of calling os.IsExist() or os.IsNotExist().

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-07-26 15:36:58 -04:00
Nalin Dahyabhai 0ded0dca23 Fix a copy/paste error message
When we fail to create the pipe we're using to signal a start, don't
complain about failing to create the creation pipe.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-07-26 11:05:01 -04:00
Nalin Dahyabhai 62954c89c0 Set user namespace defaults correctly for the library
Set the default for user namespaces correctly for callers that don't use
our CLI, e.g. OpenShift or our own tutorials.  When we don't do that,
commands invoked through RUN instructions can see weird things, in this
case an empty /sys/fs/cgroup directory.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-07-22 09:38:56 -04:00
Doug Rabson ad389b1943 Rename footypes to fooTypes for naming consistency
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson cdac8e1ba9 Move cleanupTempVolumes and cleanupRunMounts to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson 4b7c61d5da Make the various run mounts work for FreeBSD
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson 57a73847e4 Move get{Bind,Tmpfs,Secret,SSH}Mount to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson 0832ea2f35 Move runSetupRunMounts to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson 9c808c76ac Move cleanableDestinationListFromMounts to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson c21f4bd2f4 Make setupMounts and runSetupBuiltinVolumes work on FreeBSD
This involves handling the fact that FreeBSD containers don't have a
Linux section in the spec and that mounting filesystem directories is
done with nullfs rather than bind.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson cf079d017a Move setupMounts and runSetupBuiltinVolumes to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:22 +01:00
Doug Rabson 95a18737a6 Move runAcceptTerminal to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 1ab567151a Move stdio copying utilities to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson ba5ff64d1c Move runUsingRuntime and runCollectOutput to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson b290c86172 Move fileCloser, waitForSync and contains to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson bff1c193a3 Move checkAndOverrideIsolationOptions to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 75ae804029 Move DefaultNamespaceOptions to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson acdf4777aa Move getNetworkInterface to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 8e36f5fc9c Move configureEnvironment to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson f68f109234 Don't crash in configureUIDGID if Process.Capabilities is nil
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 7ea97716d7 Move configureUIDGID to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson a405d62cb4 Move runLookupPath to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 4d9a035e78 Move setupTerminal to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00
Doug Rabson 420107991b Move etc file generation utilities to run_common.go
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-07-12 09:14:21 +01:00