Skip to content

Commit b6b087e

Browse files
committed
CE API updates
- Regenerate CRD - Fixup import in conditionsets package Signed-off-by: Joe Lanford <[email protected]>
1 parent 1792d2d commit b6b087e

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- jsonPath: .metadata.creationTimestamp
3131
name: Age
3232
type: date
33-
name: v1alpha1
33+
name: v1
3434
schema:
3535
openAPIV3Schema:
3636
description: ClusterExtension is the Schema for the clusterextensions API

internal/conditionsets/conditionsets.go

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,27 @@ limitations under the License.
1616

1717
package conditionsets
1818

19+
import (
20+
ocv1 "github.com/operator-framework/operator-controller/api/v1"
21+
)
22+
1923
// ConditionTypes is the full set of ClusterExtension condition Types.
2024
// ConditionReasons is the full set of ClusterExtension condition Reasons.
2125
//
2226
// NOTE: unit tests in clusterextension_types_test will enforce completeness.
2327
var ConditionTypes = []string{
24-
v1alpha1.TypeInstalled,
25-
v1alpha1.TypeDeprecated,
26-
v1alpha1.TypePackageDeprecated,
27-
v1alpha1.TypeChannelDeprecated,
28-
v1alpha1.TypeBundleDeprecated,
29-
v1alpha1.TypeProgressing,
28+
ocv1.TypeInstalled,
29+
ocv1.TypeDeprecated,
30+
ocv1.TypePackageDeprecated,
31+
ocv1.TypeChannelDeprecated,
32+
ocv1.TypeBundleDeprecated,
33+
ocv1.TypeProgressing,
3034
}
3135

3236
var ConditionReasons = []string{
33-
v1alpha1.ReasonSucceeded,
34-
v1alpha1.ReasonDeprecated,
35-
v1alpha1.ReasonFailed,
36-
v1alpha1.ReasonBlocked,
37-
v1alpha1.ReasonRetrying,
37+
ocv1.ReasonSucceeded,
38+
ocv1.ReasonDeprecated,
39+
ocv1.ReasonFailed,
40+
ocv1.ReasonBlocked,
41+
ocv1.ReasonRetrying,
3842
}

0 commit comments

Comments
 (0)