Skip to content

[release-4.17] OCPBUGS-60193: Allow duplicate options in ptpconfig #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Aug 28, 2025
Merged

[release-4.17] OCPBUGS-60193: Allow duplicate options in ptpconfig #478

merged 2 commits into from
Aug 28, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #474

/assign josephdrichard

@josephdrichard
Allow duplicate keys in ptpconfig
dcd4a43 
When initially designing PTP config parsing, there was an assumption
that for each section, all of the keys were unique.  Based on this
assumption, key:value pairs for a given section were stored as a
map[string][string].

With the introduction of unicast_master_table, this assumption is no
longer true, as in the case of the UDPv4 key, there can be multiple
entries with the same key.  As such, the config data structure is
changed to maintain a list of individual key:value pairs, rather than a
map of keys to values.

In addition, some restructuring was done for places that relied on the
pre-existing structure, moving most of that functionality to utility
functions in config.go
@josephdrichard
masterOnly 0 under [global] section shouldn't affect clockType
84a96cd
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 6, 2025
Merged
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-60037 has been cloned as Jira Issue OCPBUGS-60193. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-60193: Allow duplicate options in ptpconfig

In response to this:

This is an automated cherry-pick of #474

/assign josephdrichard

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.17] OCPBUGS-60037: Allow duplicate options in ptpconfig [release-4.17] OCPBUGS-60193: Allow duplicate options in ptpconfig Aug 6, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 6, 2025
@openshift-ci openshift-ci bot requested review from dougbtv and vitus133 August 6, 2025 16:58
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 6, 2025
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-60193, which is invalid:

  • expected dependent Jira Issue OCPBUGS-60037 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #474

/assign josephdrichard

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@aneeshkp
Copy link
Contributor

aneeshkp commented Aug 7, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 7, 2025
@openshift-ci-robot
Copy link
Contributor

@aneeshkp: This pull request references Jira Issue OCPBUGS-60193, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-60037 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-60037 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

Requesting review from QA contact:
/cc @yliu127

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from yliu127 August 7, 2025 14:12
@aneeshkp
Copy link
Contributor

aneeshkp commented Aug 7, 2025

/test unit-test

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 7, 2025

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jzding
Copy link
Contributor

jzding commented Aug 28, 2025

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Aug 28, 2025
jzding
jzding approved these changes Aug 28, 2025
View reviewed changes
Copy link
Contributor

@jzding jzding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 28, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Aug 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jzding, openshift-cherrypick-robot

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit d2f66e7 into openshift:release-4.17 Aug 28, 2025
6 checks passed
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-60193: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-60193 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #474

/assign josephdrichard

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@josephdrichard
Copy link
Contributor

/cherrypick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@josephdrichard: #478 failed to apply on top of branch "release-4.16":

Applying: Allow duplicate keys in ptpconfig
Using index info to reconstruct a base tree...
M	pkg/daemon/config.go
M	pkg/daemon/daemon.go
M	pkg/daemon/metrics.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/daemon/metrics.go
Auto-merging pkg/daemon/daemon.go
CONFLICT (content): Merge conflict in pkg/daemon/daemon.go
Auto-merging pkg/daemon/config.go
CONFLICT (content): Merge conflict in pkg/daemon/config.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Allow duplicate keys in ptpconfig

In response to this:

/cherrypick release-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: linuxptp-daemon
This PR has been included in build ose-linuxptp-daemon-container-v4.17.0-202508300039.p0.gd2f66e7.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbtv dougbtv Awaiting requested review from dougbtv

@vitus133 vitus133 Awaiting requested review from vitus133

@yliu127 yliu127 Awaiting requested review from yliu127

1 more reviewer

@jzding jzding jzding approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@gsr-shanks gsr-shanks

@josephdrichard josephdrichard

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@asood-rh asood-rh

@jechen0648 jechen0648

@obochan-rh obochan-rh

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.