AGENT-1193: Add mirror-path and registry-cert support for OVE ISO builder #218
Conversation
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rwsu The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
rwsu
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
openshift-ci-robot
added
the
jira/valid-reference
|
@rwsu: This pull request references AGENT-1193 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 task to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
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. |
|
@rwsu: This pull request references AGENT-1193 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 task to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
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. |
|
/cc @bfournie |
|
@rwsu: This pull request references AGENT-1193 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 task to target the "4.22.0" version, but no target version was set. DetailsIn response to this:
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. |
rwsu
force-pushed
the
AGENT-1193-v2
branch
2 times, most recently
from
14e077e to
826641d
Compare
| if [ ! -f "${appliance_work_dir}"/appliance.iso ]; then | ||
| local appliance_image=registry.ci.openshift.org/ocp/${major_minor_version}:agent-preinstall-image-builder | ||
| #local appliance_image=registry.ci.openshift.org/ocp/${major_minor_version}:agent-preinstall-image-builder | ||
| local appliance_image=quay.io/rwsu1/openshift-appliance:dev-scripts |
There was a problem hiding this comment.
Just need to remove your local version before merge
|
|
||
| build-ove-iso: | ||
| hack/build-ove-image.sh $(RELEASE_FLAG) $(RELEASE_VALUE) --pull-secret-file $(PULL_SECRET_FILE) | ||
| hack/build-ove-image.sh $(RELEASE_FLAG) $(RELEASE_VALUE) --pull-secret-file $(PULL_SECRET_FILE) $(if $(MIRROR_PATH),--mirror-path $(MIRROR_PATH)) $(if $(REGISTRY_CERT),--registry-cert $(REGISTRY_CERT)) |
There was a problem hiding this comment.
Just wanted to confirm that this will also work if build-ove-iso-container is used?
There was a problem hiding this comment.
mirror-path will not be supported for build-ove-iso-container. The ability to use a an existing mirror output is intended for developers only. It gets more complicated if we need to support it for the container based builds and currently there isn't a use case for it.
…lder Add support for using pre-mirrored images (--mirror-path) and custom registry certificates (--registry-cert) when building OVE ISOs. This allows building ISOs in disconnected environments without requiring oc-mirror to run during the build process. Note: mirror-path and registry-cert options are only available when using the script build method (build-ove-iso). The container build method (build-ove-iso-container) does not support these options. Changes to hack/build-ove-image.sh: - Add --mirror-path parameter to pass pre-mirrored images directory - Add --registry-cert parameter for custom registry certificates - Mount mirror path and certificate when running appliance container - Override entrypoint to install certificate before running appliance Assisted-by: Claude Sonnet 4.5 <noreply@anthropic.com>
|
|
||
| if [[ -n "$MIRROR_PATH" ]]; then | ||
| cat << EOF >> ${cfg} | ||
| mirrorPath: /mirror |
There was a problem hiding this comment.
@andfasano I've added the mirrorPath as field to the appliance-config. Previously we also discussed how we can minimize the change to agent-installer-utils and one of the things we considered was to have dev-scripts add the mirrorPath to the appliance-config.yaml. That would eliminate the need to support a --mirror-path command line options. Unfortunately, that's currently not possible because build-ove-image.sh "all" step does two things in the same call/step: 1) configure the appliance-config.yaml and 2) call appliance build live-iso. To break this up to allow dev-scripts to manually updated the appliance-config.yaml, we would need to create a new build step which is currently missing. The "all" step is what is currently used. The "configure" and "create-iso" steps are used by the Dockerfile and internally it calls appliance to build the live ISO.
|
@rwsu: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
3 participants
Add support for using pre-mirrored images (--mirror-path) and custom
registry certificates (--registry-cert) when building OVE ISOs. This
allows building ISOs in disconnected environments without requiring
oc-mirror to run during the build process.
Note: mirror-path and registry-cert options are only available when
using the script build method (build-ove-iso). The container build
method (build-ove-iso-container) does not support these options.
Changes to hack/build-ove-image.sh:
Assisted-by: Claude Sonnet 4.5 noreply@anthropic.com