[openshift-4.18] Libreswan adjustments #7182
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
This change aims to do two things: - Start listening for changs when libreswan sees an update This can happen now libreswan is not pinned anymore - Get an annotation in the consistency checks if rhcos and ovn have different versions for libreswan. ovn-miicroshift is not yet needed (cherry-picked from commit 48c1d3a) [i.maximets] Conflicts resolved due to previous PRs: * openshift-eng#6940 * openshift-eng#6736
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: joepvd The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
openshift-merge-bot
bot
merged commit 3666566
into
openshift-eng:openshift-4.18
2 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Manual port of the #6490 due to conflicting previously merged PRs:
This change aims to do two things:
(cherry-picked from commit 48c1d3a)
The libreswan package was un-pinned in 4.18 ovn-k via openshift/ovn-kubernetes#2593 (relevant diff).
CC: @joepvd