Skip to content

OCPBUGS-79542: Mount pullsecret manifest to UI container#10411

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
pawanpinjarkar:mount-pull-secret-to-ui-container
Apr 1, 2026
Merged

OCPBUGS-79542: Mount pullsecret manifest to UI container#10411
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
pawanpinjarkar:mount-pull-secret-to-ui-container

Conversation

@pawanpinjarkar
Copy link
Copy Markdown
Contributor

@pawanpinjarkar pawanpinjarkar commented Mar 19, 2026

Mount /etc/assisted/manifests/pullsecret.yaml to the UI container
so it can read the pull-secret and display in local UI and update as necessary.
Also added ConditionPathExists to prevent the service from starting
if the manifests directory is missing, since it's required for the UI to function.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 19, 2026

@pawanpinjarkar: This pull request references AGENT-1463 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:

Mount /etc/assisted/manifests/pull-secret.yaml to the UI container so it can read the pull-secret for display in local UI and update as necessary. Also added ConditionPathExists to prevent the service from starting if the pull-secret file is missing, since it's required for the UI to function.

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.

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@pawanpinjarkar: once the present PR merges, I will cherry-pick it on top of release-4.21 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.21

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Mar 19, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

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: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e089f752-11f3-40af-9b80-9799451b27f0

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

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Added ConditionPathExists=/etc/assisted/manifests to the agent-ui systemd unit and updated ExecStart to bind-mount the host /etc/assisted/manifests/pull-secret.yaml into the container; existing podman options and other mounts were retained.

Changes

Cohort / File(s) Summary
Agent UI Service Configuration
data/data/agent/systemd/units/agent-ui.service.template
Added ConditionPathExists=/etc/assisted/manifests. Updated ExecStart podman run to bind-mount host /etc/assisted/manifests/pull-secret.yaml into the container at /etc/assisted/manifests/pull-secret.yaml; other runtime flags and mounts unchanged.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

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

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

@openshift-ci openshift-ci bot requested review from bfournie and rwsu March 19, 2026 15:54
@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/verified later

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: /verified later <@username> requires at least one GitHub @username to be specified (it can be a comma delimited list). It indicates the engineer(s) that will be performing the verification. See https://docs.ci.openshift.org/docs/architecture/jira/#premerge-verification for more information.

Details

In response to this:

/verified later

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.

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/verified later @ElayAharoni

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Mar 19, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: This PR has been marked to be verified later by @ElayAharoni.

Details

In response to this:

/verified later @ElayAharoni

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.

@pawanpinjarkar pawanpinjarkar force-pushed the mount-pull-secret-to-ui-container branch from f7c74d2 to 3b9d836 Compare March 20, 2026 15:11
@openshift-ci-robot openshift-ci-robot removed verified Signifies that the PR passed pre-merge verification criteria verified-later labels Mar 20, 2026
@pawanpinjarkar pawanpinjarkar changed the title AGENT-1463: Mount pull-secret manifest to UI container AGENT-1463: Mount manifests dir to UI container Mar 20, 2026
@pawanpinjarkar pawanpinjarkar requested a review from rawagner March 20, 2026 15:12
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 20, 2026

@pawanpinjarkar: This pull request references AGENT-1463 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:

Mount /etc/assisted/manifests directory to the UI container
so it can read the pull-secret and other manifests and display in local UI and update as necessary.
Also added ConditionPathExists to prevent the service from starting
if the manifests directory is missing, since it's required for the UI to function.

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.

Comment thread data/data/agent/systemd/units/agent-ui.service.template Outdated
@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

The infraenv object is a bridge between the UI and ABI. The local UI should be able to communicate with the assisted-service and the underlying DB to get the details such as pull secret, ntp sources, proxy, ssh key from the db and display it on the local UI.
cc @andfasano @rawagner @ElayAharoni

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Mar 31, 2026

@pawanpinjarkar: This pull request references AGENT-1463 which is a valid jira issue.

Details

In response to this:

