From bae9894c88f48a9922abbb2ef95f6805886cff6a Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 16 Jun 2026 11:41:54 -0400 Subject: [PATCH 1/5] Add JTBD POC structure for openshift_images book. Introduces openshift-jtbd distro output, product-category topic map, and 12 job-based assemblies for the Images book derived from the consolidation report and Images JTBD statements spreadsheet. Structural POC only; mirrors PR #112296 approach with symlinks to shared modules and job statements as abstracts. Co-authored-by: Cursor --- _distro_map.yml | 10 +++ _topic_maps/_topic_map_jtbd.yml | 62 +++++++++++++++++++ _topic_maps/_topic_map_jtbd_images.yml | 62 +++++++++++++++++++ openshift_images_jtbd/administer/_attributes | 1 + .../configure-cluster-wide-image-policy.adoc | 52 ++++++++++++++++ openshift_images_jtbd/administer/images | 1 + .../manage-cluster-sample-image-streams.adoc | 49 +++++++++++++++ openshift_images_jtbd/administer/modules | 1 + openshift_images_jtbd/administer/snippets | 1 + openshift_images_jtbd/configure/_attributes | 1 + ...control-container-image-pull-behavior.adoc | 18 ++++++ openshift_images_jtbd/configure/images | 1 + ...-container-images-to-a-local-registry.adoc | 22 +++++++ openshift_images_jtbd/configure/modules | 1 + .../organize-image-versions-with-tags.adoc | 26 ++++++++ openshift_images_jtbd/configure/snippets | 1 + openshift_images_jtbd/develop/_attributes | 1 + .../develop/build-s2i-builder-images.adoc | 24 +++++++ ...create-container-images-for-openshift.adoc | 24 +++++++ ...-applications-with-red-hat-s2i-images.adoc | 41 ++++++++++++ openshift_images_jtbd/develop/images | 1 + openshift_images_jtbd/develop/modules | 1 + openshift_images_jtbd/develop/snippets | 1 + openshift_images_jtbd/discover/_attributes | 1 + openshift_images_jtbd/discover/images | 1 + openshift_images_jtbd/discover/modules | 1 + openshift_images_jtbd/discover/snippets | 1 + ...erstand-container-images-in-openshift.adoc | 38 ++++++++++++ openshift_images_jtbd/integrate/_attributes | 1 + .../automate-ci-cd-with-image-streams.adoc | 37 +++++++++++ openshift_images_jtbd/integrate/images | 1 + openshift_images_jtbd/integrate/modules | 1 + openshift_images_jtbd/integrate/snippets | 1 + openshift_images_jtbd/optimize/_attributes | 1 + openshift_images_jtbd/optimize/images | 1 + .../manage-image-streams-and-imports.adoc | 48 ++++++++++++++ openshift_images_jtbd/optimize/modules | 1 + openshift_images_jtbd/optimize/snippets | 1 + openshift_images_jtbd/secure/_attributes | 1 + ...ate-workloads-with-private-registries.adoc | 30 +++++++++ openshift_images_jtbd/secure/images | 1 + openshift_images_jtbd/secure/modules | 1 + openshift_images_jtbd/secure/snippets | 1 + 43 files changed, 571 insertions(+) create mode 100644 _topic_maps/_topic_map_jtbd.yml create mode 100644 _topic_maps/_topic_map_jtbd_images.yml create mode 100644 openshift_images_jtbd/administer/_attributes create mode 100644 openshift_images_jtbd/administer/configure-cluster-wide-image-policy.adoc create mode 100644 openshift_images_jtbd/administer/images create mode 100644 openshift_images_jtbd/administer/manage-cluster-sample-image-streams.adoc create mode 100644 openshift_images_jtbd/administer/modules create mode 100644 openshift_images_jtbd/administer/snippets create mode 100644 openshift_images_jtbd/configure/_attributes create mode 100644 openshift_images_jtbd/configure/control-container-image-pull-behavior.adoc create mode 100644 openshift_images_jtbd/configure/images create mode 100644 openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc create mode 100644 openshift_images_jtbd/configure/modules create mode 100644 openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc create mode 100644 openshift_images_jtbd/configure/snippets create mode 100644 openshift_images_jtbd/develop/_attributes create mode 100644 openshift_images_jtbd/develop/build-s2i-builder-images.adoc create mode 100644 openshift_images_jtbd/develop/create-container-images-for-openshift.adoc create mode 100644 openshift_images_jtbd/develop/deploy-applications-with-red-hat-s2i-images.adoc create mode 100644 openshift_images_jtbd/develop/images create mode 100644 openshift_images_jtbd/develop/modules create mode 100644 openshift_images_jtbd/develop/snippets create mode 100644 openshift_images_jtbd/discover/_attributes create mode 100644 openshift_images_jtbd/discover/images create mode 100644 openshift_images_jtbd/discover/modules create mode 100644 openshift_images_jtbd/discover/snippets create mode 100644 openshift_images_jtbd/discover/understand-container-images-in-openshift.adoc create mode 100644 openshift_images_jtbd/integrate/_attributes create mode 100644 openshift_images_jtbd/integrate/automate-ci-cd-with-image-streams.adoc create mode 100644 openshift_images_jtbd/integrate/images create mode 100644 openshift_images_jtbd/integrate/modules create mode 100644 openshift_images_jtbd/integrate/snippets create mode 100644 openshift_images_jtbd/optimize/_attributes create mode 100644 openshift_images_jtbd/optimize/images create mode 100644 openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc create mode 100644 openshift_images_jtbd/optimize/modules create mode 100644 openshift_images_jtbd/optimize/snippets create mode 100644 openshift_images_jtbd/secure/_attributes create mode 100644 openshift_images_jtbd/secure/authenticate-workloads-with-private-registries.adoc create mode 100644 openshift_images_jtbd/secure/images create mode 100644 openshift_images_jtbd/secure/modules create mode 100644 openshift_images_jtbd/secure/snippets diff --git a/_distro_map.yml b/_distro_map.yml index 261246a6030c..dff2051fcf4f 100644 --- a/_distro_map.yml +++ b/_distro_map.yml @@ -565,3 +565,13 @@ openshift-coo: standalone-coo-docs-1-latest: name: '1-latest' dir: coo/1-latest +openshift-jtbd: + name: OpenShift Container Platform (JTBD) + author: OpenShift Documentation Project + site: commercial + site_name: Documentation + site_url: https://docs.openshift.com/ + branches: + enterprise-4.22: + name: '4.22' + dir: container-platform-jtbd/4.22 diff --git a/_topic_maps/_topic_map_jtbd.yml b/_topic_maps/_topic_map_jtbd.yml new file mode 100644 index 000000000000..fc4f8a4d8a50 --- /dev/null +++ b/_topic_maps/_topic_map_jtbd.yml @@ -0,0 +1,62 @@ +# POC: JTBD-based Images book structure +# Source: openshift_images consolidation report + Images JTBD statements.xlsx +# Do not merge — structural POC only + +Name: Discover +Dir: openshift_images_jtbd/discover +Distros: openshift-jtbd +Topics: +- Name: Understand container images in OpenShift + File: understand-container-images-in-openshift + +Name: Administer +Dir: openshift_images_jtbd/administer +Distros: openshift-jtbd +Topics: +- Name: Manage cluster sample image streams + File: manage-cluster-sample-image-streams +- Name: Configure cluster-wide image policy + File: configure-cluster-wide-image-policy + +Name: Develop +Dir: openshift_images_jtbd/develop +Distros: openshift-jtbd +Topics: +- Name: Create container images for OpenShift + File: create-container-images-for-openshift +- Name: Build S2I builder images + File: build-s2i-builder-images +- Name: Deploy applications with Red Hat S2I images + File: deploy-applications-with-red-hat-s2i-images + +Name: Configure +Dir: openshift_images_jtbd/configure +Distros: openshift-jtbd +Topics: +- Name: Mirror container images to a local registry + File: mirror-container-images-to-a-local-registry +- Name: Organize image versions with tags + File: organize-image-versions-with-tags +- Name: Control container image pull behavior + File: control-container-image-pull-behavior + +Name: Secure +Dir: openshift_images_jtbd/secure +Distros: openshift-jtbd +Topics: +- Name: Authenticate workloads with private registries + File: authenticate-workloads-with-private-registries + +Name: Integrate +Dir: openshift_images_jtbd/integrate +Distros: openshift-jtbd +Topics: +- Name: Automate CI/CD with image streams + File: automate-ci-cd-with-image-streams + +Name: Optimize +Dir: openshift_images_jtbd/optimize +Distros: openshift-jtbd +Topics: +- Name: Manage image streams and imports + File: manage-image-streams-and-imports diff --git a/_topic_maps/_topic_map_jtbd_images.yml b/_topic_maps/_topic_map_jtbd_images.yml new file mode 100644 index 000000000000..fc4f8a4d8a50 --- /dev/null +++ b/_topic_maps/_topic_map_jtbd_images.yml @@ -0,0 +1,62 @@ +# POC: JTBD-based Images book structure +# Source: openshift_images consolidation report + Images JTBD statements.xlsx +# Do not merge — structural POC only + +Name: Discover +Dir: openshift_images_jtbd/discover +Distros: openshift-jtbd +Topics: +- Name: Understand container images in OpenShift + File: understand-container-images-in-openshift + +Name: Administer +Dir: openshift_images_jtbd/administer +Distros: openshift-jtbd +Topics: +- Name: Manage cluster sample image streams + File: manage-cluster-sample-image-streams +- Name: Configure cluster-wide image policy + File: configure-cluster-wide-image-policy + +Name: Develop +Dir: openshift_images_jtbd/develop +Distros: openshift-jtbd +Topics: +- Name: Create container images for OpenShift + File: create-container-images-for-openshift +- Name: Build S2I builder images + File: build-s2i-builder-images +- Name: Deploy applications with Red Hat S2I images + File: deploy-applications-with-red-hat-s2i-images + +Name: Configure +Dir: openshift_images_jtbd/configure +Distros: openshift-jtbd +Topics: +- Name: Mirror container images to a local registry + File: mirror-container-images-to-a-local-registry +- Name: Organize image versions with tags + File: organize-image-versions-with-tags +- Name: Control container image pull behavior + File: control-container-image-pull-behavior + +Name: Secure +Dir: openshift_images_jtbd/secure +Distros: openshift-jtbd +Topics: +- Name: Authenticate workloads with private registries + File: authenticate-workloads-with-private-registries + +Name: Integrate +Dir: openshift_images_jtbd/integrate +Distros: openshift-jtbd +Topics: +- Name: Automate CI/CD with image streams + File: automate-ci-cd-with-image-streams + +Name: Optimize +Dir: openshift_images_jtbd/optimize +Distros: openshift-jtbd +Topics: +- Name: Manage image streams and imports + File: manage-image-streams-and-imports diff --git a/openshift_images_jtbd/administer/_attributes b/openshift_images_jtbd/administer/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/administer/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/administer/configure-cluster-wide-image-policy.adoc b/openshift_images_jtbd/administer/configure-cluster-wide-image-policy.adoc new file mode 100644 index 000000000000..29e12cb70c8d --- /dev/null +++ b/openshift_images_jtbd/administer/configure-cluster-wide-image-policy.adoc @@ -0,0 +1,52 @@ +:_mod-docs-content-type: ASSEMBLY +[id="configure-cluster-wide-image-policy"] += Configure cluster-wide image policy +include::_attributes/common-attributes.adoc[] +:context: configure_cluster_wide_image_policy + +toc::[] + +[role="_abstract"] +When I need to govern how my cluster handles container images cluster-wide, I want to configure the image.config.openshift.io/cluster resource, so I can control registry access, imports, mirroring, and trust policies consistently across all nodes. + +== Understand Image CR parameters [reference] + +include::modules/images-configuration-parameters.adoc[leveloffset=+1] + +== Configure registry allowlists and blocks [procedure] + +include::modules/images-configuration-file.adoc[leveloffset=+1] + +include::modules/images-configuration-allowed.adoc[leveloffset=+2] + +include::modules/images-configuration-blocked.adoc[leveloffset=+2] + +include::modules/images-configuration-blocked-payload.adoc[leveloffset=+2] + +include::modules/images-configuration-insecure.adoc[leveloffset=+2] + +== Configure short-name search registries [procedure] + +include::modules/images_configuration_shortname_con.adoc[leveloffset=+1] + +include::modules/images-configuration-shortname-when-not-to-use.adoc[leveloffset=+2] + +include::modules/images-configuration-shortname.adoc[leveloffset=+2] + +== Configure trust and mirroring [procedure] + +include::modules/images-configuration-cas.adoc[leveloffset=+2] + +include::modules/images-configuration-registry-mirror.adoc[leveloffset=+1] + +include::modules/images-configuration-registry-mirror-configuring.adoc[leveloffset=+2] + +include::modules/images_configuring_registry_mirror_config_params.adoc[leveloffset=+2] + +include::modules/images-configuration-registry-mirror-convert.adoc[leveloffset=+2] + +include::modules/images-configuration-registry-mirror-project-secret.adoc[leveloffset=+2] + +== Understand MCO rollout behavior [concept] + +include::modules/images-configuration-mco-and-registry-changes.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/administer/images b/openshift_images_jtbd/administer/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/administer/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/administer/manage-cluster-sample-image-streams.adoc b/openshift_images_jtbd/administer/manage-cluster-sample-image-streams.adoc new file mode 100644 index 000000000000..fdff34dd4e23 --- /dev/null +++ b/openshift_images_jtbd/administer/manage-cluster-sample-image-streams.adoc @@ -0,0 +1,49 @@ +:_mod-docs-content-type: ASSEMBLY +[id="manage-cluster-sample-image-streams"] += Manage cluster sample image streams +include::_attributes/common-attributes.adoc[] +:context: manage_cluster_sample_image_streams + +toc::[] + +[role="_abstract"] +When I need default sample image streams and templates in my cluster, I want to install, configure, and maintain Cluster Samples Operator content, so I can bootstrap development workflows in connected or disconnected environments. + +== Understand operator behavior + +include::snippets/cluster-sampler-operator-deprecation.adoc[leveloffset=+1] + +include::modules/samples-operator-overview.adoc[leveloffset=+1] + +include::modules/samples-operator-bootstrapped.adoc[leveloffset=+1] + +ifndef::openshift-rosa,openshift-dedicated[] +include::modules/samples-operator-restricted-network-install.adoc[leveloffset=+2] + +include::modules/samples-operator-restricted-nw-install-with-access.adoc[leveloffset=+2] + +endif::openshift-rosa,openshift-dedicated[] + +== Configure management state and imports + +include::modules/samples-operator-retries.adoc[leveloffset=+1] + +include::modules/samples-operator-crd.adoc[leveloffset=+1] + +include::modules/images-samples-operator-deprecated-image-stream.adoc[leveloffset=+1] + +== Plan mirroring for sample content + +ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] +include::modules/installation-images-samples-disconnected-mirroring-assist.adoc[leveloffset=+2] + +endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] + +ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] +include::modules/samples-operator-configuration.adoc[leveloffset=+1] + +endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] + +== Configure alternate or mirrored registry + +include::modules/installation-restricted-network-samples.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/administer/modules b/openshift_images_jtbd/administer/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/administer/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/administer/snippets b/openshift_images_jtbd/administer/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/administer/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/configure/_attributes b/openshift_images_jtbd/configure/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/configure/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/configure/control-container-image-pull-behavior.adoc b/openshift_images_jtbd/configure/control-container-image-pull-behavior.adoc new file mode 100644 index 000000000000..09ae20168840 --- /dev/null +++ b/openshift_images_jtbd/configure/control-container-image-pull-behavior.adoc @@ -0,0 +1,18 @@ +:_mod-docs-content-type: ASSEMBLY +[id="control-container-image-pull-behavior"] += Control container image pull behavior +include::_attributes/common-attributes.adoc[] +:context: control_container_image_pull_behavior + +toc::[] + +[role="_abstract"] +When pods start containers, I want to configure imagePullPolicy, so I can control whether images are always pulled, pulled only if absent, or never pulled from the registry. + +== Configure explicit pull policy [reference] + +include::modules/images-image-pull-policy-overview.adoc[leveloffset=+1] + +== Rely on default pull policy [concept] + +include::modules/images-image-pull-policy-default-behavior.adoc[leveloffset=+2] diff --git a/openshift_images_jtbd/configure/images b/openshift_images_jtbd/configure/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/configure/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc b/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc new file mode 100644 index 000000000000..dab49a29b945 --- /dev/null +++ b/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc @@ -0,0 +1,22 @@ +:_mod-docs-content-type: ASSEMBLY +[id="mirror-container-images-to-a-local-registry"] += Mirror container images to a local registry +include::_attributes/common-attributes.adoc[] +:context: mirror_container_images_to_a_local_registry + +toc::[] + +[role="_abstract"] +When I operate OpenShift in a restricted network, I want to mirror required container images to a local registry, so I can install, upgrade, and run workloads without internet access. + +== Plan mirror registry topology + +include::modules/installation-about-mirror-registry.adoc[leveloffset=+1] + +== Configure mirroring credentials + +include::modules/cli-installing-cli-linux.adoc[leveloffset=+2] + +== Mirror release images + +include::modules/cli-installing-cli-windows.adoc[leveloffset=+2] diff --git a/openshift_images_jtbd/configure/modules b/openshift_images_jtbd/configure/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/configure/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc b/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc new file mode 100644 index 000000000000..025cd91c2725 --- /dev/null +++ b/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc @@ -0,0 +1,26 @@ +:_mod-docs-content-type: ASSEMBLY +[id="organize-image-versions-with-tags"] += Organize image versions with tags +include::_attributes/common-attributes.adoc[] +:context: organize_image_versions_with_tags + +toc::[] + +[role="_abstract"] +When I reference container images in builds and deployments, I want to use human-readable tags as mutable pointers to digests, so I can request specific versions and promote images between environments safely. + +== Apply tag naming conventions + +include::modules/images-tag.adoc[leveloffset=+1] + +== Add and remove tags + +include::modules/images-tagging-conventions.adoc[leveloffset=+1] + +include::modules/images-add-tags-to-imagestreams.adoc[leveloffset=+1] + +== Choose reference syntax and types + +include::modules/images-remove-tag-imagestream.adoc[leveloffset=+1] + +include::modules/images-referencing-images-imagestreams.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/configure/snippets b/openshift_images_jtbd/configure/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/configure/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/develop/_attributes b/openshift_images_jtbd/develop/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/develop/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/develop/build-s2i-builder-images.adoc b/openshift_images_jtbd/develop/build-s2i-builder-images.adoc new file mode 100644 index 000000000000..c3cc63b8f15c --- /dev/null +++ b/openshift_images_jtbd/develop/build-s2i-builder-images.adoc @@ -0,0 +1,24 @@ +:_mod-docs-content-type: ASSEMBLY +[id="build-s2i-builder-images"] += Build S2I builder images +include::_attributes/common-attributes.adoc[] +:context: build_s2i_builder_images + +toc::[] + +[role="_abstract"] +When developers build applications from source on OpenShift, I want to create S2I builder images, so I can transform application source into runnable container images with minimal developer effort. + +== Understand the S2I build process [concept] + +include::modules/images-create-s2i.adoc[leveloffset=+1] + +include::modules/images-create-s2i-build.adoc[leveloffset=+2] + +== Write assemble and run scripts [procedure] + +include::modules/images-create-s2i-scripts.adoc[leveloffset=+2] + +== Test builder images [procedure] + +include::modules/images-test-s2i.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/develop/create-container-images-for-openshift.adoc b/openshift_images_jtbd/develop/create-container-images-for-openshift.adoc new file mode 100644 index 000000000000..1255f6f43931 --- /dev/null +++ b/openshift_images_jtbd/develop/create-container-images-for-openshift.adoc @@ -0,0 +1,24 @@ +:_mod-docs-content-type: ASSEMBLY +[id="create-container-images-for-openshift"] += Create container images for OpenShift +include::_attributes/common-attributes.adoc[] +:context: create_container_images_for_openshift + +toc::[] + +[role="_abstract"] +When I build applications for OpenShift, I want to create container images following platform best practices, so I can deploy reproducible, secure, and consumable images on the cluster. + +== General container image guidelines [concept] + +include::modules/images-create-guidelines.adoc[leveloffset=+1] + +include::modules/images-create-guide-general.adoc[leveloffset=+2] + +== OpenShift-specific authoring guidelines [concept] + +include::modules/images-create-guide-openshift.adoc[leveloffset=+2] + +== Define image metadata labels [reference] + +include::modules/images-create-metadata.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/develop/deploy-applications-with-red-hat-s2i-images.adoc b/openshift_images_jtbd/develop/deploy-applications-with-red-hat-s2i-images.adoc new file mode 100644 index 000000000000..eaba55f39e10 --- /dev/null +++ b/openshift_images_jtbd/develop/deploy-applications-with-red-hat-s2i-images.adoc @@ -0,0 +1,41 @@ +:_mod-docs-content-type: ASSEMBLY +[id="deploy-applications-with-red-hat-s2i-images"] += Deploy applications with Red Hat S2I images +include::_attributes/common-attributes.adoc[] +:context: deploy_applications_with_red_hat_s2i_images + +toc::[] + +[role="_abstract"] +When I build and deploy containerized applications on OpenShift, I want to locate and use supported Red Hat S2I and middleware images, so I can run applications with version-compatible base components. + +== Find supported Red Hat container images + +Red{nbsp}Hat official container images are provided in the Red{nbsp}Hat Registry at link:https://registry.redhat.io[registry.redhat.io]. {product-title}'s supported S2I, database, and Jenkins images are provided in the `openshift4` repository in the {quay} Registry. For example, `quay.io/openshift-release-dev/ocp-v4.0-
` is the name of the OpenShift Application Platform image. + +The xPaaS middleware images are provided in their respective product repositories on the Red Hat Registry but suffixed with a `-openshift`. For example, `registry.redhat.io/jboss-eap-6/eap64-openshift` is the name of the JBoss EAP image. + +All Red{nbsp}Hat supported images covered in this section are described in the link:https://catalog.redhat.com/software/containers/explore[Container images section of the Red Hat Ecosystem Catalog]. For every version of each image, you can find details on its contents and usage. Browse or search for the image that interests you. + +[IMPORTANT] +==== +The newer versions of container images are not compatible with earlier versions of {product-title}. Verify and use the correct version of container images, based on your version of {product-title}. +==== + +== Use S2I builder images + +You can use the link:https://access.redhat.com/documentation/en-us/red_hat_software_collections/3/html-single/using_red_hat_software_collections_container_images/index[Red{nbsp}Hat Software Collections] images as a foundation for applications that rely on specific runtime environments such as Node.js, Perl, or Python. + +You can use the link:https://docs.redhat.com/en/documentation/red_hat_build_of_openjdk/11/html/using_source-to-image_for_openshift_with_red_hat_build_of_openjdk_11/openjdk-overview-s2i-openshift[Introduction to source-to-image for OpenShift] documentation as a reference for runtime environments that use Java. + +S2I images are also available though the xref:../../openshift_images/configuring-samples-operator.adoc#configuring-samples-operator[Cluster Samples Operator]. + +include::modules/images-s2i-build-process-overview.adoc[leveloffset=+1] + +== Select builders in Developer Console + +include::modules/accessing-s2i-builder-images-in-developer-console.adoc[leveloffset=+1] + +== Customize S2I builder behavior + +include::modules/images-using-customizing-s2i-images-scripts-embedded.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/develop/images b/openshift_images_jtbd/develop/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/develop/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/develop/modules b/openshift_images_jtbd/develop/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/develop/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/develop/snippets b/openshift_images_jtbd/develop/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/develop/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/discover/_attributes b/openshift_images_jtbd/discover/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/discover/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/discover/images b/openshift_images_jtbd/discover/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/discover/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/discover/modules b/openshift_images_jtbd/discover/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/discover/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/discover/snippets b/openshift_images_jtbd/discover/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/discover/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/discover/understand-container-images-in-openshift.adoc b/openshift_images_jtbd/discover/understand-container-images-in-openshift.adoc new file mode 100644 index 000000000000..d1b33f18cf7c --- /dev/null +++ b/openshift_images_jtbd/discover/understand-container-images-in-openshift.adoc @@ -0,0 +1,38 @@ +:_mod-docs-content-type: ASSEMBLY +[id="understand-container-images-in-openshift"] += Understand container images in OpenShift +include::_attributes/common-attributes.adoc[] +:context: understand_container_images_in_openshift + +toc::[] + +[role="_abstract"] +When I start working with containerized applications on OpenShift, I want to understand how containers, images, and image streams relate, so I can deploy and manage applications effectively in the cluster. + +== Core image concepts + +include::modules/images-about.adoc[leveloffset=+1] + +include::modules/images-image-registry-about.adoc[leveloffset=+1] + +include::modules/images-container-repository-about.adoc[leveloffset=+1] + +include::modules/images-id.adoc[leveloffset=+1] + +include::modules/containers-about.adoc[leveloffset=+1] + +== Image tags and streams overview + +include::modules/images-tag.adoc[leveloffset=+1] + +include::modules/images-imagestream-use.adoc[leveloffset=+1] + +include::modules/images-imagestream-tag.adoc[leveloffset=+1] + +include::modules/images-imagestream-image.adoc[leveloffset=+1] + +include::modules/images-imagestream-trigger.adoc[leveloffset=+1] + +== Cluster Samples Operator introduction + +include::modules/how-you-can-use-the-cluster-samples-operator.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/integrate/_attributes b/openshift_images_jtbd/integrate/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/integrate/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/integrate/automate-ci-cd-with-image-streams.adoc b/openshift_images_jtbd/integrate/automate-ci-cd-with-image-streams.adoc new file mode 100644 index 000000000000..5526dacd71f7 --- /dev/null +++ b/openshift_images_jtbd/integrate/automate-ci-cd-with-image-streams.adoc @@ -0,0 +1,37 @@ +:_mod-docs-content-type: ASSEMBLY +[id="automate-ci-cd-with-image-streams"] += Automate CI/CD with image streams +include::_attributes/common-attributes.adoc[] +:context: automate_ci_cd_with_image_streams + +toc::[] + +[role="_abstract"] +When I manage container images in OpenShift, I want image streams to trigger builds and deployments automatically, so I can deliver updated container images without manual coordination. + +== Understand watch-notify-react pattern + +Image streams in {product-title} provide a layer of abstraction over container images, enabling automation for your CI/CD pipelines. You can configure builds and deployments to watch image streams and automatically trigger new builds or deployments when images are updated. + +The main advantage of using image streams is the automation they enable for your continuous integration and continuous delivery (CI/CD) pipelines. For example: + +* Image streams allow {product-title} resources like Builds and Deployments to "watch" them. +* When a new image is added to the stream, or when an existing tag is modified to point to a new image, the watching resources receive notifications. +* When notifications are received, the watching resources can automatically react by performing a new build or a new deployment. + +== Configure image stream triggers conceptually + +include::modules/images-imagestream-use.adoc[leveloffset=+1] + +include::modules/images-using-imagestream-change-triggers.adoc[leveloffset=+1] + +== Trigger Kubernetes resource rollouts + +[id="openshift-resources"] +== {product-title} resources + +{product-title} deployment configurations and build configurations can be automatically triggered by changes to image stream tags. The triggered action can be run using the new value of the image referenced by the updated image stream tag. + +include::modules/images-triggering-updates-imagestream-changes-kubernetes-about.adoc[leveloffset=+1] + +include::modules/images-triggering-updates-imagestream-changes-kubernetes-cli.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/integrate/images b/openshift_images_jtbd/integrate/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/integrate/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/integrate/modules b/openshift_images_jtbd/integrate/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/integrate/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/integrate/snippets b/openshift_images_jtbd/integrate/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/integrate/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/optimize/_attributes b/openshift_images_jtbd/optimize/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/optimize/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/optimize/images b/openshift_images_jtbd/optimize/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/optimize/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc b/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc new file mode 100644 index 000000000000..b7713955b05f --- /dev/null +++ b/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc @@ -0,0 +1,48 @@ +:_mod-docs-content-type: ASSEMBLY +[id="manage-image-streams-and-imports"] += Manage image streams and imports +include::_attributes/common-attributes.adoc[] +:context: manage_image_streams_and_imports + +toc::[] + +[role="_abstract"] +When I manage container images in OpenShift, I want to use image streams to abstract and track image versions, so I can import, tag, and inspect images without re-pushing manually. + +== Inspect image streams and tags + +include::modules/images-imagestream-configure.adoc[leveloffset=+1] + +== Tag external and internal images + +include::modules/images-using-imagestream-images.adoc[leveloffset=+1] + +include::modules/images-using-imagestream-tags.adoc[leveloffset=+1] + +include::modules/images-imagestream-mapping.adoc[leveloffset=+1] + +include::modules/working-with-image-streams.adoc[leveloffset=+1] + +== Schedule periodic re-import + +include::modules/images-getting-info-about-imagestreams.adoc[leveloffset=+2] + +include::modules/images-imagestream-adding-tags.adoc[leveloffset=+2] + +== Import from private registries and manifest lists + +include::modules/images-imagestream-external-image-tags.adoc[leveloffset=+2] + +include::modules/images-imagestream-update-tag.adoc[leveloffset=+2] + +include::modules/images-imagestream-remove-tag.adoc[leveloffset=+2] + +include::modules/images-imagestream-import.adoc[leveloffset=+2] + +include::modules/images-imagestream-import-images-image-streams.adoc[leveloffset=+1] + +include::modules/images-imagestream-import-images-private-registry.adoc[leveloffset=+2] + +== Reference image streams in Kubernetes workloads + +include::modules/images-imagestream-import-import-mode.adoc[leveloffset=+2] diff --git a/openshift_images_jtbd/optimize/modules b/openshift_images_jtbd/optimize/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/optimize/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/optimize/snippets b/openshift_images_jtbd/optimize/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/optimize/snippets @@ -0,0 +1 @@ +../../snippets/ diff --git a/openshift_images_jtbd/secure/_attributes b/openshift_images_jtbd/secure/_attributes new file mode 100644 index 000000000000..1ecfea29367b --- /dev/null +++ b/openshift_images_jtbd/secure/_attributes @@ -0,0 +1 @@ +../../_attributes/ diff --git a/openshift_images_jtbd/secure/authenticate-workloads-with-private-registries.adoc b/openshift_images_jtbd/secure/authenticate-workloads-with-private-registries.adoc new file mode 100644 index 000000000000..8ee2a765860d --- /dev/null +++ b/openshift_images_jtbd/secure/authenticate-workloads-with-private-registries.adoc @@ -0,0 +1,30 @@ +:_mod-docs-content-type: ASSEMBLY +[id="authenticate-workloads-with-private-registries"] += Authenticate workloads with private registries +include::_attributes/common-attributes.adoc[] +:context: authenticate_workloads_with_private_registries + +toc::[] + +[role="_abstract"] +When my workloads pull from private or authenticated registries, I want to configure image pull secrets, so I can authenticate across projects and secured registries. + +== Enable cross-project image access + +include::modules/images-allow-pods-to-reference-images-across-projects.adoc[leveloffset=+1] + +== Create and link pull secrets + +include::modules/images-allow-pods-to-reference-images-from-secure-registries.adoc[leveloffset=+3] + +include::modules/creating-pull-secrets.adoc[leveloffset=+2] + +include::modules/using-pull-secret.adoc[leveloffset=+2] + +== Handle delegated authentication + +include::modules/images-pulling-from-private-registries.adoc[leveloffset=+2] + +== Update global cluster pull secret + +include::modules/images-update-global-pull-secret.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/secure/images b/openshift_images_jtbd/secure/images new file mode 100644 index 000000000000..6175e1d31283 --- /dev/null +++ b/openshift_images_jtbd/secure/images @@ -0,0 +1 @@ +../../images/ diff --git a/openshift_images_jtbd/secure/modules b/openshift_images_jtbd/secure/modules new file mode 100644 index 000000000000..a9a6af0da50a --- /dev/null +++ b/openshift_images_jtbd/secure/modules @@ -0,0 +1 @@ +../../modules/ diff --git a/openshift_images_jtbd/secure/snippets b/openshift_images_jtbd/secure/snippets new file mode 100644 index 000000000000..c3bec4584f2f --- /dev/null +++ b/openshift_images_jtbd/secure/snippets @@ -0,0 +1 @@ +../../snippets/ From 95bf9ca5372b8d50a423c2e39790eded41aa1be2 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 16 Jun 2026 11:46:08 -0400 Subject: [PATCH 2/5] Remove duplicate Images JTBD topic map file. Keep _topic_map_jtbd.yml as the single JTBD topic map for the openshift-jtbd distro; drop redundant _topic_map_jtbd_images.yml copy. Co-authored-by: Cursor --- _topic_maps/_topic_map_jtbd_images.yml | 62 -------------------------- 1 file changed, 62 deletions(-) delete mode 100644 _topic_maps/_topic_map_jtbd_images.yml diff --git a/_topic_maps/_topic_map_jtbd_images.yml b/_topic_maps/_topic_map_jtbd_images.yml deleted file mode 100644 index fc4f8a4d8a50..000000000000 --- a/_topic_maps/_topic_map_jtbd_images.yml +++ /dev/null @@ -1,62 +0,0 @@ -# POC: JTBD-based Images book structure -# Source: openshift_images consolidation report + Images JTBD statements.xlsx -# Do not merge — structural POC only - -Name: Discover -Dir: openshift_images_jtbd/discover -Distros: openshift-jtbd -Topics: -- Name: Understand container images in OpenShift - File: understand-container-images-in-openshift - -Name: Administer -Dir: openshift_images_jtbd/administer -Distros: openshift-jtbd -Topics: -- Name: Manage cluster sample image streams - File: manage-cluster-sample-image-streams -- Name: Configure cluster-wide image policy - File: configure-cluster-wide-image-policy - -Name: Develop -Dir: openshift_images_jtbd/develop -Distros: openshift-jtbd -Topics: -- Name: Create container images for OpenShift - File: create-container-images-for-openshift -- Name: Build S2I builder images - File: build-s2i-builder-images -- Name: Deploy applications with Red Hat S2I images - File: deploy-applications-with-red-hat-s2i-images - -Name: Configure -Dir: openshift_images_jtbd/configure -Distros: openshift-jtbd -Topics: -- Name: Mirror container images to a local registry - File: mirror-container-images-to-a-local-registry -- Name: Organize image versions with tags - File: organize-image-versions-with-tags -- Name: Control container image pull behavior - File: control-container-image-pull-behavior - -Name: Secure -Dir: openshift_images_jtbd/secure -Distros: openshift-jtbd -Topics: -- Name: Authenticate workloads with private registries - File: authenticate-workloads-with-private-registries - -Name: Integrate -Dir: openshift_images_jtbd/integrate -Distros: openshift-jtbd -Topics: -- Name: Automate CI/CD with image streams - File: automate-ci-cd-with-image-streams - -Name: Optimize -Dir: openshift_images_jtbd/optimize -Distros: openshift-jtbd -Topics: -- Name: Manage image streams and imports - File: manage-image-streams-and-imports From 8146827ef533588c7db8116523a04b8ac7828172 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 16 Jun 2026 12:01:02 -0400 Subject: [PATCH 3/5] Restore missing Images modules in JTBD job assemblies. Align Jobs 3, 4, and 9 with openshift_images source assemblies so the classic Images book has full module coverage excluding HCP content. Co-authored-by: Cursor --- ...-container-images-to-a-local-registry.adoc | 10 ++++-- .../organize-image-versions-with-tags.adoc | 10 +++--- .../manage-image-streams-and-imports.adoc | 31 ++++++++++++++----- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc b/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc index dab49a29b945..f3f2d2540f9a 100644 --- a/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc +++ b/openshift_images_jtbd/configure/mirror-container-images-to-a-local-registry.adoc @@ -13,10 +13,16 @@ When I operate OpenShift in a restricted network, I want to mirror required cont include::modules/installation-about-mirror-registry.adoc[leveloffset=+1] +include::modules/cli-installing-cli-linux.adoc[leveloffset=+2] + +include::modules/cli-installing-cli-windows.adoc[leveloffset=+2] + +include::modules/cli-installing-cli-macos.adoc[leveloffset=+2] + == Configure mirroring credentials -include::modules/cli-installing-cli-linux.adoc[leveloffset=+2] +include::modules/installation-adding-registry-pull-secret.adoc[leveloffset=+1] == Mirror release images -include::modules/cli-installing-cli-windows.adoc[leveloffset=+2] +include::modules/installation-mirror-repository.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc b/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc index 025cd91c2725..c2cb7e2a0925 100644 --- a/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc +++ b/openshift_images_jtbd/configure/organize-image-versions-with-tags.adoc @@ -13,14 +13,16 @@ When I reference container images in builds and deployments, I want to use human include::modules/images-tag.adoc[leveloffset=+1] -== Add and remove tags - include::modules/images-tagging-conventions.adoc[leveloffset=+1] -include::modules/images-add-tags-to-imagestreams.adoc[leveloffset=+1] +== Add and remove tags -== Choose reference syntax and types +include::modules/images-add-tags-to-imagestreams.adoc[leveloffset=+1] include::modules/images-remove-tag-imagestream.adoc[leveloffset=+1] +== Choose reference syntax and types + include::modules/images-referencing-images-imagestreams.adoc[leveloffset=+1] + +include::modules/images-imagestream-reference-types.adoc[leveloffset=+1] diff --git a/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc b/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc index b7713955b05f..e7cc378486a7 100644 --- a/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc +++ b/openshift_images_jtbd/optimize/manage-image-streams-and-imports.adoc @@ -9,40 +9,57 @@ toc::[] [role="_abstract"] When I manage container images in OpenShift, I want to use image streams to abstract and track image versions, so I can import, tag, and inspect images without re-pushing manually. -== Inspect image streams and tags +== Understand and configure image streams -include::modules/images-imagestream-configure.adoc[leveloffset=+1] +include::modules/images-imagestream-use.adoc[leveloffset=+1] -== Tag external and internal images +include::modules/images-imagestream-configure.adoc[leveloffset=+1] include::modules/images-using-imagestream-images.adoc[leveloffset=+1] include::modules/images-using-imagestream-tags.adoc[leveloffset=+1] +include::modules/images-using-imagestream-change-triggers.adoc[leveloffset=+1] + +ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] include::modules/images-imagestream-mapping.adoc[leveloffset=+1] +endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[] + include::modules/working-with-image-streams.adoc[leveloffset=+1] -== Schedule periodic re-import +include::snippets/default-projects.adoc[] + +== Inspect image streams and tags include::modules/images-getting-info-about-imagestreams.adoc[leveloffset=+2] include::modules/images-imagestream-adding-tags.adoc[leveloffset=+2] -== Import from private registries and manifest lists - include::modules/images-imagestream-external-image-tags.adoc[leveloffset=+2] include::modules/images-imagestream-update-tag.adoc[leveloffset=+2] include::modules/images-imagestream-remove-tag.adoc[leveloffset=+2] +== Import images and configure import behavior + include::modules/images-imagestream-import.adoc[leveloffset=+2] include::modules/images-imagestream-import-images-image-streams.adoc[leveloffset=+1] include::modules/images-imagestream-import-images-private-registry.adoc[leveloffset=+2] +include::modules/images-imagestream-import-import-mode.adoc[leveloffset=+2] + +include::modules/images-imagestream-periodic-import-list.adoc[leveloffset=+3] + +include::modules/images-imagestream-ssl-import-list.adoc[leveloffset=+3] + +include::modules/images-imagestream-specify-architecture.adoc[leveloffset=+2] + +include::modules/importmode-configuration-fields.adoc[leveloffset=+2] + == Reference image streams in Kubernetes workloads -include::modules/images-imagestream-import-import-mode.adoc[leveloffset=+2] +include::modules/images-managing-images-enabling-imagestreams-kube.adoc[leveloffset=+1] From b1c44e625bb6432cb510c7cd21d29cb5c4677285 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 16 Jun 2026 13:49:50 -0400 Subject: [PATCH 4/5] Fix JTBD Images shared-resource paths as git symlinks. Replace plain-text path stubs with real symlinks to _attributes, modules, snippets, and images so asciidoctor can resolve includes in CI. Co-authored-by: Cursor --- openshift_images_jtbd/administer/_attributes | 2 +- openshift_images_jtbd/administer/images | 2 +- openshift_images_jtbd/administer/modules | 2 +- openshift_images_jtbd/administer/snippets | 2 +- openshift_images_jtbd/configure/_attributes | 2 +- openshift_images_jtbd/configure/images | 2 +- openshift_images_jtbd/configure/modules | 2 +- openshift_images_jtbd/configure/snippets | 2 +- openshift_images_jtbd/develop/_attributes | 2 +- openshift_images_jtbd/develop/images | 2 +- openshift_images_jtbd/develop/modules | 2 +- openshift_images_jtbd/develop/snippets | 2 +- openshift_images_jtbd/discover/_attributes | 2 +- openshift_images_jtbd/discover/images | 2 +- openshift_images_jtbd/discover/modules | 2 +- openshift_images_jtbd/discover/snippets | 2 +- openshift_images_jtbd/integrate/_attributes | 2 +- openshift_images_jtbd/integrate/images | 2 +- openshift_images_jtbd/integrate/modules | 2 +- openshift_images_jtbd/integrate/snippets | 2 +- openshift_images_jtbd/optimize/_attributes | 2 +- openshift_images_jtbd/optimize/images | 2 +- openshift_images_jtbd/optimize/modules | 2 +- openshift_images_jtbd/optimize/snippets | 2 +- openshift_images_jtbd/secure/_attributes | 2 +- openshift_images_jtbd/secure/images | 2 +- openshift_images_jtbd/secure/modules | 2 +- openshift_images_jtbd/secure/snippets | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) mode change 100644 => 120000 openshift_images_jtbd/administer/_attributes mode change 100644 => 120000 openshift_images_jtbd/administer/images mode change 100644 => 120000 openshift_images_jtbd/administer/modules mode change 100644 => 120000 openshift_images_jtbd/administer/snippets mode change 100644 => 120000 openshift_images_jtbd/configure/_attributes mode change 100644 => 120000 openshift_images_jtbd/configure/images mode change 100644 => 120000 openshift_images_jtbd/configure/modules mode change 100644 => 120000 openshift_images_jtbd/configure/snippets mode change 100644 => 120000 openshift_images_jtbd/develop/_attributes mode change 100644 => 120000 openshift_images_jtbd/develop/images mode change 100644 => 120000 openshift_images_jtbd/develop/modules mode change 100644 => 120000 openshift_images_jtbd/develop/snippets mode change 100644 => 120000 openshift_images_jtbd/discover/_attributes mode change 100644 => 120000 openshift_images_jtbd/discover/images mode change 100644 => 120000 openshift_images_jtbd/discover/modules mode change 100644 => 120000 openshift_images_jtbd/discover/snippets mode change 100644 => 120000 openshift_images_jtbd/integrate/_attributes mode change 100644 => 120000 openshift_images_jtbd/integrate/images mode change 100644 => 120000 openshift_images_jtbd/integrate/modules mode change 100644 => 120000 openshift_images_jtbd/integrate/snippets mode change 100644 => 120000 openshift_images_jtbd/optimize/_attributes mode change 100644 => 120000 openshift_images_jtbd/optimize/images mode change 100644 => 120000 openshift_images_jtbd/optimize/modules mode change 100644 => 120000 openshift_images_jtbd/optimize/snippets mode change 100644 => 120000 openshift_images_jtbd/secure/_attributes mode change 100644 => 120000 openshift_images_jtbd/secure/images mode change 100644 => 120000 openshift_images_jtbd/secure/modules mode change 100644 => 120000 openshift_images_jtbd/secure/snippets diff --git a/openshift_images_jtbd/administer/_attributes b/openshift_images_jtbd/administer/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/administer/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/administer/_attributes b/openshift_images_jtbd/administer/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/administer/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/administer/images b/openshift_images_jtbd/administer/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/administer/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/administer/images b/openshift_images_jtbd/administer/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/administer/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/administer/modules b/openshift_images_jtbd/administer/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/administer/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/administer/modules b/openshift_images_jtbd/administer/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/administer/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/administer/snippets b/openshift_images_jtbd/administer/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/administer/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/administer/snippets b/openshift_images_jtbd/administer/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/administer/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/configure/_attributes b/openshift_images_jtbd/configure/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/configure/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/configure/_attributes b/openshift_images_jtbd/configure/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/configure/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/configure/images b/openshift_images_jtbd/configure/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/configure/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/configure/images b/openshift_images_jtbd/configure/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/configure/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/configure/modules b/openshift_images_jtbd/configure/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/configure/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/configure/modules b/openshift_images_jtbd/configure/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/configure/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/configure/snippets b/openshift_images_jtbd/configure/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/configure/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/configure/snippets b/openshift_images_jtbd/configure/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/configure/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/develop/_attributes b/openshift_images_jtbd/develop/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/develop/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/develop/_attributes b/openshift_images_jtbd/develop/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/develop/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/develop/images b/openshift_images_jtbd/develop/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/develop/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/develop/images b/openshift_images_jtbd/develop/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/develop/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/develop/modules b/openshift_images_jtbd/develop/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/develop/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/develop/modules b/openshift_images_jtbd/develop/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/develop/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/develop/snippets b/openshift_images_jtbd/develop/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/develop/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/develop/snippets b/openshift_images_jtbd/develop/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/develop/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/discover/_attributes b/openshift_images_jtbd/discover/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/discover/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/discover/_attributes b/openshift_images_jtbd/discover/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/discover/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/discover/images b/openshift_images_jtbd/discover/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/discover/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/discover/images b/openshift_images_jtbd/discover/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/discover/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/discover/modules b/openshift_images_jtbd/discover/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/discover/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/discover/modules b/openshift_images_jtbd/discover/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/discover/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/discover/snippets b/openshift_images_jtbd/discover/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/discover/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/discover/snippets b/openshift_images_jtbd/discover/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/discover/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/integrate/_attributes b/openshift_images_jtbd/integrate/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/integrate/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/integrate/_attributes b/openshift_images_jtbd/integrate/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/integrate/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/integrate/images b/openshift_images_jtbd/integrate/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/integrate/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/integrate/images b/openshift_images_jtbd/integrate/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/integrate/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/integrate/modules b/openshift_images_jtbd/integrate/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/integrate/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/integrate/modules b/openshift_images_jtbd/integrate/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/integrate/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/integrate/snippets b/openshift_images_jtbd/integrate/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/integrate/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/integrate/snippets b/openshift_images_jtbd/integrate/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/integrate/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/optimize/_attributes b/openshift_images_jtbd/optimize/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/optimize/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/optimize/_attributes b/openshift_images_jtbd/optimize/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/optimize/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/optimize/images b/openshift_images_jtbd/optimize/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/optimize/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/optimize/images b/openshift_images_jtbd/optimize/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/optimize/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/optimize/modules b/openshift_images_jtbd/optimize/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/optimize/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/optimize/modules b/openshift_images_jtbd/optimize/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/optimize/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/optimize/snippets b/openshift_images_jtbd/optimize/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/optimize/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/optimize/snippets b/openshift_images_jtbd/optimize/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/optimize/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file diff --git a/openshift_images_jtbd/secure/_attributes b/openshift_images_jtbd/secure/_attributes deleted file mode 100644 index 1ecfea29367b..000000000000 --- a/openshift_images_jtbd/secure/_attributes +++ /dev/null @@ -1 +0,0 @@ -../../_attributes/ diff --git a/openshift_images_jtbd/secure/_attributes b/openshift_images_jtbd/secure/_attributes new file mode 120000 index 000000000000..20cc1dcb77bf --- /dev/null +++ b/openshift_images_jtbd/secure/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/openshift_images_jtbd/secure/images b/openshift_images_jtbd/secure/images deleted file mode 100644 index 6175e1d31283..000000000000 --- a/openshift_images_jtbd/secure/images +++ /dev/null @@ -1 +0,0 @@ -../../images/ diff --git a/openshift_images_jtbd/secure/images b/openshift_images_jtbd/secure/images new file mode 120000 index 000000000000..847b03ed0541 --- /dev/null +++ b/openshift_images_jtbd/secure/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/openshift_images_jtbd/secure/modules b/openshift_images_jtbd/secure/modules deleted file mode 100644 index a9a6af0da50a..000000000000 --- a/openshift_images_jtbd/secure/modules +++ /dev/null @@ -1 +0,0 @@ -../../modules/ diff --git a/openshift_images_jtbd/secure/modules b/openshift_images_jtbd/secure/modules new file mode 120000 index 000000000000..8b0e8540076d --- /dev/null +++ b/openshift_images_jtbd/secure/modules @@ -0,0 +1 @@ +../../modules \ No newline at end of file diff --git a/openshift_images_jtbd/secure/snippets b/openshift_images_jtbd/secure/snippets deleted file mode 100644 index c3bec4584f2f..000000000000 --- a/openshift_images_jtbd/secure/snippets +++ /dev/null @@ -1 +0,0 @@ -../../snippets/ diff --git a/openshift_images_jtbd/secure/snippets b/openshift_images_jtbd/secure/snippets new file mode 120000 index 000000000000..7bf6da9a51d0 --- /dev/null +++ b/openshift_images_jtbd/secure/snippets @@ -0,0 +1 @@ +../../snippets \ No newline at end of file From dbcb926d5d1bca96f426a156e5625cfa73ca45b0 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 16 Jun 2026 15:36:18 -0400 Subject: [PATCH 5/5] Fix JTBD Images preview build configuration. Nest topic map directories for AsciiBinder compatibility and register the feature branch in the openshift-jtbd distro map so local builds generate HTML under container-platform-jtbd/4.22. Co-authored-by: Cursor --- _distro_map.yml | 3 + _topic_maps/_topic_map_jtbd.yml | 97 ++++++++++++++++----------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/_distro_map.yml b/_distro_map.yml index dff2051fcf4f..0ae920fe1f8c 100644 --- a/_distro_map.yml +++ b/_distro_map.yml @@ -575,3 +575,6 @@ openshift-jtbd: enterprise-4.22: name: '4.22' dir: container-platform-jtbd/4.22 + testing-jtbd-openshift-images: + name: '4.22' + dir: container-platform-jtbd/4.22 diff --git a/_topic_maps/_topic_map_jtbd.yml b/_topic_maps/_topic_map_jtbd.yml index fc4f8a4d8a50..e9c9fe73b3c1 100644 --- a/_topic_maps/_topic_map_jtbd.yml +++ b/_topic_maps/_topic_map_jtbd.yml @@ -2,61 +2,58 @@ # Source: openshift_images consolidation report + Images JTBD statements.xlsx # Do not merge — structural POC only -Name: Discover -Dir: openshift_images_jtbd/discover +Name: Images +Dir: openshift_images_jtbd Distros: openshift-jtbd Topics: -- Name: Understand container images in OpenShift - File: understand-container-images-in-openshift +- Name: Discover + Dir: discover + Topics: + - Name: Understand container images in OpenShift + File: understand-container-images-in-openshift -Name: Administer -Dir: openshift_images_jtbd/administer -Distros: openshift-jtbd -Topics: -- Name: Manage cluster sample image streams - File: manage-cluster-sample-image-streams -- Name: Configure cluster-wide image policy - File: configure-cluster-wide-image-policy +- Name: Administer + Dir: administer + Topics: + - Name: Manage cluster sample image streams + File: manage-cluster-sample-image-streams + - Name: Configure cluster-wide image policy + File: configure-cluster-wide-image-policy -Name: Develop -Dir: openshift_images_jtbd/develop -Distros: openshift-jtbd -Topics: -- Name: Create container images for OpenShift - File: create-container-images-for-openshift -- Name: Build S2I builder images - File: build-s2i-builder-images -- Name: Deploy applications with Red Hat S2I images - File: deploy-applications-with-red-hat-s2i-images +- Name: Develop + Dir: develop + Topics: + - Name: Create container images for OpenShift + File: create-container-images-for-openshift + - Name: Build S2I builder images + File: build-s2i-builder-images + - Name: Deploy applications with Red Hat S2I images + File: deploy-applications-with-red-hat-s2i-images -Name: Configure -Dir: openshift_images_jtbd/configure -Distros: openshift-jtbd -Topics: -- Name: Mirror container images to a local registry - File: mirror-container-images-to-a-local-registry -- Name: Organize image versions with tags - File: organize-image-versions-with-tags -- Name: Control container image pull behavior - File: control-container-image-pull-behavior +- Name: Configure + Dir: configure + Topics: + - Name: Mirror container images to a local registry + File: mirror-container-images-to-a-local-registry + - Name: Organize image versions with tags + File: organize-image-versions-with-tags + - Name: Control container image pull behavior + File: control-container-image-pull-behavior -Name: Secure -Dir: openshift_images_jtbd/secure -Distros: openshift-jtbd -Topics: -- Name: Authenticate workloads with private registries - File: authenticate-workloads-with-private-registries +- Name: Secure + Dir: secure + Topics: + - Name: Authenticate workloads with private registries + File: authenticate-workloads-with-private-registries -Name: Integrate -Dir: openshift_images_jtbd/integrate -Distros: openshift-jtbd -Topics: -- Name: Automate CI/CD with image streams - File: automate-ci-cd-with-image-streams +- Name: Integrate + Dir: integrate + Topics: + - Name: Automate CI/CD with image streams + File: automate-ci-cd-with-image-streams -Name: Optimize -Dir: openshift_images_jtbd/optimize -Distros: openshift-jtbd -Topics: -- Name: Manage image streams and imports - File: manage-image-streams-and-imports +- Name: Optimize + Dir: optimize + Topics: + - Name: Manage image streams and imports + File: manage-image-streams-and-imports