Skip to content

Commit d30bc8b

Browse files
Fix follow-up for bumping catalogd to v0.36.0: Update pollInterval to pollIntervalMinutes in ClusterCatalog spec
In #1434, the API was updated to use pollIntervalMinutes instead of pollInterval. This commit ensures all references are properly updated. See: https://github.com/operator-framework/operator-controller/pull/1434/files#diff-93b46b0715181c9cf397eed60862261b7839ff721599fcc393a393b9edea610bR57
1 parent 6c2be08 commit d30bc8b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
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: 10m

docs/concepts/crd-upgrade-safety.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ spec:
117117
type: object
118118
status:
119119
type: object
120-
pollInterval:
120+
PollIntervalMinutes:
121121
type: string
122122
type: object
123123
served: true
@@ -173,7 +173,7 @@ In this example, the existing stored version, `v1alpha1`, has been removed:
173173
type: object
174174
status:
175175
type: object
176-
pollInterval:
176+
PollIntervalMinutes:
177177
type: string
178178
type: object
179179
```
@@ -185,7 +185,7 @@ In this example, the existing stored version, `v1alpha1`, has been removed:
185185
186186
### Removing an existing field
187187
188-
In this example, the `pollInterval` field has been removed from `v1alpha1`:
188+
In this example, the `PollIntervalMinutes` field has been removed from `v1alpha1`:
189189

190190
??? example
191191
```yaml
@@ -209,12 +209,12 @@ In this example, the `pollInterval` field has been removed from `v1alpha1`:
209209

210210
??? failure "Error output"
211211
```
212-
validating upgrade for CRD "test.example.com" failed: CustomResourceDefinition test.example.com failed upgrade safety validation. "NoExistingFieldRemoved" validation failed: crd/test.example.com version/v1alpha1 field/^.spec.pollInterval may not be removed
212+
validating upgrade for CRD "test.example.com" failed: CustomResourceDefinition test.example.com failed upgrade safety validation. "NoExistingFieldRemoved" validation failed: crd/test.example.com version/v1alpha1 field/^.spec.PollIntervalMinutes may not be removed
213213
```
214214
215215
### Adding a required field
216216
217-
In this example, `pollInterval` has been changed to a required field:
217+
In this example, `PollIntervalMinutes` has been changed to a required field:
218218

219219
??? example
220220
```yaml
@@ -233,14 +233,14 @@ In this example, `pollInterval` has been changed to a required field:
233233
type: object
234234
status:
235235
type: object
236-
pollInterval:
236+
PollIntervalMinutes:
237237
type: string
238238
type: object
239239
required:
240-
- pollInterval
240+
- PollIntervalMinutes
241241
```
242242

243243
??? failure "Error output"
244244
```
245-
validating upgrade for CRD "test.example.com" failed: CustomResourceDefinition test.example.com failed upgrade safety validation. "ChangeValidator" validation failed: version "v1alpha1", field "^": new required fields added: [pollInterval]
245+
validating upgrade for CRD "test.example.com" failed: CustomResourceDefinition test.example.com failed upgrade safety validation. "ChangeValidator" validation failed: version "v1alpha1", field "^": new required fields added: [PollIntervalMinutes]
246246
```

docs/getting-started/olmv1_getting_started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
type: Image
4545
image:
4646
ref: quay.io/operatorhubio/catalog:latest
47-
pollInterval: 10m
47+
PollIntervalMinutes: 10m
4848
EOF
4949
```
5050

docs/tutorials/add-catalog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
3535
type: Image
3636
image:
3737
ref: <catalog_image>
38-
pollInterval: <poll_interval_duration>
38+
PollIntervalMinutes: <poll_interval_duration>
3939
```
4040
4141
`catalog_name`
@@ -57,7 +57,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
5757
type: Image
5858
image:
5959
ref: quay.io/operatorhubio/catalog:latest
60-
pollInterval: 10m
60+
PollIntervalMinutes: 10m
6161
```
6262
6363
2. Apply the ClusterCatalog CR:

0 commit comments

Comments
 (0)