Skuznets/bump vendor #581

stevekuznetsov · 2023-10-11T13:20:11Z

No description provided.

tmshort · 2023-10-11T23:47:20Z

/retest

tmshort · 2023-10-12T17:57:49Z

/retest

tmshort · 2023-10-14T04:25:48Z

/retest

perdasilva · 2023-10-16T11:56:37Z

/retest

tmshort · 2023-10-18T15:38:39Z

/retest

stevekuznetsov · 2023-10-18T15:39:42Z

 The staging/operator-registry has unsynced [go.mod,go.sum] changes
make[1]: *** [Makefile:160: verify-nested-vendor] Error 1

might be real. hm

tmshort · 2023-10-18T15:41:22Z

#585 pulls in from api, operator-registry and olm...

tmshort · 2023-10-18T15:43:44Z

Do you need to rebase?

tmshort · 2023-10-18T15:48:41Z

Yeah, I pulled down your PR, and it wants to make changes to staging/operator-registry/go.sum because of other changes to upstream with the CVE we're dealing with. Might want to incorporate #585.

stevekuznetsov · 2023-10-18T15:52:25Z

Had a bug in the bumper, fixed in #593

Won't re-base since the other PR has not merged yet

tmshort · 2023-10-18T17:14:54Z

/retest

tmshort · 2023-10-18T17:41:33Z

/retest

tmshort · 2023-10-18T18:40:07Z

/approve

openshift-ci · 2023-10-18T18:41:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stevekuznetsov, tmshort

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:

~~DOWNSTREAM_OWNERS~~ [tmshort]

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

tmshort · 2023-10-19T17:11:50Z

/retest

kevinrizza · 2023-10-19T22:26:52Z

/retest

dinhxuanvu · 2023-10-20T01:24:14Z

/hold

dinhxuanvu · 2023-10-20T01:25:36Z

I recommend pulling in this commit which should improve some of the failed test cases in this PR.

kuiwang02 · 2023-10-20T01:27:12Z

/label qe-approved

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 2c335915858e2691a9a6de67506f5e0c3b873838

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 51f59f647b410197843bff05734b8826d260149f

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 5d0a2c2dbe717cc8540ee91f80cd6ce0f119053d

The internal versions of the API Extensions client objects are what client calls get converted into for processing within the server. This mechanism allows many different clients to use many different outward-facing versions, while the code within the server only ever runs against one type. There is no utility to these types outside of the server, especially for code that's making client calls. We can simply use the client-facing types and not require coversion anywhere. Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 935fc47c13f21e505e1f52e82faeaccd70861425

Previously, these tests intedend to cause failing InstallPlans by not providiing the ServiceAccount on the OperatorGroup sufficient permissions. Due to unrelated reasons, we've had to make insufficient permissions not a terminal failure mode (the user may always add them in...). Now, we achieve failing InstallPlans by using invalid Kubernetes objects in the bundles. We also use the internal CatalogSource instead of hosting our catalog data in Quay, as this allows us to skip waiting for image pulls from the registry and keep our test data in version control. Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 060ce07e190e3a3cd84346ad80c000bfbb501dc8

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 7e8d77c641af514b24bee52490f5243e6a62559e

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: c9d87818065711f1b21b4c2cd68b97be9cdc23ec

On occasion, the subscription resource that needs to be updated is stale (even though we just got it), so get the subscription before updating. Should resolve: > Operation cannot be fulfilled on subscriptions.operators.coreos.com "mysubscription": the object has been modified; please apply your changes to the latest version and try again Signed-off-by: Todd Short <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: fbd6f95305bc736c5988945f88a631e77d49379d

stevekuznetsov · 2023-10-27T16:03:02Z

/retest

stevekuznetsov · 2023-10-27T18:22:40Z

/retest

dinhxuanvu · 2023-10-27T22:34:52Z

/retest

dinhxuanvu

/lgtm

openshift-ci-robot · 2023-10-28T03:02:20Z

/retest-required

Remaining retests: 0 against base HEAD d2d7c32 and 2 for PR HEAD 365f14b in total

stevekuznetsov · 2023-10-28T15:00:04Z

{  fail [github.com/openshift/origin/test/e2e/upgrade/upgrade.go:186]: during upgrade to registry.build03.ci.openshift.org/ci-op-rsk7x79h/release@sha256:1e87362d2b47f6193340b37ae97bc9b859f8c941c23fd681477270bd7107303e: Cluster did not complete upgrade: timed out waiting for the condition: Could not update prometheusrule "openshift-operator-lifecycle-manager/olm-alert-rules" (842 of 862): the object is invalid, possibly due to local cluster configuration
Ginkgo exit error 1: exit with code 1}

/retest

Did we mess up alerting rules somehow ... ?

stevekuznetsov · 2023-10-28T21:53:27Z

