Skip to content

OPRUN-2913: Sync 2023 07 11 #507

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

Closed
wants to merge 93 commits into from
Closed

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Jul 11, 2023

No description provided.

tmshort and others added 30 commits July 11, 2023 11:00
Signed-off-by: Todd Short <[email protected]>
Get the current OpenShift release version from the RELEASE_VERSION
environment variable since the behavior of the original source --
the ClusterVersion desired release status field -- has changed.

Signed-off-by: Tyler Slaton <[email protected]>
Co-authored-by: Nick Hale <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b2086bd2c5eb9b60370869757c51fa7908d2cde0
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c312b41e3079b5cb1672120046b376f50cb4246f
Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8a56bcc6e3f9b9e25cbbc003ef17c710622771fa
$ kubectl -n local get deployments
No resources found in local namespace.

$ kubectl -n olm get deployments
NAME               READY   UP-TO-DATE   AVAILABLE   AGE
catalog-operator   1/1     1            1           6m11s
olm-operator       1/1     1            1           10m
packageserver      1/1     1            1           10m

Signed-off-by: Brett Tofel <[email protected]>

Signed-off-by: Brett Tofel <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 665c25b3c42126b896791d8af9589fab2948080d
)

* opm serve: use pre-existing cache, if set and up-to-date

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

* refactor to leave NewQuerier function untouched

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

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 494b68e62a814a891821aeb2bd28f33abc1624ff
…shift#255)

If the bundle is not present, the current bundleLoader will panic
when it gets to addChannelsFromAnnotationsFile. If the bundle is
nil, addChannelsFromAnnotationsFile should not attempt to do anything
so instead it just returns now.

Signed-off-by: Brad P. Crochet <[email protected]>

Signed-off-by: Brad P. Crochet <[email protected]>
Upstream-repository: api
Upstream-commit: 5f99430d4ec47d59daafa3b818229f0466531dea
Signed-off-by: Jordan <[email protected]>

Signed-off-by: Jordan <[email protected]>
Upstream-repository: api
Upstream-commit: 7339a22050af53df7b6f97a652b8e2d73698765a
Signed-off-by: Tyler Slaton <[email protected]>

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: bd97e32644f5a6c5a2b87668df5261a4da62a2a6
This reverts commit bd97e32644f5a6c5a2b87668df5261a4da62a2a6.

An older v0.17.0 release of operator-framework/api had the spec.RunAsRoot
field, which has [now been updated to be the spec.GrpcPodConfig.SecurityContextConfig
field](operator-framework/api#261). Reverting #2848 so that
the new v0.17.0 can be pulled in. See [this comment](operator-framework/operator-lifecycle-manager#2848 (comment)) for more info.

Signed-off-by: Anik Bhattacharjee <[email protected]>

Signed-off-by: Anik Bhattacharjee <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: bfeb1e46819bc840190f4d7d0720712683387973
updated

format

defs

Upstream-repository: api
Upstream-commit: ff2dbc53d3817df9b62a83dbe83cb221e7c043f4
Signed-off-by: Jordan Keister <[email protected]>

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: bd3c80489dbf6942005c345a33733fb782e952fe
Signed-off-by: Austin Macdonald <[email protected]>

Signed-off-by: Austin Macdonald <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 6d762ada58dfd90f41cc002d8f34c01811312f6f
…nshift#262)

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: 72295edd2bb11d414a1db6d6643fe3f3918c5ae4
…enshift#264)

Signed-off-by: timflannagan <[email protected]>

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
Signed-off-by: timflannagan <[email protected]>
Upstream-repository: api
Upstream-commit: 4d4ed5a299506cab8898036a873031e6faa4b0fd
This PR upgrades the version of yq used in the makefile from
v3@latest to [email protected]

Upstream-repository: api
Upstream-commit: b527a19c8e14e2249d5a5cdb88063cfb136fdafb
The GOARCH flag was hardcoded to "386", which causes the binaries to not
work properly on machines with arm64 arch. This PR dynamically sets the
GOARCH flag to arm64 if the machine arch is arm64, or to 386 for all other
arch.

Signed-off-by: anik120 <[email protected]>

Signed-off-by: anik120 <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a8edd5c05a1dbeba19b80110b2d4df50ffb96c4c
Signed-off-by: jcho02 <[email protected]>

Signed-off-by: jcho02 <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0271e7847d0b71cd969a2426f5532a4cb1cddd40
* 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
joelanford and others added 20 commits July 11, 2023 13:23
* add WalkMetasFS and WalkMetasReader functions

These function are like WalkFS except that callers provide a function
that handles a Meta object at a time, rather than an entire file's worth
of FBC objects.

For callers that can operate on a single meta at a time, these functions
will provide significant reductions in memory usage.

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

* address PR feedback

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

---------

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: e1eebae2130c3987eeff7dc9f69672b41dd0ba78
…e otherwise identical (#1095)

* minorly-kludgy approach, but functional

Signed-off-by: Jordan Keister <[email protected]>

* review comments

Signed-off-by: Jordan Keister <[email protected]>

* retool flag checks and defaulting

Signed-off-by: Jordan Keister <[email protected]>

* more review updates

Signed-off-by: Jordan Keister <[email protected]>

---------

Signed-off-by: Jordan Keister <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 7629c6f991fc8dcce91bcb5ee4e998678bbd7779
Bumps [github.com/docker/distribution](https://github.com/docker/distribution) from 2.8.1+incompatible to 2.8.2+incompatible.
- [Release notes](https://github.com/docker/distribution/releases)
- [Commits](distribution/distribution@v2.8.1...v2.8.2)

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 931895b1527ab214b6f637a7eec35cf999043094

---
updated-dependencies:
- dependency-name: github.com/docker/distribution
  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: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3ee218bf87370ec3afa3e53798f8b447d909316a
…942)

* Changes how `InstallPlan`s are being created

Prevent OLM from creating `InstallPlan`s when bundle unpack fails

Signed-off-by: Mikalai Radchuk <[email protected]>

* Updates unit tests for syncResolvingNamespace

Tests now include handling of unpacking errors

Signed-off-by: Mikalai Radchuk <[email protected]>

* Renames test data files

Signed-off-by: Mikalai Radchuk <[email protected]>

* Updates E2E tests

Changes required to account for a new flow where we
prevent `InstallPlan` from being created when unpack
job fails

Signed-off-by: Mikalai Radchuk <[email protected]>

---------

Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c29863bbecf0d84bd94166a6d062e8e9dc88cab9
* render: improve olm.bundle.object rendering for bundles

When rendering individual bundles, only generate olm.bundle.object
properties for the CSV if there is an image reference for the bundle.

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

* render: improve olm.bundle.object rendering for sqlite dbs

When rendering sqlite-based catalogs, only generate olm.bundle.object
properties for the CSV if there is an image reference for the bundle.

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

* introduce benchmark for declcfg.LoadFS

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

* concurrent LoadFS

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

* add olm.csv.metadata property

1. When rendering sqlite DBs and bundle images, generate an
   "olm.csv.metadata" property instead of a full CSV (so long as
   there is a bundle image reference associated with the corresponding
   bundle)
2. When serving the GRPC interface and a full CSV is not present in an
   "olm.bundle.object" property, generate a CSV from (a) the
   "olm.csv.metadata" property. Also include the bundle's related
   images, and the package's icon, if defined. If there is no
   description in the CSV metadata, also include the package's
   description in the generated CSV.

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

* Meta: more correct handling of HTML-unescaping

It turns out that straight byte-based replacements of unicode escape
characters back to their ascii representations is invalid if the unicode
escape character itself is escaped (e.g. "\u003c" => "\\u003c" => "\<").

To solve this, we will instead unmarshal Meta objects to
map[string]interface{}, extract the expected Meta fields from the map,
and then use a JSON encoder with SetEscapeHTML(false) to re-encode the
map back to JSON to be stored in Meta.Blob.

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

* updated LoadFS benchmark to use csv metadata properties instead of olm.bundle.object properties

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

---------

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 2ee231b3235cb38aeb045845627a7d7ffb98d1b4
Signed-off-by: Jordan <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: b51aaf05bdafdc91e69c5e2a8c26097bf9ebbb1a
* *: thread through context into FBC load

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

* declcfg/load: allow configuring the parallelism

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

---------

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 647537d941108ed88e47b559eb98d134967444ad
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 6c602841934d6e154e38c0574cc140471dc063e6
Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 08a95add7638746f205784b6f82c87983319151e
Signed-off-by: Adam D. Cornett <[email protected]>
Upstream-repository: api
Upstream-commit: aa3e49803e7bc8fa723077988abad399159abb22
Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 337b60ddc37d4cf3f8a8d8c00df7a76c55a5e12d
Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: b854557bd44020f46383e0f5d483bf56c297aaf7
* Bump k8s.io/client-go from v0.26.1 to v0.27.1

Signed-off-by: Edmund Ochieng <[email protected]>

* Bump controller-runtime version from v0.14.4 to v0.15.0

Signed-off-by: Edmund Ochieng <[email protected]>

---------

Signed-off-by: Edmund Ochieng <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 43225def6de9c8fd7f8342c822c210911a872d5a
Signed-off-by: Matt Bargenquast <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 12217d13efec647e91dd3279725432e39cd4a828
Signed-off-by: Mikalai Radchuk <[email protected]>
Upstream-repository: api
Upstream-commit: bbac5028af81cc0cb4604f4a4b2283d225828cbe
Remove executable bits from file creation

Signed-off-by: Rami <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: bf549304d8810c55d0953310bd47ad6a489e5379
When the api server is flakey (e.g. during a cluster install), it is
possible for some of the OLM initialization to fail. When this happens,
OLM gets into a bad state (e.g. a monitoring go routine terminates)
and can't recover without a restart.

There were at least two places I found where a retry mechanism is
needed to handle intialization errors. This was as far as I peeled the
onion. It's not an exponential backoff retry, but a 1 minute retry
interval should be sufficient (no other backoffs are exponential).

The ServerVersion only retries once with a minute in between. This
required fixing a unit-test to take the retry into account.

Signed-off-by: Todd Short <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e908cfc6b6455357d8191d541062237acdca67b1
Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: fa1b4567c292c14d489c11e6f408ebc93ffe8b5c
* Update operator framework api dependency

Signed-off-by: James Hewitt <[email protected]>

* Add affinity customization to catalog source grpc pods

Signed-off-by: James Hewitt <[email protected]>

---------

Signed-off-by: James Hewitt <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: f8b17215eac820f86c9156e8d98d7bf6a5077b6b
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 11, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 11, 2023

@tmshort: This pull request references OPRUN-2913 which is a valid jira issue.

In response to this:

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 openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 11, 2023

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 11, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tmshort
Once this PR has been reviewed and has the lgtm label, please assign perdasilva for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jul 11, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 11, 2023

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

  • akihikokuroda
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • asmacdo
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • exdx
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
  • njhale
    • User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
    • staging/operator-registry/OWNERS

@tmshort
Copy link
Contributor Author

tmshort commented Jul 17, 2023

Closing in favor of #510

@tmshort tmshort closed this Jul 17, 2023
@tmshort tmshort deleted the sync-2023-07-11 branch October 23, 2023 13:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.
Projects
None yet
Development

Successfully merging this pull request may close these issues.