Skip to content

Commit ee9fbb7

Browse files
author
Mikalai Radchuk
committed
Fix docs
Fixes various issues in the docs. Mostly updates snippets to reflect new fields from recent API changes. Signed-off-by: Mikalai Radchuk <[email protected]>
1 parent aaa0e00 commit ee9fbb7

File tree

8 files changed

+108
-124
lines changed

8 files changed

+108
-124
lines changed

config/samples/catalogd_operatorcatalog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ spec:
77
type: Image
88
image:
99
ref: quay.io/operatorhubio/catalog:latest
10-
pollInterval: 10m
10+
pollIntervalMinutes: 10

docs/concepts/crd-upgrade-safety.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ kind: ClusterExtension
6161
metadata:
6262
name: clusterextension-sample
6363
spec:
64+
namespace: default
65+
serviceAccount:
66+
name: argocd-installer
6467
source:
6568
sourceType: Catalog
6669
catalog:
6770
packageName: argocd-operator
6871
version: 0.6.0
6972
install:
70-
namespace: default
71-
serviceAccount:
72-
name: argocd-installer
7373
preflight:
7474
crdUpgradeSafety:
75-
disabled: true
75+
enforcement: "None"
7676
```
7777
7878
You cannot disable individual field validators. If you disable the CRD Upgrade Safety preflight check, all field validators are disabled.

docs/getting-started/olmv1_getting_started.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
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]
5+
> [!CAUTION]
66
> Operator-Controller depends on [cert-manager](https://cert-manager.io/). Running the following command
77
> may affect an existing installation of cert-manager and cause cluster instability.
88
@@ -44,7 +44,7 @@ spec:
4444
type: Image
4545
image:
4646
ref: quay.io/operatorhubio/catalog:latest
47-
pollInterval: 10m
47+
pollIntervalMinutes: 10
4848
EOF
4949
```
5050

@@ -78,7 +78,7 @@ and on the extension upgrade process [here](../tutorials/upgrade-extension.md).
7878

7979
```bash
8080
# Update to v0.11.0
81-
kubectl patch clusterextension argocd --type='merge' -p '{"spec": {"source": {"content-management": {"version": "0.11.0"}}}}'
81+
kubectl patch clusterextension argocd --type='merge' -p '{"spec": {"source": {"catalog": {"version": "0.11.0"}}}}'
8282

8383
```
8484

@@ -106,10 +106,10 @@ kubectl delete namespace argocd
106106

107107
```bash
108108
# Delete installer service account cluster roles
109-
kubectl delete clusterrole argocd-installer-clusterrole && kubectl delete clusterrole argocd-rbac-clusterrole
109+
kubectl delete clusterrole argocd-installer-clusterrole && kubectl delete clusterrole argocd-installer-rbac-clusterrole
110110
```
111111

112112
```bash
113113
# Delete installer service account cluster role bindings
114-
kuebctl delete clusterrolebinding argocd-installer-binding && kubectl delete clusterrolebinding argocd-rbac-binding
114+
kubectl delete clusterrolebinding argocd-installer-binding && kubectl delete clusterrolebinding argocd-installer-rbac-binding
115115
```

docs/howto/catalog-queries.md

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,51 @@ curl -k https://localhost:8443/catalogs/operatorhubio/api/v1/all | <query>
1212

1313
## Package queries
1414

15-
Available packages in a catalog
16-
:
15+
Available packages in a catalog:
1716
``` terminal
1817
jq -s '.[] | select( .schema == "olm.package")'
1918
```
2019

21-
Packages that support `AllNamespaces` install mode and do not use webhooks
22-
23-
:
20+
Packages that support `AllNamespaces` install mode and do not use webhooks:
2421
``` terminal
2522
jq -c 'select(.schema == "olm.bundle") | {"package":.package, "version":.properties[] | select(.type == "olm.bundle.object").value.data | @base64d | fromjson | select(.kind == "ClusterServiceVersion" and (.spec.installModes[] | select(.type == "AllNamespaces" and .supported == true) != null) and .spec.webhookdefinitions == null).spec.version}'
2623
```
2724

28-
Package metadata
29-
:
25+
Package metadata:
3026
``` terminal
3127
jq -s '.[] | select( .schema == "olm.package") | select( .name == "<package_name>")'
3228
```
3329

34-
Catalog blobs in a package
35-
:
30+
Catalog blobs in a package:
3631
``` terminal
3732
jq -s '.[] | select( .package == "<package_name>")'
3833
```
3934

4035
## Channel queries
4136

42-
Channels in a package
43-
:
37+
Channels in a package:
4438
``` terminal
4539
jq -s '.[] | select( .schema == "olm.channel" ) | select( .package == "<package_name>") | .name'
4640
```
4741

48-
Versions in a channel
49-
:
42+
Versions in a channel:
5043
``` terminal
5144
jq -s '.[] | select( .package == "<package_name>" ) | select( .schema == "olm.channel" ) | select( .name == "<channel_name>" ) | .entries | .[] | .name'
5245
```
5346

54-
Latest version in a channel and upgrade path
55-
:
56-
``` terminal
47+
Latest version in a channel and upgrade path:
48+
``` terminal
5749
jq -s '.[] | select( .schema == "olm.channel" ) | select ( .name == "<channel>") | select( .package == "<package_name>")'
5850
```
5951

6052
## Bundle queries
6153

62-
Bundles in a package
63-
:
54+
Bundles in a package:
6455
``` terminal
6556
jq -s '.[] | select( .schema == "olm.bundle" ) | select( .package == "<package_name>") | .name'
6657
```
6758

68-
Bundle dependencies and available APIs
69-
:
59+
Bundle dependencies and available APIs:
7060
``` terminal
7161
jq -s '.[] | select( .schema == "olm.bundle" ) | select ( .name == "<bundle_name>") | select( .package == "<package_name>")'
7262
```

docs/tutorials/add-catalog.md

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,33 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
2929
apiVersion: olm.operatorframework.io/v1alpha1
3030
kind: ClusterCatalog
3131
metadata:
32-
name: operatorhubio
32+
name: <catalog_name>
3333
spec:
3434
source:
3535
type: Image
3636
image:
3737
ref: <catalog_image>
38-
pollInterval: <poll_interval_duration>
38+
pollIntervalMinutes: <poll_interval_duration>
3939
```
4040
4141
`catalog_name`
4242
: Specifies the image reference for the catalog you want to install, such as `quay.io/operatorhubio/catalog:latest`.
4343

4444
`poll_interval_duration`
45-
: Specifies the interval for polling the remote registry for newer image digests.
46-
The default value is `24h`.
47-
Valid units include seconds (`s`), minutes (`m`), and hours (`h`).
48-
To disable polling, set a zero value, such as `0s`.
45+
: Specifies the number of minutes for polling the remote registry for newer image digests.
46+
This field is optional. To disable polling, unset the field.
4947

5048
``` yaml title="Example `operatorhubio.yaml` CR"
5149
apiVersion: olm.operatorframework.io/v1alpha1
5250
kind: ClusterCatalog
5351
metadata:
54-
name: operatorhub
52+
name: operatorhubio
5553
spec:
5654
source:
5755
type: Image
5856
image:
5957
ref: quay.io/operatorhubio/catalog:latest
60-
pollInterval: 10m
58+
pollIntervalMinutes: 10
6159
```
6260
6361
2. Apply the ClusterCatalog CR:
@@ -81,8 +79,8 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
8179
```
8280

8381
``` terminal title="Example output"
84-
NAME LASTUNPACKED AGE
85-
operatorhubio 9m31s 9m55s
82+
NAME LASTUNPACKED SERVING AGE
83+
operatorhubio 18s True 27s
8684
```
8785

8886
* Check the status of your catalog:
@@ -99,40 +97,41 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
9997
API Version: olm.operatorframework.io/v1alpha1
10098
Kind: ClusterCatalog
10199
Metadata:
102-
Creation Timestamp: 2024-10-02T19:51:24Z
103-
Finalizers:
100+
Creation Timestamp: 2024-11-11T13:19:12Z
101+
Finalizers:
104102
olm.operatorframework.io/delete-server-cache
105-
Generation: 1
106-
Resource Version: 33321
107-
UID: 52894532-0646-41a5-8285-c7f48bba49e4
103+
Generation: 1
104+
Resource Version: 2143
105+
UID: 2cebaf11-7a5c-4813-bef3-58ac2e373057
108106
Spec:
109-
Priority: 0
107+
Availability Mode: Available
108+
Priority: 0
110109
Source:
111110
Image:
112-
Poll Interval: 10m0s
113-
Ref: quay.io/operatorhubio/catalog:latest
114-
Type: Image
111+
Poll Interval Minutes: 10
112+
Ref: quay.io/operatorhubio/catalog:latest
113+
Type: Image
115114
Status:
116115
Conditions:
117-
Last Transition Time: 2024-03-12T19:35:34Z
116+
Last Transition Time: 2024-11-11T13:19:21Z
118117
Message: Successfully unpacked and stored content from resolved source
119-
Observed Generation: 2
118+
Observed Generation: 1
120119
Reason: Succeeded
121-
Status: False
120+
Status: True
122121
Type: Progressing
123-
Last Transition Time: 2024-03-12T19:35:34Z
122+
Last Transition Time: 2024-11-11T13:19:21Z
124123
Message: Serving desired content from resolved source
125-
Observed Generation: 2
124+
Observed Generation: 1
126125
Reason: Available
127126
Status: True
128127
Type: Serving
129-
URLs:
130-
Base: https://catalogd-server.olmv1-system.svc/catalogs/operatorhubio
131-
Last Unpacked: 2024-03-12T19:35:34Z
128+
Last Unpacked: 2024-11-11T13:19:21Z
132129
Resolved Source:
133130
Image:
134-
Last Successful Poll Attempt: 2024-03-12T19:35:26Z
135-
Ref: quay.io/operatorhubio/catalog@sha256:dee29aaed76fd1c72b654b9bc8bebc4b48b34fd8d41ece880524dc0c3c1c55ec
136-
Type: Image
137-
Events: <none>
131+
Ref: quay.io/operatorhubio/catalog@sha256:025cb23665449d8974102dda042c2e25bd3cb9138791971748f48d57c90a21d8
132+
Type: Image
133+
Urls:
134+
Base: https://catalogd-service.olmv1-system.svc/catalogs/operatorhubio
135+
Events: <none>
136+
138137
```

docs/tutorials/install-extension.md

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,15 @@ For information on determining the ServiceAccount's permission, please see [Deri
3939
metadata:
4040
name: <extension_name>
4141
spec:
42+
namespace: <namespace_name>
43+
serviceAccount:
44+
name: <serviceAccount_name>
4245
source:
4346
sourceType: Catalog
4447
catalog:
4548
packageName: <package_name>
4649
channel: <channel>
4750
version: "<version>"
48-
install:
49-
namespace: <namespace_name>
50-
serviceAccount:
51-
name: <serviceAccount_name>
5251
```
5352
5453
`extension_name`
@@ -63,10 +62,10 @@ For information on determining the ServiceAccount's permission, please see [Deri
6362
`version`
6463
: Optional: Specifies the version or version range you want installed, such as `1.3.1` or `"<2"`.
6564
If you use a comparison string to define a version range, the string must be surrounded by double quotes (`"`).
66-
65+
6766
`namespace_name`
68-
: Specifies a name for the namespace in which the bundle of content for the package referenced
69-
in the packageName field will be applied.
67+
: Specifies a name for the namespace in which the bundle of content for the package referenced
68+
in the packageName field will be applied.
7069

7170
`serviceAccount_name`
7271
: serviceAccount name is a required reference to a ServiceAccount that exists
@@ -110,66 +109,64 @@ For information on determining the ServiceAccount's permission, please see [Deri
110109
API Version: olm.operatorframework.io/v1alpha1
111110
Kind: ClusterExtension
112111
Metadata:
113-
Creation Timestamp: 2024-10-03T16:02:40Z
114-
Finalizers:
112+
Creation Timestamp: 2024-11-11T13:41:23Z
113+
Finalizers:
115114
olm.operatorframework.io/cleanup-unpack-cache
116115
olm.operatorframework.io/cleanup-contentmanager-cache
117-
Generation: 2
118-
Resource Version: 1174
119-
UID: 0fcaf3f5-d142-4c7e-8d88-c88a549f7764
116+
Generation: 1
117+
Resource Version: 5426
118+
UID: bde55f03-abe2-48af-8c09-28d32df878ad
120119
Spec:
121-
Install:
122-
Namespace: argocd
123-
Service Account:
120+
Namespace: argocd
121+
Service Account:
124122
Name: argocd-installer
125-
Source:
123+
Source:
126124
Catalog:
127-
Package Name: argocd-operator
128-
Selector:
129-
Upgrade Constraint Policy: CatalogProvided
130-
Version: 0.6.0
125+
Package Name: argocd-operator
126+
Upgrade Constraint Policy: CatalogProvided
127+
Version: 0.6.0
131128
Source Type: Catalog
132129
Status:
133-
Conditions:
134-
Last Transition Time: 2024-10-03T16:02:41Z
130+
Conditions:
131+
Last Transition Time: 2024-11-11T13:41:23Z
135132
Message:
136-
Observed Generation: 2
133+
Observed Generation: 1
137134
Reason: Deprecated
138135
Status: False
139136
Type: Deprecated
140-
Last Transition Time: 2024-10-03T16:02:41Z
137+
Last Transition Time: 2024-11-11T13:41:23Z
141138
Message:
142-
Observed Generation: 2
139+
Observed Generation: 1
143140
Reason: Deprecated
144141
Status: False
145142
Type: PackageDeprecated
146-
Last Transition Time: 2024-10-03T16:02:41Z
143+
Last Transition Time: 2024-11-11T13:41:23Z
147144
Message:
148-
Observed Generation: 2
145+
Observed Generation: 1
149146
Reason: Deprecated
150147
Status: False
151148
Type: ChannelDeprecated
152-
Last Transition Time: 2024-10-03T16:02:41Z
149+
Last Transition Time: 2024-11-11T13:41:23Z
153150
Message:
154-
Observed Generation: 2
151+
Observed Generation: 1
155152
Reason: Deprecated
156153
Status: False
157154
Type: BundleDeprecated
158-
Last Transition Time: 2024-10-03T16:02:43Z
155+
Last Transition Time: 2024-11-11T13:41:31Z
159156
Message: Installed bundle quay.io/operatorhubio/argocd-operator@sha256:d538c45a813b38ef0e44f40d279dc2653f97ca901fb660da5d7fe499d51ad3b3 successfully
160-
Observed Generation: 2
157+
Observed Generation: 1
161158
Reason: Succeeded
162159
Status: True
163160
Type: Installed
164-
Last Transition Time: 2024-10-03T16:02:43Z
161+
Last Transition Time: 2024-11-11T13:41:32Z
165162
Message: desired state reached
166-
Observed Generation: 2
163+
Observed Generation: 1
167164
Reason: Succeeded
168-
Status: False
165+
Status: True
169166
Type: Progressing
170-
Install:
167+
Install:
171168
Bundle:
172-
Name: argocd-operator.v0.6.0
173-
Version: 0.6.0
169+
Name: argocd-operator.v0.6.0
170+
Version: 0.6.0
174171
Events: <none>
175172
```

0 commit comments

Comments
 (0)