Update condition lib to use v2 #61

awgreene · 2021-05-26T17:36:21Z

The v2 OperatorCondition CRD was introduced to the operator-framework/api
repository. This change updates the condition library to consume the new
changes.

varshaprasad96

A quick doubt, is OLM still going to support v1 condition CRD's for a release and then deprecate (eventually remove) later? If thats the case, I suppose this condition lib should also be versioned in a way to support both the condition CRD versions till OLM removes v1 Conditions. Or is it not necessary?
cc: @estroz @jmrodri

awgreene · 2021-05-26T17:54:03Z

A quick doubt, is OLM still going to support v1 condition CRD's for a release and then deprecate (eventually remove) later? If thats the case, I suppose this condition lib should also be versioned in a way to support both the condition CRD versions till OLM removes v1 Conditions. Or is it not necessary?
cc: @estroz @jmrodri

OperatorCondition V1 does not handle race conditions so it is broken. We do not want anyone using v1.

dinhxuanvu

/lgtm

coveralls · 2021-05-26T18:04:48Z

Pull Request Test Coverage Report for Build 1004777565

5 of 5 (100.0%) changed or added relevant lines in 1 file are covered.
No unchanged relevant lines lost coverage.
Overall coverage remained the same at 79.187%

Totals
Change from base Build 943897131:	0.0%
Covered Lines:	331
Relevant Lines:	418

💛 - Coveralls

estroz · 2021-05-26T18:07:24Z

So clearly there is not enough test coverage somewhere that resulted in this race condition not being caught. Has that coverage been implemented somewhere? Are more tests needed here?

varshaprasad96 · 2021-05-26T18:09:10Z

conditions/conditions_test.go

 				ObjectMeta: metav1.ObjectMeta{Name: "operator-condition-test", Namespace: ns},
