Skip to content

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Aug 5, 2025

Fixes rendering of tolerations that do not include a key/value.
Ref: OCPBUGS-60126

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Aug 5, 2025
@openshift-ci-robot
Copy link
Contributor

@csrwng: This pull request references Jira Issue OCPBUGS-60126, which is invalid:

  • expected the bug to target the "4.20.0" version, but no target version was set

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:

Fixes rendering of tolerations that do not include a key/value.
Ref: OCPBUGS-60126

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 review from pperiyasamy and ricky-rav August 5, 2025 10:28
@csrwng
Copy link
Contributor Author

csrwng commented Aug 5, 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 5, 2025
@openshift-ci-robot
Copy link
Contributor

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @anuragthehatter

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 anuragthehatter August 5, 2025 10:30
@kyrtapz
Copy link
Contributor

kyrtapz commented Aug 7, 2025

@csrwng what was the failure? Is the yaml marshaller failing to output a correct yaml?
I am not a huge fan of having to parse the tolerations... Swapping the yaml parser to sigs.k8s.io/yaml seems to be giving more promising results but maybe we can simplify it even further considering we parse annotations from a string to then marshall it back to a yaml...

@csrwng
Copy link
Contributor Author

csrwng commented Aug 13, 2025

@kyrtapz so what was happening is that we were doing the serialization in one shot for all tolerations, and then removing any lines that contained nil or empty string value. So for a no key/value toleration, the initial serialization looked something like:

- key: ""
  operator: Exists
  value: ""

Then we removed the lines with empty strings, and ended up with only:

  operator: Exists

which is not valid YAML list syntax

@csrwng
Copy link
Contributor Author

csrwng commented Aug 13, 2025

I simply changed serialization to a single toleration at a time, instead of the entire slice, and prepending the proper '- ' before each entry.

Fixes rendering of tolerations that do not include a key/value.
@csrwng csrwng force-pushed the fix_hcp_tolerations branch from 63516a1 to ceacbf8 Compare August 27, 2025 16:32
Copy link
Contributor

openshift-ci bot commented Aug 27, 2025

@csrwng: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6 63516a1 link false /test e2e-vsphere-ovn-dualstack-primaryv6
ci/prow/security ceacbf8 link false /test security
ci/prow/e2e-aws-hypershift-ovn-kubevirt ceacbf8 link false /test e2e-aws-hypershift-ovn-kubevirt
ci/prow/4.20-upgrade-from-stable-4.19-e2e-azure-ovn-upgrade ceacbf8 link false /test 4.20-upgrade-from-stable-4.19-e2e-azure-ovn-upgrade
ci/prow/verify-deps ceacbf8 link true /test verify-deps
ci/prow/4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade ceacbf8 link false /test 4.20-upgrade-from-stable-4.19-e2e-aws-ovn-upgrade
ci/prow/e2e-openstack-ovn ceacbf8 link false /test e2e-openstack-ovn
ci/prow/4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade ceacbf8 link false /test 4.20-upgrade-from-stable-4.19-e2e-gcp-ovn-upgrade
ci/prow/e2e-vsphere-ovn ceacbf8 link false /test e2e-vsphere-ovn
ci/prow/e2e-vsphere-ovn-dualstack ceacbf8 link false /test e2e-vsphere-ovn-dualstack
ci/prow/e2e-metal-ipi-ovn-dualstack-bgp ceacbf8 link true /test e2e-metal-ipi-ovn-dualstack-bgp
ci/prow/e2e-aws-ovn-upgrade ceacbf8 link true /test e2e-aws-ovn-upgrade
ci/prow/e2e-metal-ipi-ovn-dualstack-bgp-local-gw ceacbf8 link true /test e2e-metal-ipi-ovn-dualstack-bgp-local-gw
ci/prow/e2e-aws-ovn-serial ceacbf8 link false /test e2e-aws-ovn-serial
ci/prow/e2e-network-mtu-migration-ovn-ipv4 ceacbf8 link false /test e2e-network-mtu-migration-ovn-ipv4
ci/prow/e2e-aws-ovn-single-node ceacbf8 link false /test e2e-aws-ovn-single-node

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.

@kyrtapz
Copy link
Contributor

kyrtapz commented Aug 28, 2025

/lgtm

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

openshift-ci bot commented Aug 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng, kyrtapz

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-bot
Copy link
Contributor

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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

@openshift-bot: This pull request references Jira Issue OCPBUGS-60126, which is invalid:

  • expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "4.20.0" 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.

In response to this:

/jira refresh

The requirements for Jira bugs have changed (Jira issues linked to PRs on main branch need to target different OCP), recalculating validity.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/invalid-bug Indicates that a referenced Jira bug is invalid 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
Development

Successfully merging this pull request may close these issues.

4 participants