openshift: 1.5.0 -> 3.6.0 #28345
openshift: 1.5.0 -> 3.6.0 #28345
Conversation
- Updated from 1.5.0 to 3.6.0 (this is just the next version, but Red Hat did quite the version bump there) - Added 'v' to the version; it is used by `oc cluster up` to determine which image should be downloaded. - Added myself as a maintainer.
|
@moretea, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bachp, @offlinehacker and @Mic92 to be potential reviewers. |
The command `oc cluster up` mainly runs code though Docker containers. However, in pkg/bootstrap/docker/host/host.go, nsenter is used to run some commands on the host. For this to work on NixOS, we need to provide the absolute path to the required programs.
|
@offlinehacker @bachp could you take a look? |
|
Changes look good to me. I never tried |
|
|
||
| substituteInPlace pkg/bootstrap/docker/host/host.go \ | ||
| --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ | ||
| 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mount' |
| }; | ||
|
|
||
| buildInputs = [ which ]; | ||
|
|
||
| goPackagePath = null; | ||
| patchPhase = '' | ||
| patchShebangs ./hack | ||
| substituteInPlace pkg/bootstrap/docker/host/host.go \ | ||
| --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ | ||
| 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' |
There was a problem hiding this comment.
Please also make replace nsenter with ${utillinux}/bin/nsenter
There was a problem hiding this comment.
That will break stuff! These nsenter's are run from within the openshift container. It enters the namespace of the host of the container, and then executes e.g. findmt, mount & mkdir in there.
|
I think that solves all of the issues. |
|
I only tested the |
|
It was broken before right? So maybe I should backport it to stable? |
|
@Mic92 The command line part, which is the only part I used so far was always working. At least I never had issues. On the other hand having 3.6.0 in stable would also be good :) |
Unfortunately,oc cluster upstill does not work after this update (but neither did it work on 1.5.0)oc cluster upto determine which image should be downloaded.Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
./result/bin/)