-				Status: apiv1.OperatorConditionStatus{
+				Spec: apiv2.OperatorConditionSpec{


a non-blocker, but it would be helpful to have conditionType declared in v2 too. Its odd that for someone using this library, they would have to use conditionType from v1 and refer to OperatorCondition api from v2. Example - here.

If not the other option is - to remove the conditionType itself and let users specify a string directly.

Addressed in this release: https://github.com/operator-framework/api/releases/tag/v0.9.1

awgreene · 2021-05-26T18:59:02Z

So clearly there is not enough test coverage somewhere that resulted in this race condition not being caught. Has that coverage been implemented somewhere? Are more tests needed here?

@estroz this should be handled in the OLM PR operator-framework/operator-lifecycle-manager#2160

varshaprasad96 · 2021-05-27T16:02:16Z

/lgtm

estroz · 2021-05-27T16:12:04Z

Reposting from operator-framework/api#119 for visibility:

Out of curiosity: why v2 and not v2beta1 [or even v2alpha1]? Are we confident no significant changes will be needed soon? I feel that it’s a bit hasty to just throw a new stable version out, especially given how short the lifetime of v1 was.

dinhxuanvu · 2021-05-27T16:17:55Z

Reposting from operator-framework/api#119 for visibility:

Out of curiosity: why v2 and not v2beta1 [or even v2alpha1]? Are we confident no significant changes will be needed soon? I feel that it’s a bit hasty to just throw a new stable version out, especially given how short the lifetime of v1 was.

I don't think we will have another significant changes anytime soon. Any other changes are probably on OLM side, not on the CRD side but I'm fine with keeping it v2beta1 if we all agree on that. cc @awgreene

estroz · 2021-05-27T17:05:28Z

Resolved in operator-framework/api#119 (comment). v2 it is.

The v2 OperatorCondition CRD was introduced to the operator-framework/api repository. This change updates the condition library to consume the new changes.

awgreene · 2021-07-06T14:47:25Z

@varshaprasad96 can we get eyes on this pr?

nunnatsa · 2021-07-06T15:07:43Z

conditions/conditions.go

@@ -84,7 +84,7 @@ func (c *condition) Get(ctx context.Context) (*metav1.Condition, error) {

 // Set implements conditions.Set
 func (c *condition) Set(ctx context.Context, status metav1.ConditionStatus, option ...Option) error {
-	operatorCond := &apiv1.OperatorCondition{}
+	operatorCond := &apiv2.OperatorCondition{}
 	err := c.client.Get(ctx, c.namespacedName, operatorCond)
 	if err != nil {
 		return ErrNoOperatorCondition


Please consider returning the original error, or at least wrap it.

I support this change, but recommend doing so in a separate commit.

nunnatsa · 2021-07-06T15:07:54Z

conditions/conditions.go

@@ -69,12 +69,12 @@ func NewCondition(cl client.Client, condType apiv1.ConditionType) (Condition, er

 // Get implements conditions.Get
 func (c *condition) Get(ctx context.Context) (*metav1.Condition, error) {
-	operatorCond := &apiv1.OperatorCondition{}
+	operatorCond := &apiv2.OperatorCondition{}
 	err := c.client.Get(ctx, c.namespacedName, operatorCond)
 	if err != nil {
 		return nil, ErrNoOperatorCondition


Please consider returning the original error, or at least wrap it.

I support this change, but recommend doing so in a separate commit.

varshaprasad96

/lgtm
Thanks @awgreene !

varshaprasad96 · 2021-07-06T19:36:22Z

/approve

openshift-ci · 2021-07-06T19:36:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: varshaprasad96

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:

~~OWNERS~~ [varshaprasad96]

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

openshift-ci bot requested review from camilamacedo86 and shawn-hurley May 26, 2021 17:36

varshaprasad96 reviewed May 26, 2021

View reviewed changes

dinhxuanvu approved these changes May 26, 2021

View reviewed changes

openshift-ci bot assigned dinhxuanvu May 26, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 26, 2021

varshaprasad96 reviewed May 26, 2021

View reviewed changes

awgreene force-pushed the fix-operator-condition-lib branch from f89aaba to 180e696 Compare May 27, 2021 14:00

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label May 27, 2021

awgreene force-pushed the fix-operator-condition-lib branch from 180e696 to 3ae2713 Compare May 27, 2021 14:14

varshaprasad96 approved these changes May 27, 2021

View reviewed changes

openshift-ci bot assigned varshaprasad96 May 27, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 27, 2021

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 19, 2021

nunnatsa mentioned this pull request Jul 1, 2021

Report Upgradable OperatorCondition to OLM kubevirt/hyperconverged-cluster-operator#1414

Merged

11 tasks

Update condition lib to use v2

cc9d1af

The v2 OperatorCondition CRD was introduced to the operator-framework/api repository. This change updates the condition library to consume the new changes.

awgreene force-pushed the fix-operator-condition-lib branch from 3ae2713 to cc9d1af Compare July 6, 2021 14:36

openshift-ci bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 6, 2021

nunnatsa reviewed Jul 6, 2021

View reviewed changes

varshaprasad96 approved these changes Jul 6, 2021

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2021

openshift-merge-robot merged commit 5eea60d into operator-framework:main Jul 6, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update condition lib to use v2 #61

Update condition lib to use v2 #61

awgreene commented May 26, 2021

varshaprasad96 left a comment

awgreene commented May 26, 2021

dinhxuanvu left a comment

coveralls commented May 26, 2021 •

edited

Loading

estroz commented May 26, 2021

varshaprasad96 May 26, 2021 •

edited

Loading

dinhxuanvu May 27, 2021

awgreene commented May 26, 2021

varshaprasad96 commented May 27, 2021

estroz commented May 27, 2021 •

edited

Loading

dinhxuanvu commented May 27, 2021

estroz commented May 27, 2021

awgreene commented Jul 6, 2021

nunnatsa Jul 6, 2021

awgreene Jul 6, 2021

awgreene Jul 6, 2021

nunnatsa Jul 6, 2021

awgreene Jul 6, 2021

awgreene Jul 6, 2021

varshaprasad96 left a comment

varshaprasad96 commented Jul 6, 2021

openshift-ci bot commented Jul 6, 2021

Update condition lib to use v2 #61

Update condition lib to use v2 #61

Conversation

awgreene commented May 26, 2021

varshaprasad96 left a comment

Choose a reason for hiding this comment

awgreene commented May 26, 2021

dinhxuanvu left a comment

Choose a reason for hiding this comment

coveralls commented May 26, 2021 • edited Loading

Pull Request Test Coverage Report for Build 1004777565

💛 - Coveralls

estroz commented May 26, 2021

varshaprasad96 May 26, 2021 • edited Loading

Choose a reason for hiding this comment

dinhxuanvu May 27, 2021

Choose a reason for hiding this comment

awgreene commented May 26, 2021

varshaprasad96 commented May 27, 2021

estroz commented May 27, 2021 • edited Loading

dinhxuanvu commented May 27, 2021

estroz commented May 27, 2021

awgreene commented Jul 6, 2021

nunnatsa Jul 6, 2021

Choose a reason for hiding this comment

awgreene Jul 6, 2021

Choose a reason for hiding this comment

awgreene Jul 6, 2021

Choose a reason for hiding this comment

nunnatsa Jul 6, 2021

Choose a reason for hiding this comment

awgreene Jul 6, 2021

Choose a reason for hiding this comment

awgreene Jul 6, 2021

Choose a reason for hiding this comment

varshaprasad96 left a comment

Choose a reason for hiding this comment

varshaprasad96 commented Jul 6, 2021

openshift-ci bot commented Jul 6, 2021

coveralls commented May 26, 2021 •

edited

Loading

varshaprasad96 May 26, 2021 •

edited

Loading

estroz commented May 27, 2021 •

edited

Loading