Skip to content

Commit 4f97aca

Browse files
eohartmanopenshift-cherrypick-robot
authored andcommitted
Beginning Images Classic to HCP breakout.
1 parent 5d52dbc commit 4f97aca

10 files changed

+84
-35
lines changed

_topic_maps/_topic_map_rosa_hcp.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,55 @@ Topics:
632632
- Name: Important changes to OpenShift Jenkins images
633633
File: important-changes-to-openshift-jenkins-images
634634
---
635+
Name: Images
636+
Dir: openshift_images
637+
Distros: openshift-rosa-hcp
638+
Topics:
639+
- Name: Overview of images
640+
File: index
641+
# replaced Configuring the Cluster Samples Operator name, cannot configure the operator
642+
- Name: Overview of the Cluster Samples Operator
643+
File: configuring-samples-operator
644+
Distros: openshift-rosa-hcp
645+
- Name: Using the Cluster Samples Operator with an alternate registry
646+
File: samples-operator-alt-registry
647+
Distros: openshift-rosa-hcp
648+
- Name: Creating images
649+
File: create-images
650+
- Name: Managing images
651+
Dir: managing_images
652+
Topics:
653+
- Name: Managing images overview
654+
File: managing-images-overview
655+
- Name: Tagging images
656+
File: tagging-images
657+
- Name: Image pull policy
658+
File: image-pull-policy
659+
- Name: Using image pull secrets
660+
File: using-image-pull-secrets
661+
- Name: Managing image streams
662+
File: image-streams-manage
663+
Distros: openshift-rosa-hcp
664+
- Name: Using image streams with Kubernetes resources
665+
File: using-imagestreams-with-kube-resources
666+
Distros: openshift-rosa-hcp
667+
- Name: Triggering updates on image stream changes
668+
File: triggering-updates-on-imagestream-changes
669+
Distros: openshift-rosa-hcp
670+
- Name: Image configuration resources (HCP)
671+
File: image-configuration-hcp
672+
Distros: openshift-rosa-hcp
673+
- Name: Using images
674+
Dir: using_images
675+
Distros: openshift-rosa-hcp
676+
Topics:
677+
- Name: Using images overview
678+
File: using-images-overview
679+
- Name: Source-to-image
680+
File: using-s21-images
681+
- Name: Customizing source-to-image images
682+
File: customizing-s2i-images
683+
---
635684
Name: Storage
636685
Dir: storage
637686
Distros: openshift-rosa-hcp

modules/images-imagestream-import-images-private-registry.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id="images-imagestream-import-images-private-registry_{context}"]
66
= Importing images and image streams from private registries
77

8-
An image stream can be configured to import tag and image metadata from private image registries requiring authentication. This procedures applies if you change the registry that the Cluster Samples Operator uses to pull content from to something other than link:https://registry.redhat.io[registry.redhat.io].
8+
An image stream can be configured to import tag and image metadata from private image registries requiring authentication. This procedure applies if you change the registry that the Cluster Samples Operator uses to pull content from to something other than link:https://registry.redhat.io[registry.redhat.io].
99

1010
[NOTE]
1111
====

modules/images-using-imagestream-tags.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
An image stream tag is a named pointer to an image in an image stream. It is abbreviated as `istag`. An image stream tag is used to reference or retrieve an image for a given image stream and tag.
88

9-
Image stream tags can reference any local or externally managed image. It contains a history of images represented as a stack of all images the tag ever pointed to. Whenever a new or existing image is tagged under particular image stream tag, it is placed at the first position in the history stack. The image previously occupying the top position is available at the second position. This allows for easy rollbacks to make tags point to historical images again.
9+
Image stream tags can reference any local or externally managed image. It contains a history of images represented as a stack of all images the tag ever pointed to. Whenever a new or existing image is tagged under a particular image stream tag, it is placed at the first position in the history stack. The image previously occupying the top position is available at the second position. This allows for easy rollbacks to make tags point to historical images again.
1010

1111
The following image stream tag is from an `ImageStream` object:
1212

modules/samples-operator-overview.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ Certain circumstances result in the Cluster Samples Operator bootstrapping itsel
5454
* If the Cluster Samples Operator cannot reach link:https://registry.redhat.io[registry.redhat.io] after three minutes on initial startup after a clean installation.
5555
* If the Cluster Samples Operator detects it is on an IPv6 network.
5656
// cannot configure the Samples Operator
57-
ifndef::openshift-rosa,openshift-dedicated[]
57+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5858
* If the xref:../openshift_images/image-configuration.adoc#images-configuration-parameters_image-configuration[image controller configuration parameters] prevent the creation of image streams by using the default image registry, or by using the image registry specified by the xref:../openshift_images/configuring-samples-operator.adoc#samples-operator-configuration_configuring-samples-operator[`samplesRegistry` setting].
59-
endif::openshift-rosa,openshift-dedicated[]
59+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
6060

6161
[NOTE]
6262
====
6363
For {product-title}, the default image registry is
6464
ifdef::openshift-enterprise[]
6565
`registry.redhat.io`.
6666
endif::[]
67-
ifdef::openshift-rosa,openshift-dedicated,openshift-origin[]
67+
ifdef::openshift-rosa,openshift-dedicated,openshift-rosa-hcp,openshift-origin[]
6868
`registry.access.redhat.com` or `quay.io`.
6969
endif::[]
7070
====

openshift_images/configuring-samples-operator.adoc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
ifndef::openshift-rosa,openshift-dedicated[]
1+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
22
:_mod-docs-content-type: ASSEMBLY
33
[id="configuring-samples-operator"]
44
= Configuring the Cluster Samples Operator
55
include::_attributes/common-attributes.adoc[]
66
:context: configuring-samples-operator
7-
endif::openshift-rosa,openshift-dedicated[]
8-
ifdef::openshift-rosa,openshift-dedicated[]
7+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
8+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
99
:_mod-docs-content-type: ASSEMBLY
1010
[id="configuring-samples-operator"]
1111
= Overview of the Cluster Samples Operator
1212
include::_attributes/common-attributes.adoc[]
1313
:context: configuring-samples-operator
14-
endif::openshift-rosa,openshift-dedicated[]
14+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1515

1616
toc::[]
1717

18-
ifndef::openshift-rosa,openshift-dedicated[]
18+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1919
The Cluster Samples Operator, which operates in the `openshift` namespace, installs and updates the {op-system-base-full}-based {product-title} image streams and {product-title} templates.
20-
endif::openshift-rosa,openshift-dedicated[]
21-
ifdef::openshift-rosa,openshift-dedicated[]
20+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
21+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2222
The Cluster Samples Operator, which operates in the `openshift` namespace, installs and updates the {product-title} image streams and {product-title} templates.
23-
endif::openshift-rosa,openshift-dedicated[]
23+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2424

2525
[IMPORTANT]
2626
.The Cluster Samples Operator is being deprecated
@@ -50,24 +50,24 @@ include::modules/samples-operator-overview.adoc[leveloffset=+1]
5050

5151
* If the Cluster Samples Operator is removed during installation, you can xref:../openshift_images/samples-operator-alt-registry.adoc#samples-operator-alt-registry[use the Cluster Samples Operator with an alternate registry] so content can be imported, and then set the Cluster Samples Operator to `Managed` to get the samples.
5252
// Restricted network not supported ROSA/OSD
53-
ifndef::openshift-rosa,openshift-dedicated[]
53+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5454
* To ensure the Cluster Samples Operator bootstraps as `Removed` in a restricted network installation with initial network access to defer samples installation until you have decided which samples are desired, follow the instructions for xref:../installing/install_config/installing-customizing.adoc#installing-customizing[customizing nodes] to override the Cluster Samples Operator default configuration and initially come up as `Removed`.
5555
** To host samples in your disconnected environment, follow the instructions for xref:../openshift_images/samples-operator-alt-registry.adoc#samples-operator-alt-registry[using the Cluster Samples Operator with an alternate registry].
56-
endif::openshift-rosa,openshift-dedicated[]
56+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5757

5858
// Restricted network not supported ROSA/OSD
59-
ifndef::openshift-rosa,openshift-dedicated[]
59+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
6060
include::modules/installation-images-samples-disconnected-mirroring-assist.adoc[leveloffset=+2]
6161

6262
See xref:../openshift_images/samples-operator-alt-registry.adoc#installation-restricted-network-samples_samples-operator-alt-registry[Using Cluster Samples Operator image streams with alternate or mirrored registries] for a detailed procedure.
63-
endif::openshift-rosa,openshift-dedicated[]
63+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
6464

6565
// cannot patch resource "configs" in API group "samples.operator.openshift.io"
66-
ifndef::openshift-rosa,openshift-dedicated[]
66+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
6767
include::modules/samples-operator-configuration.adoc[leveloffset=+1]
6868

6969
include::modules/samples-operator-crd.adoc[leveloffset=+1]
70-
endif::openshift-rosa,openshift-dedicated[]
70+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
7171

7272
include::modules/images-samples-operator-deprecated-image-stream.adoc[leveloffset=+1]
7373

openshift_images/image-configuration-hcp.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_mod-docs-content-type: ASSEMBLY
22
include::_attributes/common-attributes.adoc[]
3-
ifdef::openshift-dedicated,openshift-rosa[]
3+
ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
44
include::_attributes/attributes-openshift-dedicated.adoc[]
5-
endif::openshift-dedicated,openshift-rosa[]
5+
endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
66
:context: image-configuration-hcp
77
[id="image-configuration-hcp"]
88
= Image configuration resources for {hcp-title}

