Skip to content

Commit d04dfa6

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2048 from benluddy/operator-framework-api-0.7.0
Bump github.com/operator-framework/api dependency to v0.7.0.
2 parents 76d665c + 8ee2723 commit d04dfa6

15 files changed

+271
-56
lines changed

‎deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,14 @@ spec:
288288
type: string
289289
version:
290290
type: string
291+
cleanup:
292+
description: Cleanup specifies the cleanup behaviour when the CSV gets deleted
293+
type: object
294+
required:
295+
- enabled
296+
properties:
297+
enabled:
298+
type: boolean
291299
customresourcedefinitions:
292300
description: "CustomResourceDefinitions declares all of the CRDs managed or required by an operator being ran by ClusterServiceVersion. \n If the CRD is present in the Owned list, it is implicitly required."
293301
type: object
@@ -4671,7 +4679,7 @@ spec:
46714679
webhookPath:
46724680
type: string
46734681
status:
4674-
description: ClusterServiceVersionStatus represents information about the status of a pod. Status may trail the actual state of a system.
4682+
description: ClusterServiceVersionStatus represents information about the status of a CSV. Status may trail the actual state of a system.
46754683
type: object
46764684
properties:
46774685
certsLastUpdated:
@@ -4682,6 +4690,37 @@ spec:
46824690
description: Time the owned APIService certs will rotate next
46834691
type: string
46844692
format: date-time
4693+
cleanup:
4694+
description: CleanupStatus represents information about the status of cleanup while a CSV is pending deletion
4695+
type: object
4696+
properties:
4697+
pendingDeletion:
4698+
description: PendingDeletion is the list of custom resource objects that are pending deletion and blocked on finalizers. This indicates the progress of cleanup that is blocking CSV deletion or operator uninstall.
4699+
type: array
4700+
items:
4701+
description: ResourceList represents a list of resources which are of the same Group/Kind
4702+
type: object
4703+
required:
4704+
- group
4705+
- instances
4706+
- kind
4707+
properties:
4708+
group:
4709+
type: string
4710+
instances:
4711+
type: array
4712+
items:
4713+
type: object
4714+
required:
4715+
- name
4716+
properties:
4717+
name:
4718+
type: string
4719+
namespace:
4720+
description: Namespace can be empty for cluster-scoped resources
4721+
type: string
4722+
kind:
4723+
type: string
46854724
conditions:
46864725
description: List of conditions, a history of state transitions
46874726
type: array

‎deploy/chart/crds/0000_50_olm_00-operatorconditions.crd.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ metadata:
88
spec:
99
group: operators.coreos.com
1010
names:
11+
categories:
12+
- olm
1113
kind: OperatorCondition
1214
listKind: OperatorConditionList
1315
plural: operatorconditions
16+
shortNames:
17+
- condition
1418
singular: operatorcondition
1519
scope: Namespaced
1620
versions:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/onsi/gomega v1.10.2
2727
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
2828
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
29-
github.com/operator-framework/api v0.6.0
29+
github.com/operator-framework/api v0.7.0
3030
github.com/operator-framework/operator-registry v1.13.6
3131
github.com/otiai10/copy v1.2.0
3232
github.com/pkg/errors v0.9.1

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -812,8 +812,8 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
812812
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
813813
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
814814
github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q=
815-
github.com/operator-framework/api v0.6.0 h1:Ed/iyfsEfsODr3dTrVVQKRVknqyEz8CQntXU7ogP+/E=
816-
github.com/operator-framework/api v0.6.0/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
815+
github.com/operator-framework/api v0.7.0 h1:uND/8x4J44eVEsGHeNMIQUYlduggG61CNPXlO8eXf3k=
816+
github.com/operator-framework/api v0.7.0/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
817817
github.com/operator-framework/operator-registry v1.13.6 h1:h/dIjQQS7uneQNRifrSz7h0xg4Xyjg6C9f6XZofbMPg=
818818
github.com/operator-framework/operator-registry v1.13.6/go.mod h1:YhnIzOVjRU2ZwZtzt+fjcjW8ujJaSFynBEu7QVKaSdU=
819819
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

‎manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,14 @@ spec:
290290
type: string
291291
version:
292292
type: string
293+
cleanup:
294+
description: Cleanup specifies the cleanup behaviour when the CSV gets deleted
295+
type: object
296+
required:
297+
- enabled
298+
properties:
299+
enabled:
300+
type: boolean
293301
customresourcedefinitions:
294302
description: "CustomResourceDefinitions declares all of the CRDs managed or required by an operator being ran by ClusterServiceVersion. \n If the CRD is present in the Owned list, it is implicitly required."
295303
type: object
@@ -4673,7 +4681,7 @@ spec:
46734681
webhookPath:
46744682
type: string
46754683
status:
4676-
description: ClusterServiceVersionStatus represents information about the status of a pod. Status may trail the actual state of a system.
4684+
description: ClusterServiceVersionStatus represents information about the status of a CSV. Status may trail the actual state of a system.
46774685
type: object
46784686
properties:
46794687
certsLastUpdated:
@@ -4684,6 +4692,37 @@ spec:
46844692
description: Time the owned APIService certs will rotate next
46854693
type: string
46864694
format: date-time
4695+
cleanup:
4696+
description: CleanupStatus represents information about the status of cleanup while a CSV is pending deletion
4697+
type: object
4698+
properties:
4699+
pendingDeletion:
4700+
description: PendingDeletion is the list of custom resource objects that are pending deletion and blocked on finalizers. This indicates the progress of cleanup that is blocking CSV deletion or operator uninstall.
4701+
type: array
4702+
items:
4703+
description: ResourceList represents a list of resources which are of the same Group/Kind
4704+
type: object
4705+
required:
4706+
- group
4707+
- instances
4708+
- kind
4709+
properties:
4710+
group:
4711+
type: string
4712+
instances:
4713+
type: array
4714+
items:
4715+
type: object
4716+
required:
4717+
- name
4718+
properties:
4719+
name:
4720+
type: string
4721+
namespace:
4722+
description: Namespace can be empty for cluster-scoped resources
4723+
type: string
4724+
kind:
4725+
type: string
46874726
conditions:
46884727
description: List of conditions, a history of state transitions
46894728
type: array

‎manifests/0000_50_olm_00-operatorconditions.crd.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ metadata:
1010
spec:
1111
group: operators.coreos.com
1212
names:
13+
categories:
14+
- olm
1315
kind: OperatorCondition
1416
listKind: OperatorConditionList
1517
plural: operatorconditions
18+
shortNames:
19+
- condition
1620
singular: operatorcondition
1721
scope: Namespaced
1822
versions:

‎vendor/github.com/operator-framework/api/crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 40 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/operator-framework/api/crds/zz_defs.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/clusterserviceversion_types.go

Lines changed: 35 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/operator-framework/api/pkg/validation/internal/annotations.go

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)