Bug 1908471: Bump deps k8s 1.20 #1903

awgreene · 2020-12-10T19:04:53Z

No description provided.

openshift-ci-robot · 2020-12-10T19:04:57Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

test/e2e/go.mod

pkg/controller/registry/resolver/operators_test.go

awgreene · 2020-12-16T19:03:23Z

/retest

awgreene · 2020-12-16T19:15:20Z

/retest

cmd/olm/manager.go

openshift-ci-robot · 2020-12-16T20:05:51Z

@awgreene: This pull request references Bugzilla bug 1908471, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.7.0) matches configured target release for branch (4.7.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1908471: Bump deps k8s 1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

awgreene · 2020-12-16T21:46:17Z

/retest

awgreene · 2020-12-17T14:49:38Z

/retest

awgreene · 2020-12-17T16:43:41Z

/retest

awgreene · 2020-12-17T18:23:42Z

/retest

openshift-bot · 2020-12-19T22:58:30Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-12-19T23:11:31Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2020-12-19T23:24:30Z

/retest

Please review the full test history for this PR and help us cut down flakes.

awgreene · 2020-12-20T01:39:27Z

/retest

awgreene · 2020-12-21T14:19:57Z

/retest

awgreene · 2020-12-21T16:37:20Z

/retest

aws console tests were failing due to a community-operators catalog source that was released with limited operators within.

dinhxuanvu

/lgtm

openshift-merge-robot · 2020-12-21T17:05:49Z

@awgreene: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-console-olm	`8a31e33`	link	`/test e2e-aws-console-olm`
ci/prow/e2e-aws-olm	`8a31e33`	link	`/test e2e-aws-olm`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2020-12-21T17:07:43Z

/retest

Please review the full test history for this PR and help us cut down flakes.

This commit introduces a few changes to the e2e test suite: 1. It reduces the failure rate of the CSV e2e test by allowing the operator to reach a succeeded install before searching for resources. 2. An installplan e2e test was failing a diff check against two installplans because the operator controller was applying a component label to one of the installplans. An update was made to still compare the spec and status of the two installplans but ignores other fields. 3. A test that ensures OLM elevates scoped permissions to cluster levels when the CSV is installed in a global OperatorGroup was not elevating them because all of the permissions defined in the role were already provided by a clusterrole defined in the csv. The test was sped up significantly by making the rules defined in the CSV's spec.Permissions field different from those defined in the spec.ClusterPermissions field. 4. The newCSV function was returning a CSV with an incorrect GVK, causing garbage collection to fail. The newCSV function now sets the GVK correctly.

njhale · 2020-12-22T15:42:17Z

go.mod

 	// pinned because no tag supports 1.18 yet
-	// pinned because no tag supports 1.18 yet
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.1-0.20200414221803-bac7e8aaf90a
 	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06


Is this still true? Do we still need to pin structured-merge-diff for 1.20?

njhale · 2020-12-22T15:43:33Z

go.mod

 	sigs.k8s.io/kind v0.7.0
 )

 replace (
-	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
-	github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
+	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1

 	// controller runtime
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5


Can we bump our openshift dependencies to a newer release?

pkg/controller/operators/adoption_controller.go

njhale · 2020-12-22T16:04:24Z

pkg/controller/operators/adoption_controller.go

@@ -335,7 +344,11 @@ func (r *AdoptionReconciler) adoptees(ctx context.Context, operator decorators.O
 	}
 	opt := client.MatchingLabelsSelector{Selector: selector}
 	for _, list := range componentLists {
-		if err := r.List(ctx, list, opt); err != nil {
+		cList, ok := list.(client.ObjectList)


Can componentLists just be of type []client.Object from the get-go?

test/e2e/csv_e2e_test.go

test/e2e/installplan_e2e_test.go

njhale · 2020-12-22T18:00:42Z

test/e2e/installplan_e2e_test.go

@@ -2206,6 +2212,7 @@ var _ = Describe("Install Plan", func() {
 					}
 					return true, nil
 				})
+				require.NoError(GinkgoT(), err)


Might as well switch over to Eventually here as well, no?

test/e2e/installplan_e2e_test.go

njhale · 2020-12-22T18:14:44Z

Looking really good. I think we can punt changing function signatures to use controller-runtime's Object interface and address it a follow up, which only leaves the go.mod related comments to address.

njhale · 2020-12-22T18:50:25Z

/lgtm

openshift-ci-robot · 2020-12-22T19:01:13Z

@awgreene: All pull requests linked via external trackers have merged:

operator-framework/operator-lifecycle-manager#1903

Bugzilla bug 1908471 has been moved to the MODIFIED state.

In response to this:

Bug 1908471: Bump deps k8s 1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 10, 2020

openshift-ci-robot requested review from gallettilance and njhale December 10, 2020 19:05

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 10, 2020

kevinrizza reviewed Dec 10, 2020

View reviewed changes

test/e2e/go.mod Outdated Show resolved Hide resolved

awgreene force-pushed the bump-deps-k8s-1.20 branch 5 times, most recently from 1012fc1 to 84fe552 Compare December 16, 2020 15:23

awgreene marked this pull request as ready for review December 16, 2020 15:27

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 16, 2020

awgreene force-pushed the bump-deps-k8s-1.20 branch from 84fe552 to 641aa1c Compare December 16, 2020 16:42

ecordell reviewed Dec 16, 2020

View reviewed changes

pkg/controller/registry/resolver/operators_test.go Outdated Show resolved Hide resolved

kevinrizza reviewed Dec 16, 2020

View reviewed changes

cmd/olm/manager.go Show resolved Hide resolved

awgreene changed the title ~~Bump deps k8s 1.20~~ Bug 1908471: Bump deps k8s 1.20 Dec 16, 2020

openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Dec 16, 2020

awgreene force-pushed the bump-deps-k8s-1.20 branch from 224a83e to 9de2b4f Compare December 16, 2020 20:45

dinhxuanvu mentioned this pull request Dec 16, 2020

Bug 1907792: Change the OperatorUpgradeable condition to Upgradeable #1911

Merged

5 tasks

awgreene force-pushed the bump-deps-k8s-1.20 branch 2 times, most recently from b7d285b to 11ad61a Compare December 17, 2020 13:28

Update manifests

e2b51e2

awgreene force-pushed the bump-deps-k8s-1.20 branch from 65072b7 to 8a31e33 Compare December 19, 2020 23:25

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 19, 2020

dinhxuanvu reviewed Dec 21, 2020

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2020

awgreene force-pushed the bump-deps-k8s-1.20 branch from 8a31e33 to 0e94fad Compare December 21, 2020 17:41

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2020

awgreene force-pushed the bump-deps-k8s-1.20 branch 5 times, most recently from 1da7d66 to 43c95c4 Compare December 22, 2020 00:38

awgreene force-pushed the bump-deps-k8s-1.20 branch from 43c95c4 to 3a08055 Compare December 22, 2020 16:07

njhale reviewed Dec 22, 2020

View reviewed changes

openshift-ci-robot assigned njhale Dec 22, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 22, 2020

openshift-merge-robot merged commit 72d0608 into operator-framework:master Dec 22, 2020

jianzhangbjz mentioned this pull request Dec 23, 2020

[RFE] Bump OLM components to k8s 1.20 #1785

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1908471: Bump deps k8s 1.20 #1903

Bug 1908471: Bump deps k8s 1.20 #1903

awgreene commented Dec 10, 2020

openshift-ci-robot commented Dec 10, 2020

awgreene commented Dec 16, 2020

awgreene commented Dec 16, 2020

openshift-ci-robot commented Dec 16, 2020

awgreene commented Dec 16, 2020

awgreene commented Dec 17, 2020

awgreene commented Dec 17, 2020

awgreene commented Dec 17, 2020

openshift-bot commented Dec 19, 2020

openshift-bot commented Dec 19, 2020

openshift-bot commented Dec 19, 2020

awgreene commented Dec 20, 2020

awgreene commented Dec 21, 2020

awgreene commented Dec 21, 2020 •

edited

dinhxuanvu left a comment

openshift-merge-robot commented Dec 21, 2020

openshift-bot commented Dec 21, 2020

njhale Dec 22, 2020

njhale Dec 22, 2020

njhale Dec 22, 2020

njhale Dec 22, 2020

njhale commented Dec 22, 2020 •

edited

njhale commented Dec 22, 2020

openshift-ci-robot commented Dec 22, 2020

Bug 1908471: Bump deps k8s 1.20 #1903

Bug 1908471: Bump deps k8s 1.20 #1903

Conversation

awgreene commented Dec 10, 2020

openshift-ci-robot commented Dec 10, 2020

awgreene commented Dec 16, 2020

awgreene commented Dec 16, 2020

openshift-ci-robot commented Dec 16, 2020

awgreene commented Dec 16, 2020

awgreene commented Dec 17, 2020

awgreene commented Dec 17, 2020

awgreene commented Dec 17, 2020

openshift-bot commented Dec 19, 2020

openshift-bot commented Dec 19, 2020

openshift-bot commented Dec 19, 2020

awgreene commented Dec 20, 2020

awgreene commented Dec 21, 2020

awgreene commented Dec 21, 2020 • edited

dinhxuanvu left a comment

Choose a reason for hiding this comment

openshift-merge-robot commented Dec 21, 2020

openshift-bot commented Dec 21, 2020

njhale Dec 22, 2020

Choose a reason for hiding this comment

njhale Dec 22, 2020

Choose a reason for hiding this comment

njhale Dec 22, 2020

Choose a reason for hiding this comment

njhale Dec 22, 2020

Choose a reason for hiding this comment

njhale commented Dec 22, 2020 • edited

njhale commented Dec 22, 2020

openshift-ci-robot commented Dec 22, 2020

awgreene commented Dec 21, 2020 •

edited

njhale commented Dec 22, 2020 •

edited