Allow Origin PR builds in master to inject kubelet into rhcos #2747
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
openshift/origin#21919 is a prerequisite for this merging. |
Contributor
Author
|
@cgwalters this is approximately what the final job will look like. I need to test more extensively. |
Member
|
/retest |
Member
|
We probably should do https://github.com/openshift/release/issues/2750 before this. |
Member
|
And in order to actually use this we'll need to land the MCO work: openshift/machine-config-operator#355 |
smarterclayton
force-pushed
the
inject_into_rhcos
branch
from
3afeb19 to
2a5bddd
Compare
smarterclayton
force-pushed
the
inject_into_rhcos
branch
from
2a5bddd to
245023e
Compare
Member
|
/retest |
The machine-os-content image is injected into our CI stream containing a snapshot of recent openshift projects (kubelet, crio, oc). To ensure we are testing what we merge, this PR adds a new layer job to origin that takes the current machine-os-content image and uses it as input to a special layering Dockerfile defined in origin which injects the version of the kubelet and oc binaries from the PR build. The machine-os-content image is then overriden in stable, but is not promoted using the new exclusion rule in openshift/ci-operator#254. This will be the model for crio or any other RPM that doesn't require special boot time changes (like ignition or the kernel would). However, this allows us to test upgrades like they will actually happen in the wild. This will be merged after the ci-operator change, and after the dockerfile merges to origin, but before the machine-config-operator starts respecting the payload image (and causes reboots when machine start up).
smarterclayton
force-pushed
the
inject_into_rhcos
branch
from
245023e to
af597f1
Compare
Contributor
Author
|
/test all |
smarterclayton
added
lgtm
smarterclayton
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The machine-os-content image is injected into our CI stream containing
a snapshot of recent openshift projects (kubelet, crio, oc). To ensure
we are testing what we merge, this PR adds a new layer job to origin
that takes the current machine-os-content image and uses it as input
to a special layering Dockerfile defined in origin which injects the
version of the kubelet and oc binaries from the PR build. The
machine-os-content image is then overriden in stable, but is not
promoted using the new exclusion rule in openshift/ci-operator#254.
This will be the model for crio or any other RPM that doesn't
require special boot time changes (like ignition or the kernel would).
However, this allows us to test upgrades like they will actually
happen in the wild.
This will be merged after the ci-operator change, and after the
dockerfile merges to origin, but before the machine-config-operator
starts respecting the payload image (and causes reboots when
machine start up).