Skip to content

Updown sync 2 #264

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 119 commits into from
Closed

Updown sync 2 #264

wants to merge 119 commits into from

Conversation

@perdasilva
Copy link
Contributor

@perdasilva perdasilva commented Mar 7, 2022 •
edited
Loading

This PR brings down the latest changes from the upstream. The following fixes were applied on top:

  1. A diff comparison between up and (post sync'ed) down showed a few differences. A commit was added to correct the drift.
  2. There was a change required values.yaml to fix the opmImage flag to be passed with two dashes ("--opmImage")
  3. A patch to the MagicCatalog was needed to fix the path to the resource file. This is a stopgap and a corresponding ticket was created on the upstream to try to address this issues. It is also documented in code.
  4. Dropped Aki's PR that checks for operatorhubio catalog being up before the e2e tests start

@openshift-ci openshift-ci bot requested review from awgreene and benluddy March 7, 2022 19:08
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 7, 2022

[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

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, 2022
@perdasilva perdasilva force-pushed the updown_sync_2 branch 2 times, most recently from fa07a50 to 99365b6 Compare March 8, 2022 18:48
@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 8, 2022

retest ci/prow/e2e-aws-olm

@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 9, 2022

/retest-required

@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 9, 2022

/test e2e-upgrade

joelanford and others added 19 commits March 10, 2022 11:36
@joelanford @perdasilva
remove darwin builds, disable goreleaser github releasers, re-add .gi…
7663863 
…thub/workflows/release.yaml

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: a629d38a2273aa0cd43b7f06702c8c631401f30c
@kevinrizza @perdasilva
Bump operator-framework API to 0.10.5 (openshift#737)
d7967ce 
Upstream-repository: operator-registry
Upstream-commit: 3c2677ea67da9bb96d9f1db9e45dd4e46b81dd8e
@anik120 @perdasilva
(vendor) bump api to v0.11.0 (openshift#887)
693adff 
This PR bumps operator-framework/api to v0.11.0

Signed-off-by: Anik Bhattacharjee <anikbhattacharya93@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: acaac87c522f1826dce8669eb9108ccacc73af75
@anik120 @perdasilva
(.gitignore): Do not ignore debug/ (openshift#890)
6ac90e9 
In PR openshift#888, there's vendoring of the cel-go package, one of which
is named "debug" (github.com/google/cel-go/common/debug). Due to
the .gitignore file ignoring all [Dd]bug folders, the vendored
package isn't being checked in by git, causing the build to fail.
This PR removes the instruction to ignore [Dd]bug/ folders.

Signed-off-by: Anik Bhattacharjee <anikbhattacharya93@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 7a09b48dba29e8d063916f276740a1d737b40121
@dinhxuanvu @perdasilva
feat(constraint): Add constraint type validation to bundle validation (…
f16900c 
…openshift#888)

* feat(constraint): Add constraint type validation to bundle validation

A new type of dependency named constraint (olm.constraint) which uses
CEL expression is introduced in OLM. This new type is added to
dependencies.json file in the bundle just like gvk and package
dependencies. As a result, a new validation for constraint type
is added to ensure this type will be validated for bundle
dependencies.

Signed-off-by: Vu Dinh <vudinh@outlook.com>

Vendor the constraints pkg from api repo

Signed-off-by: Vu Dinh <vudinh@outlook.com>

* Add unit test for cel-go constraint validation

Signed-off-by: Vu Dinh <vudinh@outlook.com>
Upstream-repository: operator-registry
Upstream-commit: 384af6b9235dc718268cb3e148a8c5f2c58e64bc
@Shivkumar13 @perdasilva
Update extract.go (openshift#876)
356e899 
Updating for reader experience.

Signed-off-by: Shivkumar13 <shivkumar.ople97@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 611525be3bd7374d1e55d43c519e5664e0e91c2c
@nsapse @perdasilva
(vendor) bump go-sqlite to 1.14.10 (openshift#896)
1011437 
This commit bumps operator-framework/operator-registry requirement
go-sqlite3 from v1.10.0 to v1.14.10

Signed-off-by: Noah Sapse <nsapse@redhat.com>

Co-authored-by: Noah Sapse <nsapse@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 4e3865a5cf1a2b1048d3752071ae1e932953f29c
@jpower432 @perdasilva
feat(registry): add podman auth.json as an alternate location (opensh…
93f5bb6 
…ift#897)

* feat(registry): add podman auth.json as an alternate location

Adds podman default credential location as an alternate location
when loading the config for containerd registry resolver

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* fix: remove named return values in resolver and add xdg library for cross-platform option

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* fix: update go.sum for with new xdg import

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: c056ac1f075b38031263893758fcfe6c96dcee79
@kevinrizza @perdasilva
Graduate opm generate out of alpha (openshift#902)
21820c4 
Move the `opm alpha generate` command up to `opm generate`

Signed-off-by: kevinrizza <krizza@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: d69d2e41d74c16806fbc7b1ebd516ea6723f04f8
@estroz @perdasilva
Update OWNERS (openshift#903)
bea824f 
Upstream-repository: operator-registry
Upstream-commit: 3fa02bc295358a6e3259a1da11bfa35c89e58898
@jpower432 @perdasilva
fix(opm): adds removal of empty packages when using opm diff in heads…
0c4d97b 
…Only mode (openshift#905)

opm diff in headsOnly mode with an include config will prune all empty channels
from a package which can leave the output config with an empty package. This change
will remove any empty packages after the channel pruning.

Fixes openshift#904

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: f7e27734f3a633ec03e55779317dd1af4d2cfd0a
@jpower432 @perdasilva
fix(registry): deprecated skip-tls and add use-http and skip-tls-veri…
3429f8f 
…fy (openshift#898)

* fix(registry): deprecated skip-tls and add use-http and skip-tls-verify

The skip-tls flag currently uses HTTP instead of the expected behavior of skipping
TLS cert validated with HTTPS registries. The new flags seperate untrusted HTTPS from
HTTP registries and behave as expected

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* chore: add helper function to validate and get TLS options for opm command

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>

* chore: add warning message for plain HTTP in registy add command

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 354cd385167844295a3288b5a8e7fb5efb9e652b
@joelanford @perdasilva
consolidate binary builds and release uploads into goreleaser build c…
6eecc3b 
…onfigs (openshift#914)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 0b008deff332346247624ccc54df64b75cfe9777
@joelanford @perdasilva
fix: use gnutar in macos github action to avoid corrupting tar file c…
457020f 
…ontents (openshift#915)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 7827c48d1a09fe320af46afe5e19491784b7f89e
@ankitathomas @perdasilva
use only stdout for reading container name (openshift#745)
510d37c 
Signed-off-by: Ankita Thomas <ankithom@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: d59081db05ae040ebacf74f3ccfefd3bbdd9cdca
@akihikokuroda @perdasilva
make removing non-exist package error (openshift#779)
d0f2765 
Signed-off-by: akihikokuroda <akuroda@us.ibm.com>
Upstream-repository: operator-registry
Upstream-commit: 5566e4b6832a7fc08c12d3c79fc0a0b8c6a2e7aa
@jeloba @perdasilva
Upgrade github.com/docker/cli to v20.10.12 (openshift#894)
0e4f1df 
* Upgrade github.com/docker/cli to v20.10.12

Signed-off-by: Jan Boehm <6552713+jeloba@users.noreply.github.com>

* Synchronize docker config loading

This prevents data races during testing. The root cause
are unsecured globals in the docker cli lib.

Signed-off-by: Jan Boehm <6552713+jeloba@users.noreply.github.com>

* Mention upstream issue that fixes the data race

Signed-off-by: Jan Boehm <6552713+jeloba@users.noreply.github.com>
Upstream-repository: operator-registry
Upstream-commit: c496cf028568091b18633a9ee59dadcc6d4b4edb
@awgreene @perdasilva
Bump go to v1.17 (openshift#922)
01d0975 
This commit updates the operator-registry's go version
to v1.17.

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: c970d617ce2d77c096102e2d881a15ef680bacf9
@akihikokuroda @perdasilva
adding properties to package and channel (openshift#900)
ec6e20e 
Signed-off-by: akihikokuroda <akihikokuroda2020@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 5c3f4a3a3365c6684f78a3617e4cfc650bec73e3
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 14, 2022

@perdasilva: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test e2e-aws-console-olm
  • /test e2e-aws-olm
  • /test e2e-gcp
  • /test e2e-upgrade
  • /test images
  • /test unit-api
  • /test unit-olm
  • /test unit-registry
  • /test verify

Use /test all to run all jobs.

In response to this:

/retest e2e-aws-olm
/retest e2e-upgrade

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
Contributor Author

perdasilva commented Mar 14, 2022

/retest-required

1 similar comment
@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 14, 2022

/retest-required

@timflannagan timflannagan mentioned this pull request Mar 14, 2022
Merged
perdasilva and others added 3 commits March 15, 2022 08:14
@perdasilva
Refactor csv e2e
19fa74e 
Signed-off-by: perdasilva <perdasilva@redhat.com>
@perdasilva
Fix catalog source e2e test (#2688)
908a156 
Signed-off-by: perdasilva <perdasilva@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 39cbdcdc8ab34486abdf41a06929b796d5af61fe
@timflannagan @perdasilva
e2e: Refactor the CatalogSource tests to reduce flakes (#2693)
f89c31a 
* Refactor catalog source e2e tests to unique namespaces

Signed-off-by: perdasilva <perdasilva@redhat.com>

* e2e: Ensure the CatalogSource resource created in the global catalog test is deleted

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

Co-authored-by: perdasilva <perdasilva@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 14c0b96f15368cf8f4e80a93f6b05810f9c18200
@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 15, 2022

/test unit-api

@perdasilva
Copy link
Contributor Author

perdasilva commented Mar 15, 2022

/test all

@timflannagan
Copy link
Contributor

timflannagan commented Mar 15, 2022

/retest-required

@timflannagan
Copy link
Contributor

timflannagan commented Mar 15, 2022

/test ci/prow/e2e-aws-olm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 15, 2022

@timflannagan: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-aws-console-olm
  • /test e2e-aws-olm
  • /test e2e-gcp
  • /test e2e-upgrade
  • /test images
  • /test unit-api
  • /test unit-olm
  • /test unit-registry
  • /test verify

The following commands are available to trigger optional jobs:

  • /test e2e-aws-olm-flaky

Use /test all to run all jobs.

In response to this:

/test ci/prow/e2e-aws-olm

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.

@timflannagan
Copy link
Contributor

timflannagan commented Mar 15, 2022

/test e2e-aws-olm

@jianzhangbjz
Copy link
Contributor

jianzhangbjz commented Mar 17, 2022

/test verify
/test e2e-aws-olm-flaky
/test e2e-aws-olm

@timflannagan timflannagan mentioned this pull request Mar 22, 2022
Closed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 24, 2022

@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/e2e-aws-olm-flaky f89c31a link false /test e2e-aws-olm-flaky
ci/prow/e2e-aws-olm f89c31a link true /test e2e-aws-olm
ci/prow/verify f89c31a link true /test verify
ci/prow/e2e-gcp-olm f89c31a link true /test e2e-gcp-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.

@timflannagan
Copy link
Contributor

timflannagan commented Mar 25, 2022

#269 merged - closing as a duplicate.

/close

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@perdasilva: PR needs rebase.

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 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2022
@openshift-ci openshift-ci bot closed this Mar 25, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@timflannagan: Closed this PR.

In response to this:

#269 merged - closing as a duplicate.

/close

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 pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2023
@timflannagan @perdasilva
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
ad05872 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Mar 15, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
08edcda 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Mar 28, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
0d889b0 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Apr 6, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
e5df317 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request May 23, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
4f71e4c 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Jul 11, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
a228653 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Jul 17, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
db98efe 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
tmshort pushed a commit to tmshort/operator-framework-olm that referenced this pull request Jul 20, 2023
@timflannagan @tmshort
go.*,pkg: Remove the duplicate github.com/blang/semver dependency (op…
02cdace 
…enshift#264)

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

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: api
Upstream-commit: e4d13db375b88f764a953ce34925e4ad4e79e5fa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@awgreene awgreene Awaiting requested review from awgreene

@benluddy benluddy Awaiting requested review from benluddy

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.