Use CRI-O’s pause_image_auth_file option #540
Merged
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
openshift-ci-robot
added
the
size/M
Contributor
|
cc: @cgwalters - Thoughts? |
Member
|
Thanks Miloslav for putting this up so quickly. Context here is that the symlink option is a stopgap but CRI-O added an option to directly speficy the Auth file to look for when pulling the pause image. |
Member
|
What I did to test the other PR was to create a separate PR with a test commit. Cherry picking this commit onto another PR should be enough to get a good test. |
mtrmac
force-pushed
the
pause_image_auth_file
branch
from
d2eb549 to
142b068
Compare
Closed
openshift-ci-robot
added
the
needs-rebase
... to include ImageConfig.PauseImageAuthFile, so that updateCRIOConfig does not remove the value. Signed-off-by: Miloslav Trmač <[email protected]>
mtrmac
force-pushed
the
pause_image_auth_file
branch
from
142b068 to
4e82446
Compare
openshift-ci-robot
removed
the
needs-rebase
The path is hard-coded here as well as in the templates that create the file, in templates/*/00-*/_base/files/pull-secret.yaml . Signed-off-by: Miloslav Trmač <[email protected]>
This reverts commit 8b08dfb. We now configure CRI-O to use the Kubelet's path explicitly, so this symlink should no longer be necessary. Signed-off-by: Miloslav Trmač <[email protected]>
Contributor
Author
|
/retest |
1 similar comment
Contributor
|
/retest |
Member
|
/approve OK based on the results in #542 this |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, mtrmac The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
runcom
added a commit
to runcom/machine-config-operator
that referenced
this pull request
Mar 26, 2019
This PR is further fixing https://bugzilla.redhat.com/show_bug.cgi?id=1677198 by allowing an old cluster to contain links (coming from openshift#535) which are then removed when upgrading to post openshift#540. What's happening to QE is that: 1) they're starting a cluster with an MCO version which contains openshift#535 2) they're upgrading to a payload which doesn't have openshift#535 cause it has openshift#540 which reverts openshift#535 The above means that point 1) generates MachineConfigs with an unsupported symlink and when upgrading to 2), the symlink is removed causing drift and an unreconcilable error. QE can start testing with a newer MCO version to avoid this, but for ease of testing, let's add this snippet to make sure getting rid of links, which we don't support anyway, just works. Signed-off-by: Antonio Murdaca <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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.
- What I did
Replaced the symlink added in #535 with using a CRI-O config option introduced by
cri-o/cri-o#2115 .
Note that this requires CRI-O ≥ 1.12.9 / ≥ 1.13.2 .
- How to verify it
I hope the CI will do that? I honestly have no idea what I am doing.
All I verified was that the unit tests work (with updates to the expected results).
- Description for the changelog