Skip to content

Implement optional embedding of custom RPMs in the RHEL4Edge image#750

Merged
openshift-ci[bot] merged 12 commits intoopenshift:mainfrom
ggiguash:embed_containers_in_iso
Jul 4, 2022
Merged

Implement optional embedding of custom RPMs in the RHEL4Edge image#750
openshift-ci[bot] merged 12 commits intoopenshift:mainfrom
ggiguash:embed_containers_in_iso

Conversation

@ggiguash
Copy link
Copy Markdown
Contributor

@ggiguash ggiguash commented Jun 28, 2022

Implement optional embedding of custom RPMs in the RHEL4Edge image to allow MicroShift container image delivery as part of the ISO.

The following changes were implemented:

  • Added optional -custom_rpms command line to the image-builder/build.sh script
  • Separate the ISO creation and installation docs from the developer documentation
  • Added "Install MicroShift on RHEL for Edge" link to the User Documentation in the top-level README
  • Added "mock" install and configuration for the devenv
  • Updated docs for creating Offline Containers RPMs
  • Updated docs on testing Offline Containers on a VM without the Internet access

USHIFT-112

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 28, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 28, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci Bot requested review from copejon and oglok June 28, 2022 15:36
@ggiguash
Copy link
Copy Markdown
Contributor Author

/assign @dhellmann

@ggiguash ggiguash marked this pull request as ready for review June 28, 2022 16:10
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 28, 2022
@openshift-ci openshift-ci Bot requested review from mangelajo and sallyom June 28, 2022 16:12
Comment thread docs/rhel4edge_iso.md
Comment thread docs/rhel4edge_iso.md
Comment thread docs/rhel4edge_iso.md
@ggiguash ggiguash requested a review from dhellmann June 29, 2022 15:24
Comment thread docs/rhel4edge_iso.md
@dhellmann
Copy link
Copy Markdown
Contributor

/approve

I verified that using the build script in #748 the instructions work to build the RPM with the containers.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 30, 2022

@ggiguash: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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/test-infra repository.

@fzdarsky
Copy link
Copy Markdown
Contributor

fzdarsky commented Jul 1, 2022

@ggiguash, is rhel4edge_iso.md meant to be user documentation or documentation for developers of MicroShift?

I understood USHIFT-112 to be about user documentation and the main README links to there from the user documentation section, but the way rhel4edge_iso.md is written and the fact that it uses the scripts in script/image-builder suggests it's actually MicroShift developer documentation.

@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Jul 2, 2022

@fzdarsky, Yes, it's supposed to be a "user doc" in a way that explains the user how to use the existing tools to build their own custom procedures. I did not know there was a convention on what scripts users should run from the tree. If so, we can move some scripts around.
P.S. If we decide moving scripts, I would try it in a separate task/PR for the whole tree, not just the image-builder.

@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Jul 2, 2022

If this current documentation is more developer-oriented, maybe we just need to move it to the developer section in the top-level README.md

@fzdarsky
Copy link
Copy Markdown
Contributor

fzdarsky commented Jul 4, 2022

@fzdarsky, Yes, it's supposed to be a "user doc" in a way that explains the user how to use the existing tools to build their own custom procedures. I did not know there was a convention on what scripts users should run from the tree. If so, we can move some scripts around. P.S. If we decide moving scripts, I would try it in a separate task/PR for the whole tree, not just the image-builder.

I'd say we need both user documentation and developer documentation:

  1. The user documentation should IMO focus on consuming MicroShift RPMs as-is and describe both how to install MicroShift RPMs on non-rpm-ostree systems as well as how to embed MicroShift into an rpm-ostree image and how to make MicroShift and workloads "offline available". When doing so, it should not be us prescribing how to build images, but instead we'd simply refer to the RHEL documentation and describe how to do the MicroShift-specific stuff (e.g. "You need to enable repo X, add Y to your blueprint, Z to your kickstart. If you want to add containers, to this. If you want to package your apps into an RPM to that.")
  2. The developer documentation (which is for ourselves) should be very prescriptive / reproducible in contrast. This is where we'd want the scripts in script/image-builder.

@ggiguash
Copy link
Copy Markdown
Contributor Author

ggiguash commented Jul 4, 2022

Moved the rhel4edge_iso.md document to the dev section in the top-level README and adjusted its intro to denote the dev audience.

@fzdarsky
Copy link
Copy Markdown
Contributor

fzdarsky commented Jul 4, 2022

Moved the rhel4edge_iso.md document to the dev section in the top-level README and adjusted its intro to denote the dev audience.
Thanks!

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 4, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, fzdarsky, ggiguash

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 merged commit f1f2da0 into openshift:main Jul 4, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 4, 2022

@ggiguash: 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/test-infra repository. I understand the commands that are listed here.

@ggiguash ggiguash deleted the embed_containers_in_iso branch July 4, 2022 15:03
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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants