merging master commits #2203
Closed
merging master commits #2203
Conversation
This file contains 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
The value of ZTP_BUILD_IMAGE and ZTP_RUNTIME_IMAGE will be overriden by Konflux, sharing this Containerfile with upstream
…, and domainNumber fields Signed-off-by: Jim Ramsay <jramsay@redhat.com>
ztp: modify ztp Containerfile for Konflux migration...
ztp: OCPBUGS-48088: Add monitoring label for openshift-logging ns
OCPBUGS-47784: ztp: reference: Enable user customization of PTP priority1, priority2, and domainNumber fields
This commit removes the `-w` option from T-GM ptp configuration. The option became obsolete in this configuration after the following upstream patches were introduced to the linuxptp project: https://lists.nwtime.org/sympa/arc/linuxptp-devel/2024-11/msg00026.html Signed-off-by: Vitaly Grinberg <vgrinber@redhat.com>
OCPBUGS-48803: [4.19] ztp: remove phc2sys -w option
…, and domainNumber fields Part 2: Include the phc2sys '-n' option for domainNumber, as well as all configs missed in the 1st commit. Signed-off-by: Jim Ramsay <jramsay@redhat.com>
OCPBUGS-47784: ztp: reference: Enable user customization of PTP priority1, priority2, and domainNumber fields
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: rauhersu The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
closed, will test a cherrypick first |
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.
No description provided.