Skip to content

Commit c9ba50d

Browse files
authored
Merge pull request #78320 from amolnar-rh/IBU-peer-review-update
TELCODOCS-1932: Implement peer review feedback post-GA
2 parents 8a9c4d2 + 30c909b commit c9ba50d

File tree

34 files changed

+168
-135
lines changed

34 files changed

+168
-135
lines changed

_topic_maps/_topic_map.yml

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3147,20 +3147,52 @@ Topics:
31473147
Dir: preparing_for_image_based_upgrade
31483148
Distros: openshift-origin,openshift-enterprise
31493149
Topics:
3150-
- Name: Configuring a shared container directory for the image-based upgrade
3151-
File: cnf-image-based-upgrade-shared-container-image
3150+
- Name: Configuring a shared container partition for the image-based upgrade
3151+
File: cnf-image-based-upgrade-shared-container-partition
31523152
- Name: Installing Operators for the image-based upgrade
31533153
File: cnf-image-based-upgrade-install-operators
3154-
- Name: Generating a seed image for the image-based upgrade with Lifecycle Agent
3154+
- Name: Generating a seed image for the image-based upgrade with the Lifecycle Agent
31553155
File: cnf-image-based-upgrade-generate-seed
3156-
- Name: Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent
3156+
- Name: Creating ConfigMap objects for the image-based upgrade with the Lifecycle Agent
31573157
File: cnf-image-based-upgrade-prep-resources
31583158
- Name: Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent using GitOps ZTP
31593159
File: ztp-image-based-upgrade-prep-resources
3160-
- Name: Performing an image-based upgrade for single-node OpenShift clusters
3160+
- Name: Performing an image-based upgrade for single-node OpenShift clusters with the Lifecycle Agent
31613161
File: cnf-image-based-upgrade-base
31623162
- Name: Performing an image-based upgrade for single-node OpenShift clusters using GitOps ZTP
31633163
File: ztp-image-based-upgrade
3164+
# Remove RDS from published docs until 4.16 RDS is released
3165+
# ---
3166+
# Name: Reference design specifications
3167+
# Dir: telco_ref_design_specs
3168+
# Distros: openshift-telco
3169+
# Topics:
3170+
# - Name: Telco reference design specifications
3171+
# File: telco-ref-design-specs-overview
3172+
# - Name: Telco RAN DU reference design specification
3173+
# Dir: ran
3174+
# Topics:
3175+
# - Name: Telco RAN DU reference design overview
3176+
# File: telco-ran-ref-design-spec
3177+
# - Name: Telco RAN DU use model overview
3178+
# File: telco-ran-du-overview
3179+
# - Name: RAN DU reference design components
3180+
# File: telco-ran-ref-du-components
3181+
# - Name: RAN DU reference design configuration CRs
3182+
# File: telco-ran-ref-du-crs
3183+
# - Name: Telco RAN DU software specifications
3184+
# File: telco-ran-ref-software-artifacts
3185+
# - Name: Telco core reference design specification
3186+
# Dir: core
3187+
# Topics:
3188+
# - Name: Telco core reference design overview
3189+
# File: telco-core-rds-overview
3190+
# - Name: Telco core use model overview
3191+
# File: telco-core-rds-use-cases
3192+
# - Name: Core reference design components
3193+
# File: telco-core-ref-design-components
3194+
# - Name: Core reference design configuration CRs
3195+
# File: telco-core-ref-crs
31643196
---
31653197
Name: Specialized hardware and driver enablement
31663198
Dir: hardware_enablement

edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="cnf-image-based-upgrade-for-sno"]
3-
= Performing an image-based upgrade for {sno} clusters
2+
[id="cnf-image-based-upgrade"]
3+
= Performing an image-based upgrade for {sno} clusters with the {lcao}
44
include::_attributes/common-attributes.adoc[]
5-
:context: cnf-image-based-upgrade
5+
:context: cnf-non-gitops
66

77
toc::[]
88

@@ -16,14 +16,14 @@ include::modules/cnf-image-based-upgrade-prep.adoc[leveloffset=+1]
1616
[role="_additional-resources"]
1717
.Additional resources
1818

19-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-prep-resources.adoc#cnf-image-based-upgrade-prep-resources[Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent]
19+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-prep-resources.adoc#cnf-image-based-upgrade-prep-resources[Creating ConfigMap objects for the image-based upgrade with {lcao}]
2020
2121
include::modules/cnf-image-based-upgrade-with-backup.adoc[leveloffset=+1]
2222

2323
[role="_additional-resources"]
2424
.Additional resources
2525

26-
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#ztp-image-based-upgrade-rollback_cnf-image-based-upgrade[(Optional) Moving to the Rollback stage of the image-based upgrade with Lifecycle Agent]
26+
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade-rollback_cnf-non-gitops[Moving to the Rollback stage of the image-based upgrade with {lcao}]
2727
2828
include::modules/cnf-image-based-upgrade-rollback.adoc[leveloffset=+1]
2929

