Merge pull request #14167 from bmcelvee/PR14077

PR14077 follow up and update to imagestreams

Author: bmcelvee

_topic_map.yml

@@ -40,8 +40,18 @@ Name: Architecture
 Dir: architecture
 Distros: openshift-*
 Topics:
-- Name: Architecture
+- Name: OpenShift Container Platform architecture
   File: architecture
+- Name: Abstraction layers and topology
+  File: architecture-topology
+- Name: Installation and update
+  File: architecture-installation
+- Name: Operators in OpenShift Container Platform
+  File: architecture-operators
+- Name: Machine API Overview
+  File: architecture-machine-api-overview
+
+
 - Name: Available cluster customizations
   File: customizations
 ---
@@ -176,8 +186,10 @@ Name: Builds
 Dir: builds
 Distros: openshift-*
 Topics:
-- Name: Understanding builds
-  File: understanding-builds
+- Name: Understanding image builds
+  File: understanding-image-builds
+- Name: Understanding build configurations
+  File: understanding-buildconfigs
 - Name: Creating build inputs
   File: creating-build-inputs
 - Name: Managing build output
@@ -203,11 +215,11 @@ Distros: openshift-*
 Topics:
 - Name: Configuring the Samples Operator
   File: configuring-samples-operator
-- Name: Understanding containers, images, and image streams
+- Name: Understanding containers, images, and imagestreams
   File: images-understand
 - Name: Creating images
   File: create-images
-- Name: Managing image streams
+- Name: Managing imagestreams
   File: image-streams-manage
 - Name: Using templates
   File: using-templates
@@ -300,6 +312,8 @@ Name: Registry
 Dir: registry
 Distros: openshift-*
 Topics:
+- Name: Overview
+  File: architecture-component-imageregistry
 - Name: Registry options
   File: registry-options
 - Name: Accessing the registry

applications/deployments/what-deployments-are.adoc

@@ -64,7 +64,7 @@ Update when converted:
 
 .Additional resources
 
-- xref:../../dev_guide/managing_images.adoc#dev-guide-managing-images[Image streams]
+- xref:../../dev_guide/managing_images.adoc#dev-guide-managing-images[Imagestreams]
 - xref:../../dev_guide/deployments/deployment_strategies.adoc#lifecycle-hooks[Lifecycle hooks]
 - xref:../../dev_guide/deployments/deployment_strategies.adoc#custom-strategy[Custom deployment strategies]
 ////

architecture/architecture-installation.adoc

@@ -0,0 +1,13 @@
+[id="architecture-installation"]
+= Installation and update
+include::modules/common-attributes.adoc[]
+:context: architecture-installation
+toc::[]
+
+include::modules/installation-options.adoc[leveloffset=+1]
+
+include::modules/update-service-overview.adoc[leveloffset=+1]
+
+include::modules/node-management.adoc[leveloffset=+1]
+
+include::modules/node-types.adoc[leveloffset=+1]

architecture/architecture-machine-api-overview.adoc

@@ -0,0 +1,13 @@
+[id="architecture-machine-api-overview"]
+= Machine API overview
+include::modules/common-attributes.adoc[]
+:context: architecture-machine-api-overview
+toc::[]
+
+
+For {product-title} {product-version} clusters, the Machine API performs all node
+management actions after the cluster installation finishes. Because of this
+system, {product-title} {product-version} offers an elastic, dynamic provisioning
+method on top of public or private cloud infrastructure.
+
+include::modules/machine-api-overview.adoc[leveloffset=+1]

architecture/architecture-operators.adoc

@@ -0,0 +1,7 @@
+[id="architecture-operators"]
+= Operators in {product-title}
+include::modules/common-attributes.adoc[]
+:context: architecture-operators
+toc::[]
+
+include::modules/operators-overview.adoc[leveloffset=+1]

architecture/architecture-topology.adoc

@@ -0,0 +1,7 @@
+[id="architecture-topology"]
+= {product-title} abstraction layers and topology
+include::modules/common-attributes.adoc[]
+:context: architecture-topology
+toc::[]
+
+include::modules/abstraction-layers.adoc[leveloffset=+1]

architecture/architecture.adoc

@@ -1,45 +1,54 @@
-// This assembly is included in the following assemblies:
-//
-// * n/a
-
 [id="architecture"]
 = {product-title} architecture
 include::modules/common-attributes.adoc[]
 :context: architecture
 toc::[]
 
-[IMPORTANT]
-====
-This assembly is a temporary placeholder to port the valid information from
-the 3.11 collection and include specific changes for 4.0 as that information
-becomes available.
-====
+//[IMPORTANT]
+//====
+//This assembly is a temporary placeholder to port the valid information from
+//the 3.11 collection and include specific changes for 4.0 as that information
+//becomes available.
+//====
 
 include::modules/architecture-overview.adoc[leveloffset=+1]
 
-include::modules/installation-options.adoc[leveloffset=+2]
-
-include::modules/update-service-overview.adoc[leveloffset=+2]
-
-include::modules/node-management.adoc[leveloffset=+2]
-
-include::modules/node-types.adoc[leveloffset=+2]
-
-include::modules/operators-overview.adoc[leveloffset=+2]
-
-include::modules/abstraction-layers.adoc[leveloffset=+2]
-
-include::modules/machine-api-overview.adoc[leveloffset=+1]
-
-[id="observability-architecture-{context}"]
-== Observability
-
-[IMPORTANT]
-====
-This section of the assembly is a placeholder for the Observability section,
-which will explain how monitoring, alerting, grafana, logging, and telemetry fit together.
-====
+include::modules/architecture-components.adoc[leveloffset=+1]
+
+== User facing components
+* Workloads (Deployments, Jobs, ReplicaSets, etc)
+* Operator Lifecycle Manager
+* xref:../builds/understanding-image-builds.adoc[Builds] - The build component
+provides an API and infrastructure for producing new container images using a
+variety of techniques including industry standard Dockerfiles and publishing
+them to either the cluster image registry, or an external registry. It also
+provides integration with Jenkins based pipeline continuous integration
+workflows.
+* xref:../registry/architecture-component-imageregistry.adoc[Image Registry] -
+The image registry provides a scalable repository for storing and retrieving
+container images that are produced by and run on the cluster. Image access is
+integrated with the cluster’s role-based access controls and user authentication
+system.
+* xref:../openshift_images/images-understand.adoc[Image
+streams] - The imagestream API provides an abstraction over container images
+that exist in registries. It allows workloads to reference an image indirectly,
+retains a history of the images that have been referenced, and allows
+notification when an image is updated with a new version.
+
+== User interface
+* Web Console
+* CLI
+* Rest API
+
+
+//[id="observability-architecture-{context}"]
+//== Observability
+//
+//[IMPORTANT]
+//====
+//This section of the assembly is a placeholder for the Observability section,
+//which will explain how monitoring, alerting, grafana, logging, and telemetry fit
+//together.
+//====
 
 include::modules/telemetry-service-overview.adoc[leveloffset=+2]
-
-include::modules/architecture-new-content.adoc[leveloffset=+1]

architecture/customizations.adoc

@@ -1,7 +1,3 @@
-// This assembly is included in the following assemblies:
-//
-// * n/a
-
 [id="customizations"]
 = Available cluster customizations
 include::modules/common-attributes.adoc[]
@@ -26,8 +22,7 @@ Custom Resource Definitions (CRDs) that are deployed on your cluster.
 |Configuration resource |Description
 
 |Authentication
-|You can configure the identity provider for your cluster. See
-xref:../authentication/understanding-identity-provider.adoc#understanding-identity-provider[Understanding identity provider configuration].
+|You can configure the identity provider for your cluster.
 
 |DNS
 |See
@@ -404,4 +399,3 @@ new values. If it is deleted, it recreates automatically.
 |Namespaced
 |
 |===
-

builds/understanding-buildconfigs.adoc

@@ -0,0 +1,10 @@
+[id="understanding-buildconfigs"]
+= Understanding build configurations
+include::modules/common-attributes.adoc[]
+:context: understanding-builds
+toc::[]
+
+The following sections define the concept of a build, `BuildConfig`, and outline
+the primary build strategies available.
+
+include::modules/builds-buildconfig.adoc[leveloffset=+1]