{  fail [github.com/openshift/origin/test/e2e/upgrade/upgrade.go:186]: during upgrade to registry.build03.ci.openshift.org/ci-op-rsk7x79h/release@sha256:26f463d7c52cc21df568b229de86541c3fa0fafacf05e5de68cc07d47b9096b0: Cluster did not complete upgrade: timed out waiting for the condition: Could not update prometheusrule "openshift-operator-lifecycle-manager/olm-alert-rules" (842 of 862): the object is invalid, possibly due to local cluster configuration

OK - yeah ... bona fide break. How!?!?

* remove defunct ref-style olm.bundle.object This commit removes a feature of FBC that has never actually been used in practice: the ability to reference a file in an olm.bundle.object property, where the path is relative to the directory in which the file containing the olm.bundle.object property exists. This was originally intended to be a way to avoid bloating the FBC, but it's presence has caused two problems: 1. It hinted that it would be okay for third-party properties and schemas to reference files in a similar way. 2. Because of (1), we have never really been able to make assumptions that would enable us to migrate and re-write FBC in a different hierarchy, which has been limiting. In short, it imposes a burden on catalog maintainers to keep a catalog in a filesystem structure that is imposed by the author of the catalog contribution. In practice, ref-style olm.bundle.object properties have never been used (as far as I'm aware), because no tooling has ever produced that style, and no one I have heard of is using other methods to render bundles into an FBC. Lastly, with the recent addition of the `olm.csv.metadata` property, the useful life of the `olm.bundle.object` property (which has always been alpha) is nearing an end. Signed-off-by: Joe Lanford <[email protected]> * migrate: support migration of FBC to latest preferred FBC This commit adds support for migrating FBC to the latest preferred FBC contents. Note that sqlite and bundle inputs are always rendered using the latest preferred FBC contents. The migrate command is updated to now support FBC images and directories as input (only sqlite was supported prior), such that the written output will always be migrated. The render command is updated with a `--migrate` flag that allows a caller to opt into migration during rendering. Under the hood, both of these subcommands use the action.Render struct, which has a new `Migrate` boolean field that callers can use to enable/disable the migration behavior. Signed-off-by: Joe Lanford <[email protected]> --------- Signed-off-by: Joe Lanford <[email protected]> Upstream-repository: operator-registry Upstream-commit: 5e3fa99bfd024d4c73a29456e68f1cb9bc4e4504

It seems like using the same field manager for two distinct fields leads to the label set oscillating between the two states instead of converging to the union of both requests. Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: fcbb7fed9043d2df1061ee33f80aa383a262f24a Signed-off-by: Steve Kuznetsov <[email protected]>

Signed-off-by: Steve Kuznetsov <[email protected]>

openshift-ci · 2023-10-29T00:51:14Z

@stevekuznetsov: all tests passed!

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.

joelanford · 2023-10-30T13:04:14Z

/lgtm

openshift-ci bot requested review from dinhxuanvu and ncdc October 11, 2023 13:25

stevekuznetsov mentioned this pull request Oct 11, 2023

OPRUN-3130: use content extraction in default catalog sources operator-framework/operator-marketplace#540

Merged

tmshort mentioned this pull request Oct 11, 2023

WIP: Sync 2023 10 05 steve #577

Closed

stevekuznetsov force-pushed the skuznets/bump-vendor branch from c7617fe to 0f1528e Compare October 18, 2023 15:48

tmshort mentioned this pull request Oct 18, 2023

OCPBUGS-20503: Bump golang.org/x/net from 0.10.0 to 0.17.0 #585

Merged

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 20, 2023

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Oct 20, 2023

tmshort mentioned this pull request Oct 20, 2023

Downstream sync #594

Closed

stevekuznetsov force-pushed the skuznets/bump-vendor branch from f9bb668 to 10245b9 Compare October 20, 2023 14:14

stevekuznetsov and others added 8 commits October 26, 2023 08:29

grpc: update correctness check

58230e3

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 2c335915858e2691a9a6de67506f5e0c3b873838

labeller: update expected cast value

8215896

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 51f59f647b410197843bff05734b8826d260149f

test/e2e: retry a mutating call

83f6a2e

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 5d0a2c2dbe717cc8540ee91f80cd6ce0f119053d

controller: add more logging to labelling

1df89f3

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 7e8d77c641af514b24bee52490f5243e6a62559e

labeller: add a field manager

86c2c2f

Signed-off-by: Steve Kuznetsov <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: c9d87818065711f1b21b4c2cd68b97be9cdc23ec

stevekuznetsov force-pushed the skuznets/bump-vendor branch 3 times, most recently from 5014d40 to 365f14b Compare October 27, 2023 13:02

dinhxuanvu reviewed Oct 27, 2023

View reviewed changes

openshift-ci bot assigned dinhxuanvu Oct 27, 2023

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

joelanford and others added 3 commits October 28, 2023 15:56

[CARRY] csv_namespace_labeller: update for upstream changes

c51db58

Signed-off-by: Steve Kuznetsov <[email protected]>

stevekuznetsov force-pushed the skuznets/bump-vendor branch from 365f14b to c51db58 Compare October 28, 2023 21:56

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 28, 2023

openshift-ci bot assigned joelanford Oct 30, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 30, 2023

openshift-ci bot merged commit 57e26f0 into openshift:master Oct 30, 2023

Skuznets/bump vendor #581

Skuznets/bump vendor #581

Uh oh!

Conversation

stevekuznetsov commented Oct 11, 2023

Uh oh!

tmshort commented Oct 11, 2023

Uh oh!

tmshort commented Oct 12, 2023

Uh oh!

tmshort commented Oct 14, 2023

Uh oh!

perdasilva commented Oct 16, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

stevekuznetsov commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

stevekuznetsov commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

tmshort commented Oct 18, 2023

Uh oh!

openshift-ci bot commented Oct 18, 2023

Uh oh!

tmshort commented Oct 19, 2023

Uh oh!

kevinrizza commented Oct 19, 2023

Uh oh!

dinhxuanvu commented Oct 20, 2023

Uh oh!

dinhxuanvu commented Oct 20, 2023

Uh oh!

kuiwang02 commented Oct 20, 2023

Uh oh!

stevekuznetsov commented Oct 27, 2023

Uh oh!

stevekuznetsov commented Oct 27, 2023

Uh oh!

dinhxuanvu commented Oct 27, 2023

Uh oh!

dinhxuanvu left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Oct 28, 2023

Uh oh!

stevekuznetsov commented Oct 28, 2023

Uh oh!

stevekuznetsov commented Oct 28, 2023

Uh oh!

openshift-ci bot commented Oct 29, 2023

Uh oh!

joelanford commented Oct 30, 2023

Uh oh!

Uh oh!