Mount /etc/assisted/manifests directory to the UI container
so it can read the pull-secret and other manifests and display in local UI and update as necessary.
Also added ConditionPathExists to prevent the service from starting
if the manifests directory is missing, since it's required for the UI to function.

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 added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 31, 2026
@pawanpinjarkar pawanpinjarkar changed the title AGENT-1463: Mount manifests dir to UI container OCPBUGS-79542: Mount pullsecret manifest to UI container Mar 31, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 31, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: This pull request references Jira Issue OCPBUGS-79542, 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.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @bmanzari

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

Details

In response to this:

Mount /etc/assisted/manifests directory to the UI container
so it can read the pull-secret and other manifests and display in local UI and update as necessary.
Also added ConditionPathExists to prevent the service from starting
if the manifests directory is missing, since it's required for the UI to function.

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 zaneb March 31, 2026 21:55
@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/cherrypick release-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown

@pawanpinjarkar: once the present PR merges, I will cherry-pick it on top of release-4.21 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-4.21

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.

Copy link
Copy Markdown
Member

@zaneb zaneb left a comment

Choose a reason for hiding this comment

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

This makes sense, since the pull secret is not available from the Assisted API.

/approve

PartOf=assisted-service-pod.service
ConditionPathExists=/etc/assisted/node0
ConditionPathExists=/etc/assisted/interactive-ui
ConditionPathExists=/etc/assisted/manifests
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.

What is this actually protecting us against? unconfigured-ignition always creates this directory, right?

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.

yes, its just an additional check

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rawagner, zaneb

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2026
@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

The infraenv object is a bridge between the UI and ABI. The local UI should be able to communicate with the assisted-service and the underlying DB to get the details such as pull secret, ntp sources, proxy, ssh key from the db and display it on the local UI. cc @andfasano @rawagner @ElayAharoni

The UI can get all the details except pull secret from API call. Hence reopened this PR

@andfasano
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2026
@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/verified later by @bmanzari

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: Only users can be targets for the /verified later command.

Details

In response to this:

/verified later by @bmanzari

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.

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/verified later @bmanzari

@openshift-ci-robot openshift-ci-robot added verified-later verified Signifies that the PR passed pre-merge verification criteria labels Apr 1, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: This PR has been marked to be verified later by @bmanzari.

Details

In response to this:

/verified later @bmanzari

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.

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/overrride e2e-agent-compact-ipv4

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD c93ae9f and 2 for PR HEAD 55b3e81 in total

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/overrride e2e-agent-compact-ipv4

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/override e2e-agent-compact-ipv4

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

@pawanpinjarkar: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • e2e-agent-compact-ipv4

Only the following failed contexts/checkruns were expected:

  • CodeRabbit
  • ci/prow/artifacts-images
  • ci/prow/e2e-agent-4control-ipv4
  • ci/prow/e2e-agent-5control-ipv4
  • ci/prow/e2e-agent-compact-ipv4
  • ci/prow/e2e-agent-compact-ipv4-appliance-diskimage
  • ci/prow/e2e-agent-compact-ipv4-iso-no-registry
  • ci/prow/e2e-agent-compact-ipv4-none-platform
  • ci/prow/e2e-agent-compact-ipv6-minimaliso
  • ci/prow/e2e-agent-ha-dualstack
  • ci/prow/e2e-agent-sno-ipv4-pxe
  • ci/prow/e2e-agent-sno-ipv6
  • ci/prow/e2e-agent-two-node-fencing-ipv4
  • ci/prow/gofmt
  • ci/prow/golint
  • ci/prow/govet
  • ci/prow/images
  • ci/prow/integration-tests
  • ci/prow/integration-tests-nodejoiner
  • ci/prow/okd-scos-images
  • ci/prow/shellcheck
  • ci/prow/unit
  • ci/prow/verify-codegen
  • ci/prow/verify-deps
  • ci/prow/verify-vendor
  • ci/prow/yaml-lint
  • pull-ci-openshift-installer-fcos-gofmt
  • pull-ci-openshift-installer-fcos-golint
  • pull-ci-openshift-installer-fcos-govet
  • pull-ci-openshift-installer-fcos-images
  • pull-ci-openshift-installer-fcos-unit
  • pull-ci-openshift-installer-fcos-verify-codegen
  • pull-ci-openshift-installer-fcos-verify-vendor
  • pull-ci-openshift-installer-main-artifacts-images
  • pull-ci-openshift-installer-main-e2e-agent-4control-ipv4
  • pull-ci-openshift-installer-main-e2e-agent-5control-ipv4
  • pull-ci-openshift-installer-main-e2e-agent-compact-ipv4
  • pull-ci-openshift-installer-main-e2e-agent-compact-ipv4-appliance-diskimage
  • pull-ci-openshift-installer-main-e2e-agent-compact-ipv4-iso-no-registry
  • pull-ci-openshift-installer-main-e2e-agent-compact-ipv4-none-platform
  • pull-ci-openshift-installer-main-e2e-agent-compact-ipv6-minimaliso
  • pull-ci-openshift-installer-main-e2e-agent-ha-dualstack
  • pull-ci-openshift-installer-main-e2e-agent-sno-ipv4-pxe
  • pull-ci-openshift-installer-main-e2e-agent-sno-ipv6
  • pull-ci-openshift-installer-main-e2e-agent-two-node-fencing-ipv4
  • pull-ci-openshift-installer-main-integration-tests
  • pull-ci-openshift-installer-main-integration-tests-nodejoiner
  • pull-ci-openshift-installer-main-okd-scos-images
  • pull-ci-openshift-installer-main-shellcheck
  • pull-ci-openshift-installer-main-verify-deps
  • pull-ci-openshift-installer-main-yaml-lint
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override e2e-agent-compact-ipv4

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.

@pawanpinjarkar
Copy link
Copy Markdown
Contributor Author

/override ci/prow/e2e-agent-compact-ipv4

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

@pawanpinjarkar: Overrode contexts on behalf of pawanpinjarkar: ci/prow/e2e-agent-compact-ipv4

Details

In response to this:

/override ci/prow/e2e-agent-compact-ipv4

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-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

@pawanpinjarkar: 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-agent-two-node-fencing-ipv4 55b3e81 link false /test e2e-agent-two-node-fencing-ipv4
ci/prow/e2e-agent-compact-ipv4-iso-no-registry 55b3e81 link false /test e2e-agent-compact-ipv4-iso-no-registry

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.

@openshift-merge-bot openshift-merge-bot bot merged commit a9e3fd2 into openshift:main Apr 1, 2026
25 of 27 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@pawanpinjarkar: Jira Issue OCPBUGS-79542: All pull requests linked via external trackers have merged:

This pull request has the verified-later tag and will need to be manually moved to VERIFIED after testing. Jira Issue OCPBUGS-79542 has been moved to the MODIFIED state.

Details

In response to this:

Mount /etc/assisted/manifests/pullsecret.yaml to the UI container
so it can read the pull-secret and display in local UI and update as necessary.
Also added ConditionPathExists to prevent the service from starting
if the manifests directory is missing, since it's required for the UI to function.

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-cherrypick-robot
Copy link
Copy Markdown

@pawanpinjarkar: #10411 failed to apply on top of branch "release-4.21":

Applying: OCPBUGS-79542: Mount pullsecret manifest to UI container
Using index info to reconstruct a base tree...
M	data/data/agent/systemd/units/agent-ui.service.template
Falling back to patching base and 3-way merge...
Auto-merging data/data/agent/systemd/units/agent-ui.service.template
CONFLICT (content): Merge conflict in data/data/agent/systemd/units/agent-ui.service.template
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 set advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-79542: Mount pullsecret manifest to UI container

Details

In response to this:

/cherrypick release-4.21

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-merge-robot
Copy link
Copy Markdown
Contributor

Fix included in accepted release 4.22.0-0.nightly-2026-04-03-204456

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/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 verified-later

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants