Skip to content

Commit 66ad93a

Browse files
authored
Merge pull request #77947 from amolnar-rh/TELCODOCS-1707-readd-xrefs
TELCODOCS-1707: Add xrefs
2 parents 94c1ac3 + 68b556f commit 66ad93a

10 files changed

+35
-36
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ You update this CR to specify the image repository of the seed image and to move
1313

1414
include::modules/cnf-image-based-upgrade-prep.adoc[leveloffset=+1]
1515

16-
////
1716
[role="_additional-resources"]
1817
.Additional resources
1918

20-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/ztp-image-based-upgrade-prep-resources.adoc#ztp-image-based-upgrade-creating-backup-resources-with-ztp_ztp-gitops[Creating ConfigMap objects for the image-based upgrade with Lifecycle Agent]
21-
////
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]
2220
2321
include::modules/cnf-image-based-upgrade-with-backup.adoc[leveloffset=+1]
2422

23+
[role="_additional-resources"]
24+
.Additional resources
25+
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]
27+
2528
include::modules/cnf-image-based-upgrade-rollback.adoc[leveloffset=+1]
2629

2730
include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1]

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ spec:
6969

7070
include::modules/cnf-image-based-upgrade.adoc[leveloffset=+1]
7171

72-
////
7372
[role="_additional-resources"]
7473
.Additional resources
7574

@@ -80,7 +79,6 @@ include::modules/cnf-image-based-upgrade.adoc[leveloffset=+1]
8079
* 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]
8180
8281
* 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]
83-
////
8482
8583
include::modules/cnf-image-based-upgrade-guidelines.adoc[leveloffset=+1]
8684

@@ -95,7 +93,6 @@ include::modules/ztp-image-based-upgrade-hub-cluster-guide.adoc[leveloffset=+2]
9593

9694
include::modules/ztp-image-based-upgrade-seed-image-guide.adoc[leveloffset=+2]
9795

98-
////
9996
[role="_additional-resources"]
10097
.Additional resources
10198

@@ -104,13 +101,11 @@ include::modules/ztp-image-based-upgrade-seed-image-guide.adoc[leveloffset=+2]
104101
* 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]
105102
106103
* 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]
107-
////
108104
109105
include::modules/ztp-image-based-upgrade-backup-guide.adoc[leveloffset=+2]
110106

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

113-
////
114109
[role="_additional-resources"]
115110
.Additional resources
116111

@@ -122,7 +117,6 @@ include::modules/ztp-image-based-upgrade-extra-manifests-guide.adoc[leveloffset=
122117
123118
* 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]
124119
125-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/ztp-image-based-upgrade-prep-resources.adoc#ztp-image-based-upgrade-creating-backup-resources-with-ztp_ztp-gitops[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 GitOps ZTP]
126121
127-
* xref:../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc#about-installing-oadp[About installing OADP]
128-
////
122+
* xref:../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc#about-installing-oadp[About installing OADP]

edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-generate-seed.adoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ include::modules/cnf-image-based-upgrade-seed-image-config.adoc[leveloffset=+1]
1515

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

18-
////
1918
[role="_additional-resources"]
2019
.Additional resources
2120

22-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-shared-container-image##cnf-image-based-upgrade-shared-container-directory_shared-container-directory[Configuring a shared container directory between ostree stateroots]
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]
2322
24-
* 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]
25-
////
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]

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Prepare your clusters for the upgrade by installing the {lcao} and the OADP Oper
1010

1111
To install the OADP Operator with the non-GitOps method, see "Installing the OADP Operator".
1212

13-
////
1413
[role="_additional-resources"]
1514
.Additional resources
1615

@@ -21,7 +20,6 @@ To install the OADP Operator with the non-GitOps method, see "Installing the OAD
2120
* xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc#oadp-creating-backup-cr-doc[Creating a Backup CR]
2221
2322
* xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc#oadp-creating-restore-cr_restoring-applications[Creating a Restore CR]
24-
////
2523
2624
include::modules/cnf-image-based-upgrade-installing-lifecycle-agent-using-cli.adoc[leveloffset=+1]
2725

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@ The {lcao} needs all your OADP resources, extra manifests, and custom catalog so
1010