openshift_images/image-streams-manage.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ include::modules/images-imagestream-configure.adoc[leveloffset=+1]
1313
include::modules/images-using-imagestream-images.adoc[leveloffset=+1]
1414
include::modules/images-using-imagestream-tags.adoc[leveloffset=+1]
1515
include::modules/images-using-imagestream-change-triggers.adoc[leveloffset=+1]
16-
ifndef::openshift-rosa,openshift-dedicated[]
16+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1717
include::modules/images-imagestream-mapping.adoc[leveloffset=+1]
18-
endif::openshift-rosa,openshift-dedicated[]
18+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1919

2020
== Working with image streams
2121

openshift_images/index.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ An image stream provides a way of storing different versions of the same basic i
1414
Those different versions are represented by different tags on the same image name.
1515

1616
include::modules/images-about.adoc[leveloffset=+1]
17-
ifndef::openshift-rosa,openshift-dedicated[]
17+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1818
You can xref:../openshift_images/create-images.adoc#creating-images[create], xref:../openshift_images/managing_images/managing-images-overview.adoc#managing-images-overview[manage], and xref:../openshift_images/using_images/using-images-overview.adoc#using-images-overview[use] container images.
19-
endif::openshift-rosa,openshift-dedicated[]
20-
ifdef::openshift-rosa,openshift-dedicated[]
19+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
20+
ifdef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2121
You can xref:../openshift_images/create-images.adoc#creating-images[create] and xref:../openshift_images/managing_images/managing-images-overview.adoc#managing-images-overview[manage] container images.
22-
endif::openshift-rosa,openshift-dedicated[]
22+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2323

2424
include::modules/images-image-registry-about.adoc[leveloffset=+1]
2525

@@ -49,21 +49,21 @@ You can use the Cluster Samples Operator to manage the sample image streams and
4949

5050
As a cluster administrator, you can use the Cluster Samples Operator to:
5151

52-
ifndef::openshift-rosa,openshift-dedicated[]
52+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5353
** xref:../openshift_images/configuring-samples-operator.adoc#configuring-samples-operator[Configure the Operator].
54-
endif::openshift-rosa,openshift-dedicated[]
54+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
5555
** xref:../openshift_images/samples-operator-alt-registry.adoc#samples-operator-alt-registry[Use the Operator with an alternate registry].
5656

5757
[id="about-templates"]
5858
== About templates
5959

6060
A template is a definition of an object to be replicated.
61-
You can use xref:../applications/creating_applications/using-templates.adoc#using-templates[templates] to build and deploy configurations.
61+
You can use link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html-single/building_applications/index[templates] to build and deploy configurations.
6262

6363
[id="how-you-can-use-ruby-on-rails"]
6464
== How you can use Ruby on Rails
6565

66-
As a developer, you can use xref:../applications/creating_applications/templates-using-ruby-on-rails.adoc#templates-using-ruby-on-rails[Ruby on Rails] to:
66+
As a developer, you can use link:https://docs.redhat.com/en/documentation/red_hat_openshift_service_on_aws/4/html-single/building_applications/index#templates-using-ruby-on-rails[Ruby on Rails] to:
6767

6868
** Write your application:
6969
*** Set up a database.

openshift_images/managing_images/using-image-pull-secrets.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ include::modules/using-pull-secret.adoc[leveloffset=+2]
2323
include::modules/images-pulling-from-private-registries.adoc[leveloffset=+2]
2424

2525
// cannot get resource "secrets" in API group "" in the namespace "openshift-config"
26-
ifndef::openshift-rosa,openshift-dedicated[]
26+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2727
include::modules/images-update-global-pull-secret.adoc[leveloffset=+1]
28-
endif::openshift-rosa,openshift-dedicated[]
28+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]

openshift_images/samples-operator-alt-registry.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ You must have access to the internet to obtain the necessary container images. I
1515

1616
include::modules/installation-about-mirror-registry.adoc[leveloffset=+1]
1717

18-
ifndef::openshift-rosa,openshift-dedicated[]
18+
ifndef::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
1919
.Additional information
2020

2121
For information on viewing the CRI-O logs to view the image source, see xref:../installing/validation_and_troubleshooting/validating-an-installation.adoc#viewing-the-image-pull-source_validating-an-installation[Viewing the image pull source].
22-
endif::openshift-rosa,openshift-dedicated[]
22+
endif::openshift-rosa,openshift-rosa-hcp,openshift-dedicated[]
2323

2424
[id="samples-preparing-bastion"]
2525
=== Preparing the mirror host

0 commit comments

Comments
 (0)