Skip to content

[release-4.18] OCPBUGS-77368: Fix ignition-server pod restarts#7878

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.18from
jparrill:bp418/OCPBUGS-77368
Mar 10, 2026
Merged

[release-4.18] OCPBUGS-77368: Fix ignition-server pod restarts#7878
openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.18from
jparrill:bp418/OCPBUGS-77368

Conversation

@jparrill
Copy link
Copy Markdown
Contributor

@jparrill jparrill commented Mar 6, 2026

Backport

This is a manual backport of #7858 to release-4.18.

The automatic cherry-pick failed due to conflicts which have been resolved manually.

Original PR

Changes

  • Remove mirroredReleaseImage parameter and its inline computation (SeekOverride, pullSecret fetch) from the ignition server reconciliation in hostedcontrolplane_controller.go
  • Remove mirroredReleaseImage parameter from ReconcileIgnitionServer and reconcileDeployment signatures
  • Remove LookupMappedImage-based registry override computation that performed live HTTP registry checks causing non-deterministic results
  • Remove MIRRORED_RELEASE_IMAGE env var from reconcileDeployment
  • Use static registryOverrides from ReleaseProvider directly instead of dynamically-discovered mirror mappings
  • Clean up unused imports (common, registryclient)

Backport adaptations

  • In 4.19, mirroredReleaseImage was obtained via r.ReleaseProvider.GetMirroredReleaseImage() (1 line). In 4.18, it was computed inline (~15 lines: pullSecret fetch, SeekOverride, image comparison). Both removed with the same effect.
  • Adapted util.LabelHCPRoutes() to local labelHCPRoutes() function (release-4.18 uses the local version)

Jira


🤖 Generated with /hypershift-backport command via Claude Code

@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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 Mar 6, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: This pull request references Jira Issue OCPBUGS-77368, which is invalid:

  • expected dependent Jira Issue OCPBUGS-77367 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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.

Details

In response to this:

Backport

This is a manual backport of #7858 to release-4.18.

The automatic cherry-pick failed due to conflicts which have been resolved manually.

Original PR

Changes

  • Remove MIRRORED_RELEASE_IMAGE env var from CPOv1 ignition-server reconcileDeployment
  • Remove mirroredReleaseImage parameter from ReconcileIgnitionServer and reconcileDeployment signatures
  • Remove LookupMappedImage-based registry override computation that performed live HTTP registry checks causing non-deterministic results
  • Use static registryOverrides from ReleaseProvider directly
  • Clean up unused imports (common, registryclient)
  • Remove unused go:generate mockgen directive

Backport adaptations

  • Adapted util.LabelHCPRoutes() to local labelHCPRoutes() function (release-4.18 uses the local version)
  • Removed //go:generate mockgen directive from sync-global-pullsecret.go (gomock not used in release-4.18)

Jira

Verification

  • make build: PASSED
  • make test: PASSED
  • make verify: PASSED

Assisted-by: Claude (via 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
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Mar 6, 2026

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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 7ac4bd88-e594-49ba-8d34-3bb23d29b51f

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
  • Post copyable unit tests in a comment

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 6, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill

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

@openshift-ci openshift-ci bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Mar 6, 2026
@jparrill jparrill changed the title OCPBUGS-77368: [release-4.18] Fix ignition-server pod restarts [release-4.18] OCPBUGS-77368: Fix ignition-server pod restarts Mar 6, 2026
@xiuwang
Copy link
Copy Markdown

xiuwang commented Mar 8, 2026

/verified by @xiuwang

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 8, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@xiuwang: This PR has been marked as verified by @xiuwang.

Details

In response to this:

/verified by @xiuwang

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.

@jparrill
Copy link
Copy Markdown
Contributor Author

jparrill commented Mar 9, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: This pull request references Jira Issue OCPBUGS-77368, which is invalid:

  • expected dependent Jira Issue OCPBUGS-77367 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST 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.

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.

@jparrill
Copy link
Copy Markdown
Contributor Author

jparrill commented Mar 9, 2026

/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 Mar 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: This pull request references Jira Issue OCPBUGS-77368, 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.18.z) matches configured target version for branch (4.18.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-77367 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-77367 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

Requesting review from QA contact:
/cc @xiuwang

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.

@openshift-ci openshift-ci bot requested a review from xiuwang March 9, 2026 08:23
kubeletConfigJsonPath string
}

//go:generate ../hack/tools/bin/mockgen -destination=sync-global-pullsecret_mock.go -package=syncglobalpullsecret . dbusConn
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.

how is this change related to this PR?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ohh it's not related, but the tag was there, claude figure it out that is not necessary. I can put it back but I think we are not using mockgen in this branch

// Only set MIRRORED_RELEASE_IMAGE if we're using a mirror
if effectiveImage != controlPlaneReleaseImage {
mirroredReleaseImage = effectiveImage
if !r.IsCPOV2 {
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.

why does this backport requires introducing the IsCPOV2 check?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nope I don't think so.

@jparrill jparrill force-pushed the bp418/OCPBUGS-77368 branch from efdf7e3 to 68e01ac Compare March 9, 2026 08:56
@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Mar 9, 2026
@jparrill jparrill force-pushed the bp418/OCPBUGS-77368 branch from 68e01ac to 3b05fc8 Compare March 9, 2026 09:56
@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: This pull request references Jira Issue OCPBUGS-77368, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, 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-77367 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-77367 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.z
  • bug has dependents

Requesting review from QA contact:
/cc @xiuwang

Details

In response to this:

Backport

This is a manual backport of #7858 to release-4.18.

The automatic cherry-pick failed due to conflicts which have been resolved manually.

Original PR

Changes

  • Remove mirroredReleaseImage parameter and its inline computation (SeekOverride, pullSecret fetch) from the ignition server reconciliation in hostedcontrolplane_controller.go
  • Remove mirroredReleaseImage parameter from ReconcileIgnitionServer and reconcileDeployment signatures
  • Remove LookupMappedImage-based registry override computation that performed live HTTP registry checks causing non-deterministic results
  • Remove MIRRORED_RELEASE_IMAGE env var from reconcileDeployment
  • Use static registryOverrides from ReleaseProvider directly instead of dynamically-discovered mirror mappings
  • Clean up unused imports (common, registryclient)

Backport adaptations

  • In 4.19, mirroredReleaseImage was obtained via r.ReleaseProvider.GetMirroredReleaseImage() (1 line). In 4.18, it was computed inline (~15 lines: pullSecret fetch, SeekOverride, image comparison). Both removed with the same effect.
  • Adapted util.LabelHCPRoutes() to local labelHCPRoutes() function (release-4.18 uses the local version)
  • No CPOv2 changes included (CPOv2 ignition server path is not part of this backport)

Jira


🤖 Generated with /hypershift-backport command via 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.

Adapt the changes from the previous commits (removal of
MIRRORED_RELEASE_IMAGE and non-deterministic getRegistryOverrides/
LookupMappedImage logic) to the CPOv1 ignition server reconciliation
path.

Changes:
- Remove MIRRORED_RELEASE_IMAGE env var from reconcileDeployment
- Remove mirroredReleaseImage parameter from ReconcileIgnitionServer
  and reconcileDeployment signatures
- Remove LookupMappedImage-based registry override computation that
  performed live HTTP registry checks causing non-deterministic results
- Use static registryOverrides from ReleaseProvider directly
- Clean up unused imports (common, registryclient)

This ensures functional parity between CPOv1 and CPOv2 for the
ignition-server deployment reconciliation.

Fixes: OCPBUGS-77367
Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@jparrill jparrill force-pushed the bp418/OCPBUGS-77368 branch from 3b05fc8 to ef84385 Compare March 9, 2026 09:59
@jparrill
Copy link
Copy Markdown
Contributor Author

jparrill commented Mar 9, 2026

Ok, PR changed:

@enxebre enxebre added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. labels Mar 9, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Mar 9, 2026

@jparrill: 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.

@xiuwang
Copy link
Copy Markdown

xiuwang commented Mar 9, 2026

/verified by @xiuwang

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@xiuwang: This PR has been marked as verified by @xiuwang.

Details

In response to this:

/verified by @xiuwang

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.

@enxebre
Copy link
Copy Markdown
Member

enxebre commented Mar 10, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 10, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit 4e0a2e4 into openshift:release-4.18 Mar 10, 2026
15 checks passed
@openshift-ci-robot
Copy link
Copy Markdown

@jparrill: Jira Issue Verification Checks: Jira Issue OCPBUGS-77368
✔️ 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-77368 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:

Backport

This is a manual backport of #7858 to release-4.18.

The automatic cherry-pick failed due to conflicts which have been resolved manually.

Original PR

Changes

  • Remove mirroredReleaseImage parameter and its inline computation (SeekOverride, pullSecret fetch) from the ignition server reconciliation in hostedcontrolplane_controller.go
  • Remove mirroredReleaseImage parameter from ReconcileIgnitionServer and reconcileDeployment signatures
  • Remove LookupMappedImage-based registry override computation that performed live HTTP registry checks causing non-deterministic results
  • Remove MIRRORED_RELEASE_IMAGE env var from reconcileDeployment
  • Use static registryOverrides from ReleaseProvider directly instead of dynamically-discovered mirror mappings
  • Clean up unused imports (common, registryclient)

Backport adaptations

  • In 4.19, mirroredReleaseImage was obtained via r.ReleaseProvider.GetMirroredReleaseImage() (1 line). In 4.18, it was computed inline (~15 lines: pullSecret fetch, SeekOverride, image comparison). Both removed with the same effect.
  • Adapted util.LabelHCPRoutes() to local labelHCPRoutes() function (release-4.18 uses the local version)

Jira


🤖 Generated with /hypershift-backport command via 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 accepted release 4.18.0-0.nightly-2026-03-10-234310

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

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-moderate Referenced Jira bug's severity is moderate 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants