Skip to content

Commit ac75d65

Browse files
authored
Improve formatting on the docs website (#1446)
Fixes a number of formatting/rendering issues. Mostly around lists, admonitions (notes, warnings, etc) and collapsible text. Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
1 parent 102f29f commit ac75d65

10 files changed

+289
-277
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,28 @@ you can follow the steps below to test your changes:
4343

4444
1. Create the cluster:
4545

46-
```sh
47-
kind create cluster operator-controller
48-
```
46+
```sh
47+
kind create cluster operator-controller
48+
```
4949

5050
2. Build your changes:
5151

52-
```sh
53-
make build docker-build
54-
```
52+
```sh
53+
make build docker-build
54+
```
5555

5656
3. Load the image locally and Deploy to Kind
5757

58-
```sh
59-
make kind-load kind-deploy
60-
```
58+
```sh
59+
make kind-load kind-deploy
60+
```
6161

6262
### Communication Channels
6363

6464
- Email: [operator-framework-olm-dev](mailto:operator-framework-olm-dev@googlegroups.com)
6565
- Slack: [#olm-dev](https://kubernetes.slack.com/archives/C0181L6JYQ2)
6666
- Google Group: [olm-gg](https://groups.google.com/g/operator-framework-olm-dev)
67-
- Weekly in Person Working Group Meeting: [olm-wg](https://github.com/operator-framework/community#operator-lifecycle-manager-working-group)
67+
- Weekly in Person Working Group Meeting: [olm-wg](https://github.com/operator-framework/community#operator-lifecycle-manager-working-group)
6868

6969
## How are Milestones Designed?
7070

@@ -91,7 +91,7 @@ As discussed earlier, the operator-controller adheres to a microservice architec
9191
9292
## Submitting Issues
9393
94-
Unsure where to submit an issue?
94+
Unsure where to submit an issue?
9595
9696
- [The Operator-Controller project](https://github.com/operator-framework/operator-controller/), which is the top level component allowing users to specify operators they'd like to install.
9797
- [The Catalogd project](https://github.com/operator-framework/catalogd/), which hosts operator content and helps users discover installable content.

docs/concepts/controlling-catalog-selection.md

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -159,70 +159,71 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
159159

160160
1. **Create or Update `ClusterCatalogs` with Appropriate Labels and Priority**
161161

162-
```yaml
163-
apiVersion: olm.operatorframework.io/v1
164-
kind: ClusterCatalog
165-
metadata:
166-
name: catalog-a
167-
labels:
168-
example.com/support: "true"
169-
spec:
170-
priority: 1000
171-
source:
172-
type: Image
173-
image:
174-
ref: quay.io/example/content-management-a:latest
175-
```
176-
177-
```yaml
178-
apiVersion: olm.operatorframework.io/v1
179-
kind: ClusterCatalog
180-
metadata:
181-
name: catalog-b
182-
labels:
183-
example.com/support: "false"
184-
spec:
185-
priority: 500
186-
source:
187-
type: Image
188-
image:
189-
ref: quay.io/example/content-management-b:latest
190-
```
191-
NB: an `olm.operatorframework.io/metadata.name` label will be added automatically to ClusterCatalogs when applied
162+
```yaml
163+
apiVersion: olm.operatorframework.io/v1
164+
kind: ClusterCatalog
165+
metadata:
166+
name: catalog-a
167+
labels:
168+
example.com/support: "true"
169+
spec:
170+
priority: 1000
171+
source:
172+
type: Image
173+
image:
174+
ref: quay.io/example/content-management-a:latest
175+
```
176+
177+
```yaml
178+
apiVersion: olm.operatorframework.io/v1
179+
kind: ClusterCatalog
180+
metadata:
181+
name: catalog-b
182+
labels:
183+
example.com/support: "false"
184+
spec:
185+
priority: 500
186+
source:
187+
type: Image
188+
image:
189+
ref: quay.io/example/content-management-b:latest
190+
```
191+
!!! note
192+
An `olm.operatorframework.io/metadata.name` label will be added automatically to ClusterCatalogs when applied
192193

193194

194195
2. **Create a `ClusterExtension` with Catalog Selection**
195196

196-
```yaml
197-
apiVersion: olm.operatorframework.io/v1
198-
kind: ClusterExtension
199-
metadata:
200-
name: install-my-operator
201-
spec:
202-
packageName: my-operator
203-
catalog:
204-
selector:
205-
matchLabels:
206-
example.com/support: "true"
207-
```
197+
```yaml
198+
apiVersion: olm.operatorframework.io/v1
199+
kind: ClusterExtension
200+
metadata:
201+
name: install-my-operator
202+
spec:
203+
packageName: my-operator
204+
catalog:
205+
selector:
206+
matchLabels:
207+
example.com/support: "true"
208+
```
208209

209210
3. **Apply the Resources**
210211

211-
```shell
212-
kubectl apply -f content-management-a.yaml
213-
kubectl apply -f content-management-b.yaml
214-
kubectl apply -f install-my-operator.yaml
215-
```
212+
```shell
213+
kubectl apply -f content-management-a.yaml
214+
kubectl apply -f content-management-b.yaml
215+
kubectl apply -f install-my-operator.yaml
216+
```
216217

217218
4. **Verify the Installation**
218219

219-
Check the status of the `ClusterExtension`:
220+
Check the status of the `ClusterExtension`:
220221

221-
```shell
222-
kubectl get clusterextension install-my-operator -o yaml
223-
```
222+
```shell
223+
kubectl get clusterextension install-my-operator -o yaml
224+
```
224225

225-
The status should indicate that the bundle was resolved from `catalog-a` due to the higher priority and matching label.
226+
The status should indicate that the bundle was resolved from `catalog-a` due to the higher priority and matching label.
226227

227228
## Important Notes
228229

docs/concepts/upgrade-support.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ When determining upgrade edges, also known as upgrade paths or upgrade constrain
1717

1818
By supporting legacy OLM semantics, OLM v1 now honors the upgrade graph from catalogs accurately.
1919

20-
* If there are multiple possible successors, OLM v1 behavior differs in the following ways:
21-
* In legacy OLM, the successor closest to the channel head is chosen.
22-
* In OLM v1, the successor with the highest semantic version (semver) is chosen.
23-
* Consider the following set of file-based catalog (FBC) channel entries:
20+
If there are multiple possible successors, OLM v1 behavior differs in the following ways:
21+
22+
* In legacy OLM, the successor closest to the channel head is chosen.
23+
* In OLM v1, the successor with the highest semantic version (semver) is chosen.
24+
25+
Consider the following set of file-based catalog (FBC) channel entries:
2426

2527
```yaml
2628
# ...
@@ -51,7 +53,7 @@ spec:
5153
version: "<version_or_version_range>"
5254
```
5355

54-
where setting the `upgradeConstraintPolicy` to:
56+
Setting the `upgradeConstraintPolicy` to:
5557

5658
`SelfCertified`
5759
: Does not limit the next version to the set of successors, and instead allows for any downgrade, sidegrade, or upgrade.
@@ -63,8 +65,8 @@ where setting the `upgradeConstraintPolicy` to:
6365

6466
OLM supports Semver to provide a simplified way for package authors to define compatible upgrades. According to the Semver standard, releases within a major version (e.g. `>=1.0.0 <2.0.0`) must be compatible. As a result, package authors can publish a new package version following the Semver specification, and OLM assumes compatibility. Package authors do not have to explicitly define upgrade edges in the catalog.
6567

66-
> [!NOTE]
67-
> Currently, OLM 1.0 does not support automatic upgrades to the next major version. You must manually verify and perform major version upgrades. For more information about major version upgrades, see [Manually verified upgrades and downgrades](#manually-verified-upgrades-and-downgrades).
68+
!!! note
69+
Currently, OLM 1.0 does not support automatic upgrades to the next major version. You must manually verify and perform major version upgrades. For more information about major version upgrades, see [Manually verified upgrades and downgrades](#manually-verified-upgrades-and-downgrades).
6870

6971
### Upgrades within the major version zero
7072

@@ -77,7 +79,8 @@ You must verify and perform upgrades manually in cases where automatic upgrades
7779

7880
## Manually verified upgrades and downgrades
7981

80-
**Warning:** If you want to force an upgrade manually, you must thoroughly verify the outcome before applying any changes to production workloads. Failure to test and verify the upgrade might lead to catastrophic consequences such as data loss.
82+
!!! warning
83+
If you want to force an upgrade manually, you must thoroughly verify the outcome before applying any changes to production workloads. Failure to test and verify the upgrade might lead to catastrophic consequences such as data loss.
8184

8285
As a package admin, if you must upgrade or downgrade to version that might be incompatible with the currently installed version, you can set the `.spec.upgradeConstraintPolicy` field to `SelfCertified` on the relevant `ClusterExtension` resource.
8386

docs/contribute/developer.md

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
The following `make run` starts a [KIND](https://sigs.k8s.io/kind) cluster for you to get a local cluster for testing, see the manual install steps below for how to run against a remote cluster.
55

6-
> [!NOTE]
7-
> You will need a container runtime environment, like Docker, or experimentally, Podman, installed, to run Kind.
8-
>
9-
> If you are on MacOS, see [Special Setup for MacOS](#special-setup-for-macos).
6+
!!! note
7+
You will need a container runtime environment, like Docker, or experimentally, Podman, installed, to run Kind.
8+
9+
If you are on MacOS, see [Special Setup for MacOS](#special-setup-for-macos).
1010

1111
### Quickstart Installation
1212

@@ -20,9 +20,9 @@ This will build a local container image of the operator-controller, create a new
2020

2121
### To Install Any Given Release
2222

23-
> [!CAUTION]
24-
> Operator-Controller depends on [cert-manager](https://cert-manager.io/). Running the following command
25-
> may affect an existing installation of cert-manager and cause cluster instability.
23+
!!! warning
24+
Operator-Controller depends on [cert-manager](https://cert-manager.io/). Running the following command
25+
may affect an existing installation of cert-manager and cause cluster instability.
2626

2727
The latest version of Operator Controller can be installed with the following command:
2828

@@ -33,21 +33,21 @@ curl -L -s https://github.com/operator-framework/operator-controller/releases/la
3333
### Manual Step-by-Step Installation
3434
1. Install Instances of Custom Resources:
3535

36-
```sh
37-
kubectl apply -f config/samples/
38-
```
36+
```sh
37+
kubectl apply -f config/samples/
38+
```
3939

4040
2. Build and push your image to the location specified by `IMG`:
4141

42-
```sh
43-
make docker-build docker-push IMG=<some-registry>/operator-controller:tag
44-
```
42+
```sh
43+
make docker-build docker-push IMG=<some-registry>/operator-controller:tag
44+
```
4545

4646
3. Deploy the controller to the cluster with the image specified by `IMG`:
4747

48-
```sh
49-
make deploy IMG=<some-registry>/operator-controller:tag
50-
```
48+
```sh
49+
make deploy IMG=<some-registry>/operator-controller:tag
50+
```
5151

5252
### Uninstall CRDs
5353
To delete the CRDs from the cluster:
@@ -72,7 +72,8 @@ make manifests
7272

7373
---
7474

75-
**NOTE:** Run `make help` for more information on all potential `make` targets.
75+
!!! note
76+
Run `make help` for more information on all potential `make` targets.
7677

7778
### Rapid Iterative Development with Tilt
7879

@@ -124,17 +125,18 @@ This is typically as short as:
124125
tilt up
125126
```
126127

127-
**NOTE:** if you are using Podman, at least as of v4.5.1, you need to do this:
128+
!!! note
129+
If you are using Podman, at least as of v4.5.1, you need to do this:
128130

129-
```shell
130-
DOCKER_BUILDKIT=0 tilt up
131-
```
131+
```shell
132+
DOCKER_BUILDKIT=0 tilt up
133+
```
132134

133-
Otherwise, you'll see an error when Tilt tries to build your image that looks similar to:
135+
Otherwise, you'll see an error when Tilt tries to build your image that looks similar to:
134136
135-
```text
136-
Build Failed: ImageBuild: stat /var/tmp/libpod_builder2384046170/build/Dockerfile: no such file or directory
137-
```
137+
```text
138+
Build Failed: ImageBuild: stat /var/tmp/libpod_builder2384046170/build/Dockerfile: no such file or directory
139+
```
138140
139141
When Tilt starts, you'll see something like this in your terminal:
140142

docs/getting-started/olmv1_getting_started.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
The following script will install OLMv1 on a Kubernetes cluster. If you don't have one, you can deploy a Kubernetes cluster with [KIND](https://sigs.k8s.io/kind).
44

5-
> [!CAUTION]
6-
> Operator-Controller depends on [cert-manager](https://cert-manager.io/). Running the following command
7-
> may affect an existing installation of cert-manager and cause cluster instability.
5+
!!! warning
6+
Operator-Controller depends on [cert-manager](https://cert-manager.io/). Running the following command
7+
may affect an existing installation of cert-manager and cause cluster instability.
88

99
The latest version of Operator Controller can be installed with the following command:
1010

docs/howto/catalog-queries.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Catalog queries
22

3-
**Note:** By default, Catalogd is installed with TLS enabled for the catalog webserver.
4-
The following examples will show this default behavior, but for simplicity's sake will ignore TLS verification in the curl commands using the `-k` flag.
3+
!!! note
4+
By default, Catalogd is installed with TLS enabled for the catalog webserver.
5+
The following examples will show this default behavior, but for simplicity's sake will ignore TLS verification in the curl commands using the `-k` flag.
56

67

78
You can use the `curl` command with `jq` to query catalogs that are installed on your cluster.

0 commit comments

Comments
 (0)