edge_computing/image_based_upgrade/cnf-understanding-image-based-upgrade.adoc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="understanding-image-based-upgrade-for-sno"]
3-
= Understanding the image-based upgrade for {sno} clusters
42
include::_attributes/common-attributes.adoc[]
3+
[id="cnf-understanding-image-based-upgrade"]
4+
= Understanding the image-based upgrade for {sno} clusters
55
:context: understanding-image-based-upgrade
66

77
toc::[]
@@ -72,13 +72,13 @@ include::modules/cnf-image-based-upgrade.adoc[leveloffset=+1]
7272
[role="_additional-resources"]
7373
.Additional resources
7474

75-
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade-for-sno[Performing an image-based upgrade with Lifecycle Agent]
75+
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade[Performing an image-based upgrade for {sno} clusters with {lcao}]
7676
77-
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-for-sno[Performing an image-based upgrade with Lifecycle Agent and GitOps ZTP]
77+
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade[Performing an image-based upgrade for {sno} clusters using {ztp}]
7878
79-
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#ztp-image-based-upgrade-rollback_cnf-image-based-upgrade[(Optional) Moving to the Rollback stage of the image-based upgrade with Lifecycle Agent]
79+
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade-rollback_cnf-non-gitops[Moving to the Rollback stage of the image-based upgrade with {lcao}]
8080
81-
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-with-talm-rollback_ztp-image-based-upgrade[(Optional) Moving to the Rollback stage of the image-based upgrade with Lifecycle Agent and GitOps ZTP]
81+
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-rollback_ztp-gitops[Moving to the Rollback stage of the image-based upgrade with {lcao} and {ztp}]
8282
8383
include::modules/cnf-image-based-upgrade-guidelines.adoc[leveloffset=+1]
8484

@@ -87,36 +87,36 @@ include::modules/cnf-image-based-upgrade-guidelines.adoc[leveloffset=+1]
8787

8888
* xref:../../installing/disconnected_install/installing-mirroring-installation-images.adoc#installing-mirroring-installation-images[Mirroring images for a disconnected installation]
8989
90-
include::modules/ztp-image-based-upgrade-cluster-validated-software.adoc[leveloffset=+2]
90+
include::modules/cnf-image-based-upgrade-cluster-validated-software.adoc[leveloffset=+2]
9191

9292
include::modules/ztp-image-based-upgrade-hub-cluster-guide.adoc[leveloffset=+2]
9393

94-
include::modules/ztp-image-based-upgrade-seed-image-guide.adoc[leveloffset=+2]
94+
include::modules/cnf-image-based-upgrade-seed-image-guide.adoc[leveloffset=+2]
9595

9696
[role="_additional-resources"]
9797
.Additional resources
9898

99-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#cnf-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots]
99+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#cnf-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots]
100100
101-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#ztp-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots when using GitOps ZTP]
101+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#ztp-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots when using {ztp}]
102102
103-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-generate-seed.adoc#ztp-image-based-seed-image-config_generate-seed[Seed image configuration]
103+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-generate-seed.adoc#cnf-image-based-upgrade-seed-image-config_generate-seed[Seed image configuration]
104104
105-
include::modules/ztp-image-based-upgrade-backup-guide.adoc[leveloffset=+2]
105+
include::modules/cnf-image-based-upgrade-backup-guide.adoc[leveloffset=+2]
106106

107-
include::modules/ztp-image-based-upgrade-extra-manifests-guide.adoc[leveloffset=+2]
107+
include::modules/cnf-image-based-upgrade-extra-manifests-guide.adoc[leveloffset=+2]
108108

109109
[role="_additional-resources"]
110110
.Additional resources
111111

112-
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade-for-sno[Performing an image-based upgrade with Lifecycle Agent]
112+
* xref:../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade[Performing an image-based upgrade for {sno} clusters with {lcao}]
113113
114-
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-for-sno[Performing an image-based upgrade with Lifecycle Agent and GitOps ZTP]
114+
* xref:../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade[Performing an image-based upgrade for {sno} clusters using {ztp}]
115115
116116
* xref:../../edge_computing/ztp-preparing-the-hub-cluster.adoc#ztp-preparing-the-hub-cluster[Preparing the hub cluster for ZTP]
117117
118-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-prep-resources.adoc#cnf-image-based-upgrade-creating-backup-oadp-resources_nongitops[Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent]
118+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-prep-resources.adoc#cnf-image-based-upgrade-prep-oadp_cnf-non-gitops[Creating ConfigMap objects for the image-based upgrade with {lcao}]
119119
120-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/ztp-image-based-upgrade-prep-resources.adoc#ztp-image-based-upgrade-prep-resources[Creating ConfigMap objects for the image-based upgrade with GitOps ZTP]
120+
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/ztp-image-based-upgrade-prep-resources.adoc#ztp-image-based-upgrade-prep-resources[Creating ConfigMap objects for the image-based upgrade with {ztp}]
121121
122122
* xref:../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc#about-installing-oadp[About installing OADP]
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="cnf-image-based-upgrade-seed-image"]
3-
= Generating a seed image for the image-based upgrade with {lcao}
2+
[id="cnf-image-based-upgrade-generate-seed-image"]
3+
= Generating a seed image for the image-based upgrade with the {lcao}
44
include::_attributes/common-attributes.adoc[]
55
:context: generate-seed
66

