Skip to content

Conversation

jchunkins
Copy link
Contributor

This PR adds an optional array of k8s.io/apimachinery/pkg/apis/meta/v1.Condition whose name is conditions to the CatalogSource status. This is being done to allow for condition support for use with the automatic-catalog-switching-annotations enhancement proposal PR (which has yet to be merged).

Note that the initial use of the conditions field will be the catalog template resolution logic, and will be used to indicate the status of catalog template resolution. In the future the OLM catalog operator could migrate to using conditions instead of the existing Message and Reason fields but that is out of scope for the enhancement proposal.

@openshift-ci openshift-ci bot requested review from exdx and timflannagan July 19, 2021 22:31
Copy link
Member

@ecordell ecordell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

// +patchStrategy=merge
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: CRs don't get encoded as protobuf so that tag could be omitted.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2021
@kevinrizza
Copy link
Member

/approve

@openshift-ci
Copy link

openshift-ci bot commented Jul 22, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jchunkins, kevinrizza

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2021
@timflannagan
Copy link
Member

It looks like tide's blocking on an optional github action. I opened openshift/release#20513 to update the tide configuration to alleviate this problem.

@kevinrizza kevinrizza merged commit d7d2792 into operator-framework:master Jul 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants