Skip to content

Sync 0307#465

Closed
perdasilva wants to merge 45 commits intoopenshift:masterfrom
perdasilva:sync_0307
Closed

Sync 0307#465
perdasilva wants to merge 45 commits intoopenshift:masterfrom
perdasilva:sync_0307

Conversation

@perdasilva
Copy link
Copy Markdown
Contributor

No description provided.

rashmigottipati and others added 9 commits March 7, 2023 09:59
…ring (openshift#1063)

* exclude bundles with `olm.deprecated` property when rendering

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>

* Exclude bundles based on the property type and not value

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>

---------

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 0aeffa3f44f5e36bd2c0bcc63a94eda000a5f257
…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 <brad@redhat.com>

Signed-off-by: Brad P. Crochet <brad@redhat.com>
Upstream-repository: api
Upstream-commit: 5f99430d4ec47d59daafa3b818229f0466531dea
Signed-off-by: Jordan <jordan@nimblewidget.com>

Signed-off-by: Jordan <jordan@nimblewidget.com>
Upstream-repository: api
Upstream-commit: 7339a22050af53df7b6f97a652b8e2d73698765a
updated

format

defs

Upstream-repository: api
Upstream-commit: ff2dbc53d3817df9b62a83dbe83cb221e7c043f4
…nshift#262)

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: 72295edd2bb11d414a1db6d6643fe3f3918c5ae4
…enshift#264)

Signed-off-by: timflannagan <timflannagan@gmail.com>

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: 4d4ed5a299506cab8898036a873031e6faa4b0fd
This PR upgrades the version of yq used in the makefile from
v3@latest to v4@v4.28.1

Upstream-repository: api
Upstream-commit: b527a19c8e14e2249d5a5cdb88063cfb136fdafb
* update k8s 1.25 validation logic

to look for deprecated k8s APIs in various CSV fields

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update validation logic

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* remove debug statements

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Upstream-repository: api
Upstream-commit: b611f6cef49cb8c6d621145c4e31d8ddfd4c59f4
@openshift-ci openshift-ci Bot requested review from ankitathomas and awgreene March 7, 2023 10:32
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: perdasilva

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels Mar 7, 2023
@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

everettraven and others added 15 commits March 7, 2023 15:02
…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 <bpalmer@redhat.com>

* update warning and error checks to use a map

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Upstream-repository: api
Upstream-commit: f1b729684854a053f229464eb327527222188fd1
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] <support@github.com>
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 <tyslaton@redhat.com>
Co-authored-by: Nick Hale <njohnhale@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b2086bd2c5eb9b60370869757c51fa7908d2cde0
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c312b41e3079b5cb1672120046b376f50cb4246f
$ 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 <btofel@redhat.com>

Signed-off-by: Brett Tofel <btofel@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 665c25b3c42126b896791d8af9589fab2948080d
Signed-off-by: Tyler Slaton <tyslaton@redhat.com>

Signed-off-by: Tyler Slaton <tyslaton@redhat.com>
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 <anikbhattacharya93@gmail.com>

Signed-off-by: Anik Bhattacharjee <anikbhattacharya93@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: bfeb1e46819bc840190f4d7d0720712683387973
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 <anikbhattacharya93@gmail.com>

Signed-off-by: anik120 <anikbhattacharya93@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a8edd5c05a1dbeba19b80110b2d4df50ffb96c4c
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 <greene.al1991@gmail.com>

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
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 <greene.al1991@gmail.com>

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 80b914d208fbdad8abf3cb1a172b079848d0b041
* Bump github.com/containerd/containerd to 1.6.10

Signed-off-by: Christoph Blecker <cblecker@redhat.com>

* Vendor dependencies

Signed-off-by: Christoph Blecker <cblecker@redhat.com>

Signed-off-by: Christoph Blecker <cblecker@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: afbb6091f81059d09e11d5163591c773bce15c61
* Fix flaky TestResolver unit test

Signed-off-by: Christoph Blecker <cblecker@redhat.com>

* Fix flaky TestUpdates unit test

Signed-off-by: Christoph Blecker <cblecker@redhat.com>

Signed-off-by: Christoph Blecker <cblecker@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4da774fdf1c1d64c2fbc8dafd8b55878312ed962
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 <greene.al1991@gmail.com>

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6c564a670c94c50a9270bb5338a0e32a3e11496f
Signed-off-by: Ruben Simons <r.simons@fz-juelich.de>

Signed-off-by: Ruben Simons <r.simons@fz-juelich.de>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e29776daa392f365cb685d8a04082a3cf1fbc20c
Bumps the fedora version up to 37.

Signed-off-by: Daniel Franz <dfranz@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 231e9224fbbc651ec5565a0f2641a6a4588ad3c9
jcho02 and others added 7 commits March 7, 2023 15:04
Signed-off-by: jcho02 <jason.cho2@ibm.com>

Signed-off-by: jcho02 <jason.cho2@ibm.com>
Upstream-repository: operator-registry
Upstream-commit: 0271e7847d0b71cd969a2426f5532a4cb1cddd40
…be empty in error scenario (openshift#1032)

Signed-off-by: Adam D. Cornett <adc@redhat.com>

Signed-off-by: Adam D. Cornett <adc@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: d888b725a43440428800c3eea06adaafe1110a56
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 89594183c5c9ea38c183d2f38c2644dba0f37024
openshift#1043)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 0080ea0a938fdb91662a6ca36387aa71d3a52b28
* update render unmarshal failures

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

* revamp for pretty format, error.As approach

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 249ae621bb8fa6fc8a8e4a5ae26355577393f127
* initial implementation pass

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* initial implementation pass

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update implementation

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* add unit tests

and any changes necessary in relation to adding unit tests.

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* verify schemas and fail if they don't match

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* add better validations and decrease some code duplication

as well as add the necessary additional test cases

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* remove some TODO comments and hardcode containerTool as 'docker'

as per review comments

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

* update the custom veneer builder

to work like the other veneer builders by reading a full FBC from STDOUT
and writing it to the output destination in the custom veneer config.
Also adds additional test cases to cover the new changes.

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 104e0276e46d4aae6d4d8b364c03576893229e71
…hift#1055)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: b7307b57c5f67b296098e66bfe38458e762c99aa
Copy link
Copy Markdown
Contributor

@openshift-ci openshift-ci Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perdasilva: 1 invalid OWNERS file

Details

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.

Comment thread staging/operator-registry/OWNERS Outdated
- kevinrizza
- benluddy
- joelanford
=======
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot parse file: error converting YAML to JSON: yaml: line 9: could not find expected ':'.

…st on generated files (openshift#1060)

Signed-off-by: Jordan <jordan@nimblewidget.com>

Signed-off-by: Jordan <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 67e6777b5f5f9d337b94da98b8c550c231a8b47c
* rename template to veneer

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

* fixing some utest

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

* adding cobra exit-status consistency through command hierarchy, adding temp skips of failing utests until we get the new release

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>

---------

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 57a959da1177335976c5efcc592cc423ff90e2cd
Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 1446d7be762d9eb3c88dddb2828a61debdcd6cd6
@openshift-ci openshift-ci Bot removed the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Mar 7, 2023
@perdasilva
Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@rashmigottipati
Copy link
Copy Markdown
Member

/retest

Signed-off-by: Jordan Keister <jordan@nimblewidget.com>
Upstream-repository: operator-registry
Upstream-commit: 0a7ff74f9fc6c92be12a48a0f8e67ecfb6a8e60e
Signed-off-by: perdasilva <perdasilva@redhat.com>
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Mar 7, 2023

@perdasilva: 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/images cdf0349 link true /test images
ci/prow/e2e-gcp-olm-flaky cdf0349 link false /test e2e-gcp-olm-flaky
ci/prow/e2e-upgrade cdf0349 link true /test e2e-upgrade
ci/prow/unit-psm cdf0349 link true /test unit-psm
ci/prow/e2e-gcp-olm cdf0349 link true /test e2e-gcp-olm
ci/prow/e2e-gcp-console-olm cdf0349 link true /test e2e-gcp-console-olm
ci/prow/e2e-gcp-ovn cdf0349 link true /test e2e-gcp-ovn
ci/prow/unit-registry cdf0349 link true /test unit-registry

Full PR test history. Your PR dashboard.

Details

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.

@everettraven
Copy link
Copy Markdown
Contributor

@perdasilva I don't think the ci/prow/unit-registry test is going to pass due to some issues with the way the unit tests were configured for the composite template (veneer) in operator-registry. It requires that Docker be present and when @grokspawn attempted to downstream the veneer --> template rename (#461) we weren't able to get it to work because the prow environment doesn't have Docker installed.

We are currently working on making some changes to the composite template upstream in operator-framework/operator-registry#1075 to fix this issue and enable us to properly downstream commits made after the addition of the composite template.

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Mar 14, 2023

Any updates on this?

@tmshort tmshort mentioned this pull request Mar 14, 2023
@perdasilva
Copy link
Copy Markdown
Contributor Author

@tmshort I didn't get a chance to finish looking into this. I'm happy to close this if you want to take over with your work. I just wanted to get some idea of how far behind we are =S

@tmshort
Copy link
Copy Markdown
Contributor

tmshort commented Mar 15, 2023

@tmshort I didn't get a chance to finish looking into this. I'm happy to close this if you want to take over with your work. I just wanted to get some idea of how far behind we are =S

You got further ahead than I did... this is a better starting point, but everything is failing...

@grokspawn
Copy link
Copy Markdown
Contributor

@tmshort Any updates on this?

Just merged. We were blocked by the org-wide CI issue. :(

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 22, 2023
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

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.

@perdasilva
Copy link
Copy Markdown
Contributor Author

closing as this is out of date and todd is on it!

@perdasilva perdasilva closed this Mar 24, 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. 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.