Skip to content

Commit bded81d

Browse files
authored
[patch] Unify the documentation (#2296)
1 parent 4cbb350 commit bded81d

27 files changed

Lines changed: 2919 additions & 345 deletions
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Documentation Reorganization Plan
2+
3+
## Objective
4+
5+
Consolidate all documentation from `docs/commands/` into `docs/guides/`, ensuring each CLI function has a comprehensive guide. Review all documents for quality, consistency, and style using `docs/guides/install.md` as the exemplar. Split the existing backup-restore guide into separate backup and restore documents.
6+
7+
## Critical Rules
8+
9+
1. **Use install.md as the style exemplar** - All documents must follow the structure, formatting, and tone of `docs/guides/install.md`
10+
2. **One page at a time** - Complete each document fully before moving to the next
11+
3. **Configure redirects** - Add redirect mappings in `mkdocs.yml` for all moved/renamed pages
12+
4. **Preserve content** - Do not delete information; reorganize and improve it
13+
5. **Validate after each change** - Ensure mkdocs builds successfully after each document update
14+
15+
## Execution Plan
16+
17+
### Phase 1: Split Backup-Restore Guide
18+
19+
- [ ] **1.1** Create `docs/guides/backup.md` from backup-restore.md content
20+
- [ ] **1.2** Create `docs/guides/restore.md` from backup-restore.md content
21+
- [ ] **1.3** Update mkdocs.yml navigation and add redirects
22+
- [ ] **1.4** Delete obsolete backup-restore.md and command files
23+
- [ ] **1.5** Validate Phase 1
24+
25+
### Phase 2: Migrate Must-Gather Command
26+
27+
- [ ] **2.1** Create comprehensive `docs/guides/must-gather.md`
28+
- [ ] **2.2** Update mkdocs.yml with navigation and redirect
29+
- [ ] **2.3** Delete `docs/commands/must-gather.md`
30+
- [ ] **2.4** Validate Phase 2
31+
32+
### Phase 3: Migrate Airgap Configuration
33+
34+
- [ ] **3.1** Create comprehensive `docs/guides/configure-airgap.md`
35+
- [ ] **3.2** Update mkdocs.yml with navigation and redirect
36+
- [ ] **3.3** Delete `docs/commands/configure-airgap.md`
37+
- [ ] **3.4** Validate Phase 3
38+
39+
### Phase 4: Migrate Registry Commands
40+
41+
- [ ] **4.1** Create `docs/guides/setup-registry.md`
42+
- [ ] **4.2** Create `docs/guides/teardown-registry.md`
43+
- [ ] **4.3** Update mkdocs.yml with navigation and redirects
44+
- [ ] **4.4** Delete obsolete command files
45+
- [ ] **4.5** Validate Phase 4
46+
47+
### Phase 5: Migrate Provisioning Commands ✅ COMPLETED
48+
49+
- [x] **5.1** Create `docs/guides/provision-fyre.md`
50+
- [x] **5.2** Create `docs/guides/provision-roks.md`
51+
- [x] **5.3** Create `docs/guides/provision-rosa.md`
52+
- [x] **5.4** Create `docs/guides/provision-aws.md`
53+
- [x] **5.5** Update mkdocs.yml with navigation and redirects
54+
- [x] **5.6** Delete obsolete provisioning command files
55+
- [x] **5.7** Validate Phase 5 - mkdocs serving successfully
56+
57+
### Phase 6: Migrate Remaining Commands
58+
59+
- [ ] **6.1** Create `docs/guides/mirror-redhat-images.md`
60+
- [ ] **6.2** Create `docs/guides/configtool-oidc.md`
61+
- [ ] **6.3** Create `docs/guides/debug.md` if needed
62+
- [ ] **6.4** Update mkdocs.yml and remove Command Reference section
63+
- [ ] **6.5** Delete all remaining command files
64+
- [ ] **6.6** Validate Phase 6
65+
66+
### Phase 7: Review Existing Guides
67+
68+
- [ ] **7.1** Review `docs/guides/install.md`
69+
- [ ] **7.2** Review `docs/guides/update.md`
70+
- [ ] **7.3** Review `docs/guides/upgrade.md`
71+
- [ ] **7.4** Review `docs/guides/uninstall.md`
72+
- [ ] **7.5** Review `docs/guides/aiservice-install.md`
73+
- [ ] **7.6** Review `docs/guides/image-mirroring.md`
74+
- [ ] **7.7** Review `docs/guides/image-validation.md`
75+
- [ ] **7.8** Validate Phase 7
76+
77+
### Phase 8: Final Cleanup
78+
79+
- [ ] **8.1** Verify docs/commands directory is empty or removed
80+
- [ ] **8.2** Review all redirects in mkdocs.yml
81+
- [ ] **8.3** Review navigation structure
82+
- [ ] **8.4** Build and test documentation
83+
- [ ] **8.5** Create summary of changes
84+
85+
## Validation
86+
87+
After each phase run `mkdocs serve` and verify builds, navigation, and redirects work correctly.

.bob/redis-locking/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
These documents had been generated in `/docs` but were and are not part of the documentation site - I don't know if they are even needed or not, if they are needed they need a proper home - which is probably not even this repository given the role of the script?
File renamed without changes.
File renamed without changes.

.secrets.baseline

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
44
"lines": null
55
},
6-
"generated_at": "2026-05-19T12:05:11Z",
6+
"generated_at": "2026-05-20T23:47:35Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -87,52 +87,70 @@
8787
"verified_result": null
8888
}
8989
],
90-
"docs/commands/provision-fyre.md": [
90+
"docs/guides/configure-airgap.md": [
9191
{
92-
"hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
92+
"hashed_secret": "354b3a4b7715d3694c88a4fa7db49e41de86568e",
9393
"is_secret": false,
9494
"is_verified": false,
95-
"line_number": 44,
95+
"line_number": 145,
9696
"type": "Secret Keyword",
9797
"verified_result": null
9898
}
9999
],
100-
"docs/commands/provision-roks.md": [
100+
"docs/guides/image-mirroring.md": [
101101
{
102102
"hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
103103
"is_secret": false,
104104
"is_verified": false,
105-
"line_number": 40,
105+
"line_number": 46,
106106
"type": "Secret Keyword",
107107
"verified_result": null
108108
}
109109
],
110-
"docs/commands/setup-registry.md": [
110+
"docs/guides/install.md": [
111111
{
112112
"hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
113113
"is_secret": false,
114114
"is_verified": false,
115-
"line_number": 31,
115+
"line_number": 353,
116116
"type": "Secret Keyword",
117117
"verified_result": null
118118
}
119119
],
120-
"docs/guides/image-mirroring.md": [
120+
"docs/guides/private-registry.md": [
121121
{
122-
"hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
122+
"hashed_secret": "354b3a4b7715d3694c88a4fa7db49e41de86568e",
123123
"is_secret": false,
124124
"is_verified": false,
125-
"line_number": 46,
125+
"line_number": 122,
126126
"type": "Secret Keyword",
127127
"verified_result": null
128128
}
129129
],
130-
"docs/guides/install.md": [
130+
"docs/guides/provision-fyre.md": [
131131
{
132-
"hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
132+
"hashed_secret": "11fa7c37d697f30e6aee828b4426a10f83ab2380",
133+
"is_secret": false,
134+
"is_verified": false,
135+
"line_number": 107,
136+
"type": "Secret Keyword",
137+
"verified_result": null
138+
},
139+
{
140+
"hashed_secret": "c7f112c59ab7e077fd20a28107b7a200469ebdac",
141+
"is_secret": false,
142+
"is_verified": false,
143+
"line_number": 252,
144+
"type": "Secret Keyword",
145+
"verified_result": null
146+
}
147+
],
148+
"docs/guides/provision-roks.md": [
149+
{
150+
"hashed_secret": "11fa7c37d697f30e6aee828b4426a10f83ab2380",
133151
"is_secret": false,
134152
"is_verified": false,
135-
"line_number": 361,
153+
"line_number": 95,
136154
"type": "Secret Keyword",
137155
"verified_result": null
138156
}

Makefile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,17 @@ detect-secrets:
259259
detect-secrets scan --update .secrets.baseline
260260
detect-secrets audit .secrets.baseline
261261

262+
263+
.venv-docs:
264+
# We need to install the python-devops and cli packages because we generate documentation from their code using mkdocs directives
265+
python3 -m venv .venv-docs
266+
. .venv-docs/bin/activate && python -m pip install setuptools
267+
. .venv-docs/bin/activate && python -m pip install -e ../python-devops
268+
. .venv-docs/bin/activate && python -m pip install -e ./python
269+
# Install mkdocs and the various plugins that we use, including our custom plugins
270+
. .venv-docs/bin/activate && python -m pip install -q mkdocs properdocs mkdocs-carbon mkdocs-glightbox mkdocs-redirects
271+
. .venv-docs/bin/activate && python -m pip install -e ./mkdocs_plugins
272+
262273
.PHONY: mkdocs-serve
263-
mkdocs-serve:
274+
mkdocs-serve: .venv-docs
264275
. .venv-docs/bin/activate && mkdocs serve --livereload --dev-addr localhost:9010

docs/catalogs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ The packages available in these catalogs are fixed. Multiple installations at di
521521
#### Disconnected Install
522522
> I want to run a disconnected environment using a private mirror registry
523523
524-
The MAS CLI [mirror-images](../guides/image-mirroring.md) function is the easiest way to mirror the content from a specific version of the Maximo Operator Catalog. Once the images are mirrored simply run the [configure-airgap](../commands/configure-airgap.md) function to add the IBM Maximo Application Suite **ImageDigestMirrorset** to your cluster before starting the installation.
524+
The MAS CLI [mirror-images](../guides/image-mirroring.md) function is the easiest way to mirror the content from a specific version of the Maximo Operator Catalog. Once the images are mirrored simply run the [configure-airgap](../guides/configure-airgap.md) function to add the IBM Maximo Application Suite **ImageDigestMirrorset** to your cluster before starting the installation.
525525

526526

527527
### Dynamic Catalog

docs/commands/configure-airgap.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

docs/commands/provision-aws.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/commands/provision-fyre.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)