Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick of bump golang-migrate to v4.16.1 (#1107) #584

Closed
wants to merge 324 commits into from

Conversation

grokspawn
Copy link
Contributor

Also bumps github.com/docker/docker to v20.10.24+incompatible to address CVE CVE-2023-28842

everettraven and others added 30 commits July 20, 2023 18:58
* update k8s 1.25 validation logic

to look for deprecated k8s APIs in various CSV fields

Signed-off-by: Bryce Palmer <[email protected]>

* update validation logic

Signed-off-by: Bryce Palmer <[email protected]>

* remove debug statements

Signed-off-by: Bryce Palmer <[email protected]>

Signed-off-by: Bryce Palmer <[email protected]>
Upstream-repository: api
Upstream-commit: b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4
This commit adds dtfranz and asmacdo to the list of reviewers.

Signed-off-by: Alexander Greene <[email protected]>

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8da652259088cd47fec92ebc5332119c8c608e55
Problem: There are instances where a user may wish to skip multiple
e2e tests.

Solution: Allow users to specify multple tests to skip in the e2e
suite by setting multiple test names separated by the semicolon (;)
symbol.`

Signed-off-by: Alexander Greene <[email protected]>

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6cfd86cfd5c91c6b5232fb99a623c1fa5d63edbc
This reverts commit 6cfd86cfd5c91c6b5232fb99a623c1fa5d63edbc, which is
not necessary because the ginkgo run --skip flag supports regex.

Signed-off-by: Alexander Greene <[email protected]>

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 80b914d208fbdad8abf3cb1a172b079848d0b041
Signed-off-by: Jordan Keister <[email protected]>

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 89594183c5c9ea38c183d2f38c2644dba0f37024
…e (#1043)

Signed-off-by: Joe Lanford <[email protected]>

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0080ea0a938fdb91662a6ca36387aa71d3a52b28
Signed-off-by: timflannagan <[email protected]>

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6ffec4d5a1c3245a5302a5ca02deebd1af543e7f
Signed-off-by: Jordan Keister <[email protected]>

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: api
Upstream-commit: 028731a4f915f3a843634554ccc21d78b1d89859
* Bump github.com/containerd/containerd to 1.6.10

Signed-off-by: Christoph Blecker <[email protected]>

* Vendor dependencies

Signed-off-by: Christoph Blecker <[email protected]>

Signed-off-by: Christoph Blecker <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: afbb6091f81059d09e11d5163591c773bce15c61
* Fix flaky TestResolver unit test

Signed-off-by: Christoph Blecker <[email protected]>

* Fix flaky TestUpdates unit test

Signed-off-by: Christoph Blecker <[email protected]>

Signed-off-by: Christoph Blecker <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4da774fdf1c1d64c2fbc8dafd8b55878312ed962
…ng a warning (openshift#274)

* fix a bug in k8s 1.25 validation logic

to now check the apiGroup/resource to determine if an api is deprecated.

Signed-off-by: Bryce Palmer <[email protected]>

* update warning and error checks to use a map

Signed-off-by: Bryce Palmer <[email protected]>

Signed-off-by: Bryce Palmer <[email protected]>
Upstream-repository: api
Upstream-commit: f1b729684854a053f229464eb327527222188fd1
Problem: The helm template that defines the community catalogSource
hasn't been updated to run the catalogSource in the restricted mode,
causing the associated pod not to run.

Solution: Update the helm template to configure the community
catalogSource in restricted mode.

Signed-off-by: Alexander Greene <[email protected]>

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6c564a670c94c50a9270bb5338a0e32a3e11496f
Signed-off-by: Joe Lanford <[email protected]>

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: b7307b57c5f67b296098e66bfe38458e762c99aa
Signed-off-by: Ruben Simons <[email protected]>

Signed-off-by: Ruben Simons <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e29776daa392f365cb685d8a04082a3cf1fbc20c
Bumps the fedora version up to 37.

Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 231e9224fbbc651ec5565a0f2641a6a4588ad3c9
Signed-off-by: Rashmi Gottipati <[email protected]>
Upstream-repository: api
Upstream-commit: 33c4ea4b43293e9535536754f35244d7e376a02e
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.3.7...v0.3.8)

Upstream-repository: api
Upstream-commit: e8bb2e01756424cd3de5ec8521ef370623459cae

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.3.7...v0.3.8)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1fed5afe46bf1fe929a115af391eac12169d6d5c

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
… (#2929)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20220909164309-bea034e7d591 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](https://github.com/golang/net/commits/v0.7.0)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 639a7d81090025edc71f81746d4ea211d03ce44a

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.10 to 1.6.18.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.6.10...v1.6.18)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: c6af0be363f1cda4d589cc65f763ef466bef93ef

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: perdasilva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 41d3973f8c9b96086806a05d8433f313d16c5074
* Bump k8s dependencies to 1.26

Signed-off-by: Rashmi Gottipati <[email protected]>

* Attempting to fix sanity test

Signed-off-by: Rashmi Gottipati <[email protected]>

---------

Signed-off-by: Rashmi Gottipati <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: fe5123023244fb997e00d831dee10eaf4d8b5fc0
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.4.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.4.0...v0.7.0)

Upstream-repository: operator-registry
Upstream-commit: 0dff010522f4639d0a6089fdded19b595832f452

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: perdasilva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 783bebf6d4811c0b36eabaa5e58a05a000a1dbfc
…dout (#1056)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 3bfcb23fa7d0523ad187ef2cbb396dcc1fcba5df
Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 46343173531038d67a80f2ee391396b6ab96149c
This commit updates the goreleaser github action to install QMEU to
support emulation of multiple architectures.

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: dac8182eb62acc1cb489d17ccc34f243f43d4f94
Signed-off-by: James Hewitt <[email protected]>
Upstream-repository: api
Upstream-commit: 45ebd8b29d3fe6a83818c3f837c5b8e5437e6e4b
* Update Helm to v3.11.1

Updatate go.mod, go.sum, and vendor directory.

Signed-off-by: Todd Short <[email protected]>

* Run go fmt

Plus some manual edits.

Signed-off-by: Todd Short <[email protected]>

* Update from make verify

Signed-off-by: Todd Short <[email protected]>

* Fix golangci-lint issues

Signed-off-by: Todd Short <[email protected]>

* Client updates due to controller-runtime

Status is now updated using SubResource methods and options

Signed-off-by: Todd Short <[email protected]>

---------

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b54296a21f388a40eab7c1278e43b2eb866d95ee
Sets the marketplace pod's ownerreference to have `controller: true` to remove need for forceful node drain.

Signed-off-by: Daniel Franz <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e5da837f925a2e1caa5594b448ebf14d88dca786
stevekuznetsov and others added 27 commits October 26, 2023 08:05
That also starts LIST + WATCH calls and needs labelling ... sigh.

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: f7ed5b198eca371819b7db727a54a9fca78b2465
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 69d0fa36acb87dad3add9afe094e5aaa78b4b616
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a476dc0f5053a1f777828ff3bb53d37634df86d5
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: f84ac84e7318cb52d1affc67afb20946c02c599a
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1d1ab6fdce0c8c0eb8ccde7f6fa94623002706ec
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7ef3712dae367a3d9e2ca3c05c7a175711eee975
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3aa08f8693ab6f1bb2a39f3dae8d5d5e54207dd2
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 30f2150cd5598ff1d9e5a6692a70cc56116dab29
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 03302ffed096ccaf553716ac18bb1bcd4f388c87
Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6f751b7d6bb44512a5bb5f403decfe200cd86396
The issue for this is open for years and it's not super interesting to
go debug it. The test threads will exit when the test process does.
Having teardown fail means none of the other tests run for me.

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: d63949c57491fba16c0ef8c7038dfb0b2f605c3a
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
…issing-cmmits

scripts/bumper: only marshal missing commits
* 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]>
NO-ISSUE: Update downstreaming documentation.
Copy link
Contributor

openshift-ci bot commented Nov 2, 2023

@grokspawn: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm 6137eb2 link true /test e2e-gcp-olm
ci/prow/unit-registry 6137eb2 link true /test unit-registry
ci/prow/e2e-gcp-olm-flaky 6137eb2 link false /test e2e-gcp-olm-flaky
ci/prow/unit-api 6137eb2 link true /test unit-api
ci/prow/unit-olm 6137eb2 link true /test unit-olm
ci/prow/unit-psm 6137eb2 link true /test unit-psm
ci/prow/e2e-gcp-console-olm 6137eb2 link true /test e2e-gcp-console-olm
ci/prow/images 6137eb2 link true /test images
ci/prow/verify 6137eb2 link true /test verify
ci/prow/e2e-upgrade 6137eb2 link true /test e2e-upgrade
ci/prow/e2e-gcp-ovn 6137eb2 link true /test e2e-gcp-ovn

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.

@grokspawn grokspawn closed this Nov 2, 2023
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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.
Projects
None yet
Development

Successfully merging this pull request may close these issues.