Skip to content

Commit f587257

Browse files
OSDOCS-10502: Cluster extension status improvments
1 parent 8f766fc commit f587257

File tree

4 files changed

+290
-140
lines changed

4 files changed

+290
-140
lines changed

modules/olmv1-adding-a-catalog.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ Annotations: <none>
8989
API Version: catalogd.operatorframework.io/v1alpha1
9090
Kind: Catalog
9191
Metadata:
92-
Creation Timestamp: 2024-01-10T16:18:38Z
92+
Creation Timestamp: 2024-06-10T17:34:53Z
9393
Finalizers:
9494
catalogd.operatorframework.io/delete-server-cache
9595
Generation: 1
96-
Resource Version: 57057
97-
UID: 128db204-49b3-45ee-bfea-a2e6fc8e34ea
96+
Resource Version: 46075
97+
UID: 83c0db3c-a553-41da-b279-9b3cddaa117d
9898
Spec:
9999
Source:
100100
Image:
@@ -103,7 +103,7 @@ Spec:
103103
Type: image
104104
Status: <1>
105105
Conditions:
106-
Last Transition Time: 2024-01-10T16:18:55Z
106+
Last Transition Time: 2024-06-10T17:35:15Z
107107
Message:
108108
Reason: UnpackSuccessful <2>
109109
Status: True
@@ -113,9 +113,9 @@ Status: <1>
113113
Phase: Unpacked <3>
114114
Resolved Source:
115115
Image:
116-
Last Poll Attempt: 2024-01-10T16:18:51Z
116+
Last Poll Attempt: 2024-06-10T17:35:10Z
117117
Ref: registry.redhat.io/redhat/redhat-operator-index:v4.16
118-
Resolved Ref: registry.redhat.io/redhat/redhat-operator-index@sha256:7b536ae19b8e9f74bb521c4a61e5818e036ac1865a932f2157c6c9a766b2eea5 <4>
118+
Resolved Ref: registry.redhat.io/redhat/redhat-operator-index@sha256:f2ccc079b5e490a50db532d1dc38fd659322594dcf3e653d650ead0e862029d9 <4>
119119
Type: image
120120
Events: <none>
121121
----

modules/olmv1-installing-an-operator.adoc

Lines changed: 135 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
:_mod-docs-content-type: PROCEDURE
66

77
[id="olmv1-installing-an-operator_{context}"]
8-
= Installing an Operator from a catalog
8+
= Installing a cluster extension from a catalog
99

10-
{olmv1-first} supports installing Operators and extensions scoped to the cluster. You can install an Operator or extension from a catalog by creating a custom resource (CR) and applying it to the cluster.
10+
{olmv1-first} supports installing cluster extensions, including {olmv0} Operators via the `registry+v1` bundle format, that are scoped to the cluster. You can install an extension from a catalog by creating a custom resource (CR) and applying it to the cluster.
1111

1212
[IMPORTANT]
1313
====
14-
Currently, {olmv1} supports the installation Operators and extensions that meet the following criteria:
14+
Currently, {olmv1} supports the installation of extensions that meet the following criteria:
1515
16-
* The Operator or extension must use the `AllNamespaces` install mode.
17-
* The Operator or extension must not use webhooks.
16+
* The extension must use the `AllNamespaces` install mode.
17+
* The extension must not use webhooks.
1818
19-
Operators and extensions that use webhooks or that target a single or specified set of namespaces cannot be installed.
19+
Cluster extensions that use webhooks or that target a single or specified set of namespaces cannot be installed.
2020
====
2121

2222
.Prerequisite
@@ -58,6 +58,7 @@ $ jq -s '.[] | select( .schema == "olm.channel" ) | \
5858
"pipelines-1.11"
5959
"pipelines-1.12"
6060
"pipelines-1.13"
61+
"pipelines-1.14"
6162
----
6263
====
6364

@@ -87,14 +88,29 @@ select( .schema == "olm.channel" ) | select( .name == "latest" ) | \
8788
====
8889
[source,text]
8990
----
90-
"openshift-pipelines-operator-rh.v1.11.1"
9191
"openshift-pipelines-operator-rh.v1.12.0"
9292
"openshift-pipelines-operator-rh.v1.12.1"
9393
"openshift-pipelines-operator-rh.v1.12.2"
9494
"openshift-pipelines-operator-rh.v1.13.0"
9595
"openshift-pipelines-operator-rh.v1.13.1"
96+
"openshift-pipelines-operator-rh.v1.11.1"
97+
"openshift-pipelines-operator-rh.v1.12.0"
98+
"openshift-pipelines-operator-rh.v1.12.1"
99+
"openshift-pipelines-operator-rh.v1.12.2"
100+
"openshift-pipelines-operator-rh.v1.13.0"
101+
"openshift-pipelines-operator-rh.v1.14.1"
102+
"openshift-pipelines-operator-rh.v1.14.2"
103+
"openshift-pipelines-operator-rh.v1.14.3"
104+
"openshift-pipelines-operator-rh.v1.14.4"
105+
96106
----
97107
====
108+
. If you want to install your extension into a new namespace, run the following command:
109+
+
110+
[source,terminal]
111+
----
112+
$ oc adm new-project <new_namespace>
113+
----
98114

99115
. Create a CR, similar to the following example:
100116
+
@@ -107,14 +123,16 @@ metadata:
107123
name: pipelines-operator
108124
spec:
109125
packageName: openshift-pipelines-operator-rh
126+
installNamespace: <namespace>
110127
channel: <channel>
111128
version: "<version>"
112129
----
113130
+
114131
where:
115132
+
116-
<channel>:: Optional: Specifies the channel, such as `pipelines-1.11` or `latest`, for the package you want to install or update.
117-
<version>:: Optional: Specifies the version or version range, such as `1.11.1`, `1.12.x`, or `>=1.12.1`, of the package you want to install or update. For more information, see "Example custom resources (CRs) that specify a target version" and "Support for version ranges".
133+
`<namespace>`:: Specifies the namespace where you want the bundle installed, such as `openshift-operators` or `my-extension`. Extensions are still cluster-scoped and might contain resources that are installed in different namespaces.
134+
`<channel>`:: Optional: Specifies the channel, such as `pipelines-1.11` or `latest`, for the package you want to install or update.
135+
`<version>`:: Optional: Specifies the version or version range, such as `1.11.1`, `1.12.x`, or `>=1.12.1`, of the package you want to install or update. For more information, see "Example custom resources (CRs) that specify a target version" and "Support for version ranges".
118136
+
119137
--
120138
include::snippets/olmv1-multi-catalog-admon.adoc[]
@@ -142,48 +160,95 @@ clusterextension.olm.operatorframework.io/pipelines-operator created
142160
$ oc get clusterextension pipelines-operator -o yaml
143161
----
144162
+
145-
--
146-
include::snippets/olmv1-version-range-cr-adomn.adoc[]
147-
--
148-
+
149163
.Example output
150164
[%collapsible]
151165
====
152166
[source,text]
153167
----
154-
apiVersion: olm.operatorframework.io/v1alpha1
155-
kind: ClusterExtension
168+
apiVersion: v1
169+
items:
170+
- apiVersion: olm.operatorframework.io/v1alpha1
171+
kind: ClusterExtension
172+
metadata:
173+
annotations:
174+
kubectl.kubernetes.io/last-applied-configuration: |
175+
{"apiVersion":"olm.operatorframework.io/v1alpha1","kind":"ClusterExtension","metadata":{"annotations":{},"name":"pipelines-operator"},"spec":{"channel":"latest","installNamespace":"openshift-operators","packageName":"openshift-pipelines-operator-rh","pollInterval":"30m"}}
176+
creationTimestamp: "2024-06-10T17:50:51Z"
177+
generation: 1
178+
name: pipelines-operator
179+
resourceVersion: "53324"
180+
uid: c54237be-cde4-46d4-9b31-d0ec6acc19bf
181+
spec:
182+
channel: latest
183+
installNamespace: openshift-operators
184+
packageName: openshift-pipelines-operator-rh
185+
upgradeConstraintPolicy: Enforce
186+
status:
187+
conditions:
188+
- lastTransitionTime: "2024-06-10T17:50:58Z"
189+
message: resolved to "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:dd3d18367da2be42539e5dde8e484dac3df33ba3ce1d5bcf896838954f3864ec"
190+
observedGeneration: 1
191+
reason: Success
192+
status: "True"
193+
type: Resolved
194+
- lastTransitionTime: "2024-06-10T17:51:11Z"
195+
message: installed from "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:dd3d18367da2be42539e5dde8e484dac3df33ba3ce1d5bcf896838954f3864ec"
196+
observedGeneration: 1
197+
reason: Success
198+
status: "True"
199+
type: Installed
200+
- lastTransitionTime: "2024-06-10T17:50:58Z"
201+
message: ""
202+
observedGeneration: 1
203+
reason: Deprecated
204+
status: "False"
205+
type: Deprecated
206+
- lastTransitionTime: "2024-06-10T17:50:58Z"
207+
message: ""
208+
observedGeneration: 1
209+
reason: Deprecated
210+
status: "False"
211+
type: PackageDeprecated
212+
- lastTransitionTime: "2024-06-10T17:50:58Z"
213+
message: ""
214+
observedGeneration: 1
215+
reason: Deprecated
216+
status: "False"
217+
type: ChannelDeprecated
218+
- lastTransitionTime: "2024-06-10T17:50:58Z"
219+
message: ""
220+
observedGeneration: 1
221+
reason: Deprecated
222+
status: "False"
223+
type: BundleDeprecated
224+
installedBundle:
225+
name: openshift-pipelines-operator-rh.v1.14.4
226+
version: 1.14.4
227+
resolvedBundle:
228+
name: openshift-pipelines-operator-rh.v1.14.4
229+
version: 1.14.4
230+
kind: List
156231
metadata:
157-
annotations:
158-
kubectl.kubernetes.io/last-applied-configuration: |
159-
{"apiVersion":"olm.operatorframework.io/v1alpha1","kind":"ClusterExtension","metadata":{"annotations":{},"name":"pipelines-operator"},"spec":{"channel":"latest","packageName":"openshift-pipelines-operator-rh","version":"1.11.x"}}
160-
creationTimestamp: "2024-01-30T20:06:09Z"
161-
generation: 1
162-
name: pipelines-operator
163-
resourceVersion: "44362"
164-
uid: 4272d228-22e1-419e-b9a7-986f982ee588
165-
spec:
166-
channel: latest
167-
packageName: openshift-pipelines-operator-rh
168-
upgradeConstraintPolicy: Enforce
169-
version: 1.11.x
170-
status:
171-
conditions:
172-
- lastTransitionTime: "2024-01-30T20:06:15Z"
173-
message: resolved to "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:e09d37bb1e754db42324fd18c1cb3e7ce77e7b7fcbf4932d0535391579938280"
174-
observedGeneration: 1
175-
reason: Success
176-
status: "True"
177-
type: Resolved
178-
- lastTransitionTime: "2024-01-30T20:06:31Z"
179-
message: installed from "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:e09d37bb1e754db42324fd18c1cb3e7ce77e7b7fcbf4932d0535391579938280"
180-
observedGeneration: 1
181-
reason: Success
182-
status: "True"
183-
type: Installed
184-
installedBundleResource: registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:e09d37bb1e754db42324fd18c1cb3e7ce77e7b7fcbf4932d0535391579938280
185-
resolvedBundleResource: registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:e09d37bb1e754db42324fd18c1cb3e7ce77e7b7fcbf4932d0535391579938280
232+
resourceVersion: ""
186233
----
234+
where:
235+
236+
`spec.channel`:: Displays the channel defined in the CR of the extension.
237+
`spec.version`:: Displays the version or version range defined in the CR of the extension.
238+
`status.conditions`:: Displays information about the status and health of the extension.
239+
`type: Deprecated`:: Displays whether one or more of following are deprecated:
240+
+
241+
--
242+
`type: PackageDeprecated`:: Displays whether the resolved package is deprecated.
243+
`type: ChannelDeprecated`:: Displays whether the resolved channel is deprecated.
244+
`type: BundleDeprecated`:: Displays whether the resolved bundle is deprecated.
245+
--
246+
+
247+
The value of `False` in the `status` field indicates that the `reason: Deprecated` condition is not deprecated. The value of `True` in the `status` field indicates that the `reason: Deprecated` condition is deprecated.
248+
`installedBundle.name`:: Displays the name of the bundle installed.
249+
`installedBundle.version`:: Displays the version of the bundle installed.
250+
`resolvedBundle.name`:: Displays the name of the resolved bundle.
251+
`resolvedBundle.version`:: Displays the verson of the resolved bundle.
187252
====
188253

189254
. Get information about your bundle deployment by running the following command:
@@ -198,51 +263,52 @@ $ oc get bundleDeployment pipelines-operator -o yaml
198263
====
199264
[source,text]
200265
----
201-
apiVersion: core.rukpak.io/v1alpha1
266+
apiVersion: core.rukpak.io/v1alpha2
202267
kind: BundleDeployment
203268
metadata:
204-
creationTimestamp: "2024-01-30T20:06:15Z"
205-
generation: 2
269+
creationTimestamp: "2024-06-10T17:50:58Z"
270+
finalizers:
271+
- core.rukpak.io/delete-cached-bundle
272+
generation: 1
206273
name: pipelines-operator
207274
ownerReferences:
208275
- apiVersion: olm.operatorframework.io/v1alpha1
209276
blockOwnerDeletion: true
210277
controller: true
211278
kind: ClusterExtension
212279
name: pipelines-operator
213-
uid: 4272d228-22e1-419e-b9a7-986f982ee588
214-
resourceVersion: "44464"
215-
uid: 0a0c3525-27e2-4c93-bf57-55920a7707c0
280+
uid: c54237be-cde4-46d4-9b31-d0ec6acc19bf
281+
resourceVersion: "53414"
282+
uid: 74367cfc-578e-4da0-815f-fe40f3ca5d1c
216283
spec:
217-
provisionerClassName: core-rukpak-io-plain
218-
template:
219-
metadata: {}
220-
spec:
221-
provisionerClassName: core-rukpak-io-registry
222-
source:
223-
image:
224-
ref: registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:e09d37bb1e754db42324fd18c1cb3e7ce77e7b7fcbf4932d0535391579938280
225-
type: image
284+
installNamespace: openshift-operators
285+
provisionerClassName: core-rukpak-io-registry
286+
source:
287+
image:
288+
ref: registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:dd3d18367da2be42539e5dde8e484dac3df33ba3ce1d5bcf896838954f3864ec
289+
type: image
226290
status:
227-
activeBundle: pipelines-operator-29x720cjzx8yiowf13a3j75fil2zs3mfw
228291
conditions:
229-
- lastTransitionTime: "2024-01-30T20:06:15Z"
230-
message: Successfully unpacked the pipelines-operator-29x720cjzx8yiowf13a3j75fil2zs3mfw
231-
Bundle
292+
- lastTransitionTime: "2024-06-10T17:51:09Z"
293+
message: Successfully unpacked the image Bundle
232294
reason: UnpackSuccessful
233295
status: "True"
234-
type: HasValidBundle
235-
- lastTransitionTime: "2024-01-30T20:06:28Z"
236-
message: Instantiated bundle pipelines-operator-29x720cjzx8yiowf13a3j75fil2zs3mfw
237-
successfully
296+
type: Unpacked
297+
- lastTransitionTime: "2024-06-10T17:51:10Z"
298+
message: Instantiated bundle pipelines-operator successfully
238299
reason: InstallationSucceeded
239300
status: "True"
240301
type: Installed
241-
- lastTransitionTime: "2024-01-30T20:06:40Z"
302+
- lastTransitionTime: "2024-06-10T17:51:19Z"
242303
message: BundleDeployment is healthy
243304
reason: Healthy
244305
status: "True"
245306
type: Healthy
246-
observedGeneration: 2
307+
contentURL: https://core.openshift-rukpak.svc/bundles/pipelines-operator.tgz
308+
observedGeneration: 1
309+
resolvedSource:
310+
image:
311+
ref: registry.redhat.io/openshift-pipelines/pipelines-operator-bundle@sha256:dd3d18367da2be42539e5dde8e484dac3df33ba3ce1d5bcf896838954f3864ec
312+
type: image
247313
----
248314
====

0 commit comments

Comments
 (0)