1111
include::modules/cnf-image-based-upgrade-prep-oadp.adoc[leveloffset=+1]
1212

13-
include::modules/cnf-image-based-upgrade-prep-extramanifests.adoc[leveloffset=+1]
14-
15-
include::modules/cnf-image-based-upgrade-prep-catalogsource.adoc[leveloffset=+1]
16-
17-
////
1813
[role="_additional-resources"]
1914
.Additional resources
2015

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-varlibcontainers[Configuring a shared container directory for the image-based upgrade]
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]
2217
2318
* xref:../../../backup_and_restore/application_backup_and_restore/installing/about-installing-oadp.adoc[About installing OADP]
2419
25-
* 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]
20+
include::modules/cnf-image-based-upgrade-prep-extramanifests.adoc[leveloffset=+1]
21+
22+
include::modules/cnf-image-based-upgrade-prep-catalogsource.adoc[leveloffset=+1]
23+
24+
[role="_additional-resources"]
25+
.Additional resources
2626

2727
* xref:../../../operators/understanding/olm/olm-understanding-olm.adoc#olm-catalogsource_olm-understanding-olm[Catalog source]
28-
////
28+
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]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ You can do this at install time.
1111

1212
:FeatureName: The Lifecycle Agent
1313

14-
include::modules/cnf-image-based-upgrade-share-container-directory.adoc[leveloffset=+1]
14+
include::modules/cnf-image-based-upgrade-shared-container-directory.adoc[leveloffset=+1]
1515

16-
include::modules/ztp-image-based-upgrade-share-container-directory.adoc[leveloffset=+1]
16+
include::modules/ztp-image-based-upgrade-shared-container-directory.adoc[leveloffset=+1]

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@ Create your OADP resources, extra manifests, and custom catalog sources wrapped
1010

1111
include::modules/ztp-image-based-upgrade-prep-oadp.adoc[leveloffset=+1]
1212

13+
[role="_additional-resources"]
14+
.Additional resources
15+
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]
17+
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]
1319
1420
include::modules/ztp-image-based-upgrade-prep-label-extramanifests.adoc[leveloffset=+1]
1521

16-
////
1722
[role="_additional-resources"]
1823
.Additional resources
1924

2025
* 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]
2126
22-
* xref:../../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/cnf-image-based-upgrade-install-operators#zp-image-based-upgrade-installing-oadp-with-gitops_install-operators[Installing and configuring the OADP Operator with GitOps ZTP]
23-
24-
* 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]
25-
////
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]

edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,28 @@ You update this CR to specify the image repository of the seed image and to move
1515

1616
include::modules/ztp-image-based-upgrade-talm-prep.adoc[leveloffset=+1]
1717

18-
////
1918
[role="_additional-resources"]
2019
.Additional resources
2120

2221
* xref:../../edge_computing/ztp-preparing-the-hub-cluster.adoc#ztp-preparing-the-ztp-git-repository-ver-ind_ztp-preparing-the-hub-cluster[Preparing the GitOps ZTP site configuration repository for version independence]
2322
24-
* xref:../../edge_computing/image_based_upgrade/preparing_for_image_based_upgrade/ztp-image-based-upgrade-prep-resources.adoc[Preparing for the image-based upgrade for single-node OpenShift clusters]
23+
* 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 Lifecycle Agent using GitOps ZTP]
2524
2625
* 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]
2726
2827
* xref:../../backup_and_restore/application_backup_and_restore/installing/installing-oadp-ocs.adoc#oadp-about-backup-snapshot-locations_installing-oadp-ocs[About backup and snapshot locations and their secrets]
2928
30-
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc[Creating a Backup CR]
29+
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/oadp-creating-backup-cr.adoc#oadp-creating-backup-cr-doc[Creating a Backup CR]
3130
3231
* xref:../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/restoring-applications.adoc#oadp-creating-restore-cr_restoring-applications[Creating a Restore CR]
33-
////
3432
3533
include::modules/ztp-image-based-upgrade-talm-upgrade.adoc[leveloffset=+1]
3634

35+
[role="_additional-resources"]
36+
.Additional resources
37+
38+
* 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 {ztp}]
39+
3740
include::modules/ztp-image-based-upgrade-talm-rollback.adoc[leveloffset=+1]
3841

3942
include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)