77
toc::[]
88

99
Use the {lcao} to generate the seed image with the `SeedGenerator` custom resource (CR).
1010

11-
:FeatureName: The Lifecycle Agent
12-
13-
1411
include::modules/cnf-image-based-upgrade-seed-image-config.adoc[leveloffset=+1]
1512

1613
include::modules/cnf-image-based-upgrade-generate-seed-image.adoc[leveloffset=+1]
1714

1815
[role="_additional-resources"]
1916
.Additional resources
2017

21-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#cnf-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots]
18+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#cnf-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots]
2219
23-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image#ztp-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots when using GitOps ZTP]
20+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition#ztp-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots when using {ztp}]

edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-install-operators.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ include::modules/cnf-image-based-upgrade-installing-lifecycle-agent-using-cli.ad
2525

2626
include::modules/cnf-image-based-upgrade-installing-lifecycle-agent-using-web-console.adoc[leveloffset=+1]
2727

28-
include::modules/ztp-image-based-upgrade-installing-lcao-with-gitops.adoc[leveloffset=+1]
28+
include::modules/ztp-image-based-upgrade-installing-lca.adoc[leveloffset=+1]
2929

30-
include::modules/ztp-image-based-upgrade-installing-oadp-with-gitops.adoc[leveloffset=+1]
30+
include::modules/ztp-image-based-upgrade-installing-oadp.adoc[leveloffset=+1]

edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-prep-resources.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="cnf-image-based-upgrade-prep-resources"]
3-
= Creating ConfigMap objects for the image-based upgrade with {lcao}
3+
= Creating ConfigMap objects for the image-based upgrade with the {lcao}
44
include::_attributes/common-attributes.adoc[]
5-
:context: nongitops
5+
:context: cnf-non-gitops
66

77
toc::[]
88

@@ -13,7 +13,7 @@ include::modules/cnf-image-based-upgrade-prep-oadp.adoc[leveloffset=+1]
1313
[role="_additional-resources"]
1414
.Additional resources
1515

16-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#cnf-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots]
16+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#cnf-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots]
1717
1818
* xref:../../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc[About installing OADP]
1919
@@ -26,4 +26,4 @@ include::modules/cnf-image-based-upgrade-prep-catalogsource.adoc[leveloffset=+1]
2626

2727
* xref:../../../operators/understanding/olm/olm-understanding-olm.adoc#olm-catalogsource_olm-understanding-olm[Catalog source]
2828
29-
* xref:../../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade-for-sno[Performing an image-based upgrade with Lifecycle Agent]
29+
* xref:../../../edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc#cnf-image-based-upgrade[Performing an image-based upgrade for {sno} with {lcao}]

edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cnf-image-based-upgrade-shared-container-partition"]
3+
= Configuring a shared container partition for the image-based upgrade
4+
include::_attributes/common-attributes.adoc[]
5+
:context: shared-container-partition
6+
7+
toc::[]
8+
9+
Your {sno} clusters need to have a shared `var/lib/containers` partition for the image-based upgrade.
10+
You can do this at install time.
11+
12+
include::modules/cnf-image-based-upgrade-shared-container-partition.adoc[leveloffset=+1]
13+
14+
include::modules/ztp-image-based-upgrade-shared-container-partition.adoc[leveloffset=+1]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="ztp-image-based-upgrade-prep-resources"]
3-
= Creating ConfigMap objects for the image-based upgrade with {lcao} using {ztp}
3+
= Creating ConfigMap objects for the image-based upgrade with the {lcao} using {ztp}
44
include::_attributes/common-attributes.adoc[]
55
:context: ztp-gitops
66

@@ -13,15 +13,15 @@ include::modules/ztp-image-based-upgrade-prep-oadp.adoc[leveloffset=+1]
1313
[role="_additional-resources"]
1414
.Additional resources
1515

16-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#ztp-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots when using GitOps ZTP]
16+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#ztp-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots when using {ztp}]
1717
18-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-install-operators#ztp-image-based-upgrade-installing-oadp-with-gitops_install-operators[Installing and configuring the OADP Operator with GitOps ZTP]
18+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-install-operators#ztp-image-based-upgrade-installing-oadp_install-operators[Installing and configuring the OADP Operator with {ztp}]
1919
2020
include::modules/ztp-image-based-upgrade-prep-label-extramanifests.adoc[leveloffset=+1]
2121

2222
[role="_additional-resources"]
2323
.Additional resources
2424

25-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image.adoc#ztp-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots when using GitOps ZTP]
25+
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-partition.adoc#ztp-image-based-upgrade-shared-container-partition_shared-container-partition[Configuring a shared container partition between ostree stateroots when using {ztp}]
2626
27-
* xref:../../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade-for-sno[Performing an image-based upgrade for {sno} clusters using GitOps ZTP]
27+
* xref:../../../edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc#ztp-image-based-upgrade[Performing an image-based upgrade for {sno} clusters using {ztp}]

0 commit comments

Comments
 (0)