Skip to content

Commit 8137da0

Browse files
✨ update GoDoc comments to be accurate with latest api changes (#423)
* update GoDoc comments to be accurate with latest api changes Signed-off-by: everettraven <[email protected]> * formatting Signed-off-by: everettraven <[email protected]> * make verify Signed-off-by: everettraven <[email protected]> * minor grammar fix Co-authored-by: Jordan Keister <[email protected]> * regen crds Signed-off-by: everettraven <[email protected]> --------- Signed-off-by: everettraven <[email protected]> Co-authored-by: Jordan Keister <[email protected]>
1 parent 29d21c7 commit 8137da0

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

api/core/v1alpha1/clustercatalog_types.go

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ type ClusterCatalogSpec struct {
8787
// priority is an optional field that allows the user to define a priority for a ClusterCatalog.
8888
// A ClusterCatalog's priority is used by clients as a tie-breaker between ClusterCatalogs that meet the client's requirements.
8989
// For example, in the case where multiple ClusterCatalogs provide the same bundle.
90-
// A higher number means higher priority. Negative number as also accepted.
90+
// A higher number means higher priority. Negative numbers are also accepted.
9191
// When omitted, the default priority is 0.
9292
// +kubebuilder:default:=0
9393
// +optional
@@ -106,15 +106,15 @@ type ClusterCatalogStatus struct {
106106
// - Message: a human-readable message that further elaborates on the state of the condition.
107107
//
108108
// The current set of condition types are:
109-
// - "Unpacked", epresents whether, or not, the catalog contents have been successfully unpacked.
110-
// - "Deleted", represents whether, or not, the catalog contents have been successfully deleted.
109+
// - "Serving", which represents whether or not the contents of the catalog are being served via the HTTP(S) web server.
110+
// - "Progressing", which represents whether or not the ClusterCatalog is progressing towards a new state.
111111
//
112112
// The current set of reasons are:
113-
// - "UnpackPending", this reason is set on the "Unpack" condition when unpacking the catalog has not started.
114-
// - "Unpacking", this reason is set on the "Unpack" condition when the catalog is being unpacked.
115-
// - "UnpackSuccessful", this reason is set on the "Unpack" condition when unpacking the catalog is successful and the catalog metadata is available to the cluster.
116-
// - "FailedToStore", this reason is set on the "Unpack" condition when an error has been encountered while storing the contents of the catalog.
117-
// - "FailedToDelete", this reason is set on the "Delete" condition when an error has been encountered while deleting the contents of the catalog.
113+
// - "Succeeded", this reason is set on the "Progressing" condition when progressing to a new state is successful.
114+
// - "Blocked", this reason is set on the "Progressing" condition when the ClusterCatalog controller has encountered an error that requires manual intervention for recovery.
115+
// - "Retrying", this reason is set on the "Progressing" condition when the ClusterCatalog controller has encountered an error that might be resolvable on subsequent reconciliation attempts.
116+
// - "Available", this reason is set on the "Serving" condition when the contents of the ClusterCatalog are being served via an endpoint on the HTTP(S) web server.
117+
// - "Unavailable", this reason is set on the "Serving" condition when there is not an endpoint on the HTTP(S) web server that is serving the contents of the ClusterCatalog.
118118
//
119119
// +optional
120120
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
@@ -124,10 +124,8 @@ type ClusterCatalogStatus struct {
124124
// resolvedSource:
125125
//
126126
// image:
127-
// lastPollAttempt: "2024-09-10T12:22:13Z"
128-
// lastUnpacked: "2024-09-10T12:22:13Z"
129-
// ref: quay.io/operatorhubio/catalog:latest
130-
// resolvedRef: quay.io/operatorhubio/catalog@sha256:c7392b4be033da629f9d665fec30f6901de51ce3adebeff0af579f311ee5cf1b
127+
// lastSuccessfulPollAttempt: "2024-09-10T12:22:13Z"
128+
// ref: quay.io/operatorhubio/catalog@sha256:c7392b4be033da629f9d665fec30f6901de51ce3adebeff0af579f311ee5cf1b
131129
// type: Image
132130
// +optional
133131
ResolvedSource *ResolvedCatalogSource `json:"resolvedSource,omitempty"`

config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
priority is an optional field that allows the user to define a priority for a ClusterCatalog.
5858
A ClusterCatalog's priority is used by clients as a tie-breaker between ClusterCatalogs that meet the client's requirements.
5959
For example, in the case where multiple ClusterCatalogs provide the same bundle.
60-
A higher number means higher priority. Negative number as also accepted.
60+
A higher number means higher priority. Negative numbers are also accepted.
6161
When omitted, the default priority is 0.
6262
format: int32
6363
type: integer
@@ -142,15 +142,15 @@ spec:
142142
- Message: a human-readable message that further elaborates on the state of the condition.
143143
144144
The current set of condition types are:
145-
- "Unpacked", epresents whether, or not, the catalog contents have been successfully unpacked.
146-
- "Deleted", represents whether, or not, the catalog contents have been successfully deleted.
145+
- "Serving", which represents whether or not the contents of the catalog are being served via the HTTP(S) web server.
146+
- "Progressing", which represents whether or not the ClusterCatalog is progressing towards a new state.
147147
148148
The current set of reasons are:
149-
- "UnpackPending", this reason is set on the "Unpack" condition when unpacking the catalog has not started.
150-
- "Unpacking", this reason is set on the "Unpack" condition when the catalog is being unpacked.
151-
- "UnpackSuccessful", this reason is set on the "Unpack" condition when unpacking the catalog is successful and the catalog metadata is available to the cluster.
152-
- "FailedToStore", this reason is set on the "Unpack" condition when an error has been encountered while storing the contents of the catalog.
153-
- "FailedToDelete", this reason is set on the "Delete" condition when an error has been encountered while deleting the contents of the catalog.
149+
- "Succeeded", this reason is set on the "Progressing" condition when progressing to a new state is successful.
150+
- "Blocked", this reason is set on the "Progressing" condition when the ClusterCatalog controller has encountered an error that requires manual intervention for recovery.
151+
- "Retrying", this reason is set on the "Progressing" condition when the ClusterCatalog controller has encountered an error that might be resolvable on subsequent reconciliation attempts.
152+
- "Available", this reason is set on the "Serving" condition when the contents of the ClusterCatalog are being served via an endpoint on the HTTP(S) web server.
153+
- "Unavailable", this reason is set on the "Serving" condition when there is not an endpoint on the HTTP(S) web server that is serving the contents of the ClusterCatalog.
154154
items:
155155
description: Condition contains details for one aspect of the current
156156
state of this API Resource.
@@ -225,10 +225,8 @@ spec:
225225
resolvedSource:
226226
227227
image:
228-
lastPollAttempt: "2024-09-10T12:22:13Z"
229-
lastUnpacked: "2024-09-10T12:22:13Z"
230-
ref: quay.io/operatorhubio/catalog:latest
231-
resolvedRef: quay.io/operatorhubio/catalog@sha256:c7392b4be033da629f9d665fec30f6901de51ce3adebeff0af579f311ee5cf1b
228+
lastSuccessfulPollAttempt: "2024-09-10T12:22:13Z"
229+
ref: quay.io/operatorhubio/catalog@sha256:c7392b4be033da629f9d665fec30f6901de51ce3adebeff0af579f311ee5cf1b
232230
type: Image
233231
properties:
234232
image:

0 commit comments

Comments
 (0)