Skip to content

OCPBUGS-98572: Tolerate unknown template fields during payload loading#1421

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
jhadvig:backport-template-tolerance
Jul 13, 2026
Merged

OCPBUGS-98572: Tolerate unknown template fields during payload loading#1421
openshift-merge-bot[bot] merged 1 commit into
openshift:release-4.22from
jhadvig:backport-template-tolerance

Conversation

@jhadvig

@jhadvig jhadvig commented Jul 9, 2026

Copy link
Copy Markdown
Member

Summary

  • Make template rendering errors non-fatal during LoadUpdate
  • When the CVO encounters a manifest with unknown template fields, skip it with a warning instead of failing the entire payload load

Why

Backport of the tolerance logic from PR #1410 (5.0). Without this, 4.22→5.0 major upgrades are blocked: the 4.22 CVO tries to render 5.0 manifests that use {{index .Images "..."}}, fails because .Images doesn't exist in the 4.22 manifestRenderConfig, and sets ReleaseAccepted=False.

With this fix, the 4.22 CVO skips unrenderable manifests with a warning. The new 5.0 CVO re-loads the full payload after it replaces the old one at run-level 0, correctly rendering all manifests.

This was one of two issues that caused the revert of CVO#1398 and blocked 5.0 nightly payloads for 69+ hours (TRT-2776).

Test plan

  • New unit test TestLoadUpdateSkipsUnknownTemplateFields verifies manifests with unknown template fields are skipped while valid manifests are loaded
  • CI passes

🤖 Generated with Claude Code

Make template rendering errors non-fatal during LoadUpdate. When an
older CVO binary loads a newer payload that uses template fields the
older binary does not know about (e.g. .Images added in 5.0), the
manifest is skipped with a warning instead of failing the entire
payload load. The new CVO binary will re-load the full payload after
it replaces the old one at run-level 0.

Without this fix, 4.22→5.0 major upgrades fail with
ReleaseAccepted=False because the 4.22 CVO cannot render 5.0
manifests that reference .Images.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 9, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@jhadvig: This pull request references OTA-2064 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

  • Make template rendering errors non-fatal during LoadUpdate
  • When the CVO encounters a manifest with unknown template fields, skip it with a warning instead of failing the entire payload load

Why

Backport of the tolerance logic from PR #1410 (5.0). Without this, 4.22→5.0 major upgrades are blocked: the 4.22 CVO tries to render 5.0 manifests that use {{index .Images "..."}}, fails because .Images doesn't exist in the 4.22 manifestRenderConfig, and sets ReleaseAccepted=False.

With this fix, the 4.22 CVO skips unrenderable manifests with a warning. The new 5.0 CVO re-loads the full payload after it replaces the old one at run-level 0, correctly rendering all manifests.

This was one of two issues that caused the revert of CVO#1398 and blocked 5.0 nightly payloads for 69+ hours (TRT-2776).

Test plan

  • New unit test TestLoadUpdateSkipsUnknownTemplateFields verifies manifests with unknown template fields are skipped while valid manifests are loaded
  • CI passes

🤖 Generated with Claude Code

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.

@coderabbitai

coderabbitai Bot commented Jul 9, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: adb9f24a-dd15-42f5-ba19-74eb661ddcfc

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci

openshift-ci Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@jhadvig: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@wking wking left a comment

Copy link
Copy Markdown
Member

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 Jul 13, 2026
@openshift-ci

openshift-ci Bot commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, wking

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@wking

wking commented Jul 13, 2026

Copy link
Copy Markdown
Member

/label backport-risk-assessed

@openshift-ci openshift-ci Bot added 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. labels Jul 13, 2026
@jhadvig jhadvig changed the title OTA-2064: Tolerate unknown template fields during payload loading OCPBUGS-98572: Tolerate unknown template fields during payload loading Jul 13, 2026
@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 Jul 13, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@jhadvig: This pull request references Jira Issue OCPBUGS-98572, which is invalid:

  • expected the bug to target the "4.22.0" version, but no target version was set
  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-98572 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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.

Details

In response to this:

Summary

  • Make template rendering errors non-fatal during LoadUpdate
  • When the CVO encounters a manifest with unknown template fields, skip it with a warning instead of failing the entire payload load

Why

Backport of the tolerance logic from PR #1410 (5.0). Without this, 4.22→5.0 major upgrades are blocked: the 4.22 CVO tries to render 5.0 manifests that use {{index .Images "..."}}, fails because .Images doesn't exist in the 4.22 manifestRenderConfig, and sets ReleaseAccepted=False.

With this fix, the 4.22 CVO skips unrenderable manifests with a warning. The new 5.0 CVO re-loads the full payload after it replaces the old one at run-level 0, correctly rendering all manifests.

This was one of two issues that caused the revert of CVO#1398 and blocked 5.0 nightly payloads for 69+ hours (TRT-2776).

Test plan

  • New unit test TestLoadUpdateSkipsUnknownTemplateFields verifies manifests with unknown template fields are skipped while valid manifests are loaded
  • CI passes

🤖 Generated with Claude Code

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.

@jhadvig

jhadvig commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@jhadvig: This pull request references Jira Issue OCPBUGS-98572, which is invalid:

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.

Details

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.

@jhadvig

jhadvig commented Jul 13, 2026

Copy link
Copy Markdown
Member Author

/jira refresh
/verified by CI

@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 Jul 13, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@jhadvig: This pull request references Jira Issue OCPBUGS-98572, 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.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-98573 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-98573 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

In response to this:

/jira refresh
/verified by CI

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-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 13, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@jhadvig: This PR has been marked as verified by CI.

Details

In response to this:

/jira refresh
/verified by CI

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-merge-bot
openshift-merge-bot Bot merged commit 9b55234 into openshift:release-4.22 Jul 13, 2026
19 checks passed
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@jhadvig: Jira Issue Verification Checks: Jira Issue OCPBUGS-98572
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-98572 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Summary

  • Make template rendering errors non-fatal during LoadUpdate
  • When the CVO encounters a manifest with unknown template fields, skip it with a warning instead of failing the entire payload load

Why

Backport of the tolerance logic from PR #1410 (5.0). Without this, 4.22→5.0 major upgrades are blocked: the 4.22 CVO tries to render 5.0 manifests that use {{index .Images "..."}}, fails because .Images doesn't exist in the 4.22 manifestRenderConfig, and sets ReleaseAccepted=False.

With this fix, the 4.22 CVO skips unrenderable manifests with a warning. The new 5.0 CVO re-loads the full payload after it replaces the old one at run-level 0, correctly rendering all manifests.

This was one of two issues that caused the revert of CVO#1398 and blocked 5.0 nightly payloads for 69+ hours (TRT-2776).

Test plan

  • New unit test TestLoadUpdateSkipsUnknownTemplateFields verifies manifests with unknown template fields are skipped while valid manifests are loaded
  • CI passes

🤖 Generated with Claude Code

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-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.22.0-0.nightly-2026-07-14-080922

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants