Skip to content

Upstream sync #187

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 49 commits into from
Closed

Upstream sync #187

wants to merge 49 commits into from

Conversation

ankitathomas
Copy link
Contributor

timflannagan and others added 30 commits September 9, 2021 10:59
@timflannagan @ankitathomas
.github/workflows: Fix the release quickstart.yaml GH action
a1fb36d 
Update the .github/workflows/quickstart.yml github action and replace
the usage of `kubectl wait ...` with a function that waits until the
various OLM component deployment resources are present and reporting an
available status.

Using `kubectl wait ...` is potentially problematic as it doesn't
support waiting until the creation of that resource, so in the case the
PackageServer deployment doesn't exist yet as the catalog/olm operators
are still being setup, this action will fail as `kubectl wait ...` will
return a non-zero exit code.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b98ff9d1601b41847fb47445a8366a1145c7cbe6
@benluddy @ankitathomas
Expose errors generated while retrieving catalog content.
2aac21c 
Failing to fetch catalog content should not silently return an empty
cache. Instead, it should fail outright with an error that indicates
which catalog(s) could not be fetched.

Signed-off-by: Ben Luddy <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6ab5f1634093c91d7027b9245a88ede7b807088b
@timflannagan @ankitathomas
v0.18.3 OLM release
cbc87e6 
Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1e7e1cc81d5c3e0f2de2a06cb4315ea622371cbe
@dinhxuanvu @ankitathomas
Update containerd dependency to fix vulnerabilities (openshift#719)
f274faf 
Update to containerd 1.4.8

Signed-off-by: Vu Dinh <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: aa44cbec0df254fb503a34384a85e197a7e68e6f
@timflannagan @ankitathomas
doc/design: Update the changelog release documentation (#2298)
bfa9b22 
Update the doc/design/release.md documentation around how to generate
the root CHANGELOG.md. Previously, when running into API rate limiting
behaviors locally, the suggestion was to modify a variable in the Ruby
gem package that no longer exists. Now, specify the --max-issues CLI
flag to lower the number of API requests to the OLM repository.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 5c40752a9605669d34234bf18a93dba948b59439
@timflannagan @ankitathomas
.github/workflows: Avoid running the e2e-tests workflow on doc-only p…
600d1c2 
…ull requests (#2299)

Update the e2e-tests.yml github workflow and avoid running that action
on PRs that only change the doc directory.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 939bf94f834181d60a713191f78b13b80c7bec0f
@ecordell @ankitathomas
don't return an error if the singleton rbac doesn't exist (#2309)
a1ffbf2 
Signed-off-by: Evan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 538b1315eace85e33df7b2893a85a000f8757349
@ecordell @ankitathomas
let net.Listen pick a port for grpc servers generated in tests (#2310)
60fe57b 
Signed-off-by: Evan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 44fc44daf778cd9d36d6b6eb8edf63ff5a202304
@timflannagan @ankitathomas
internal/declcfg: Avoid processing the .indexignore file when walking…
9792974 
… the root fs (openshift#733)

Update internal/declcfg/load.go and avoid processing any files that are
named `.indexignore` when walking the declarative config index root
filesystem. When validating declarative config directories, the
.indexignore file was being processed and validated.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 78f27b39dc098c2e56681d9a3d8e786aae95d4fe
@joelanford @ankitathomas
setup multi-arch builds with goreleaser
4900eb2 
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: a390f86b3ca429c9618a7c20a31406bc2bd6ed16
@benluddy @ankitathomas
Move operator caching from resolver into a new package. (#2316)
99a7a1f 
Signed-off-by: Ben Luddy <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3a565917233c72d098f3a60d9239f0e3c5b55f76
@dmesser @ankitathomas
add further console customization types
f0217cb 
Signed-off-by: Daniel Messer <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 70cec5728f5634fc696e13a0608dd7d01a170e12
@timflannagan @ankitathomas
.github/workflows: Replace the e2e-kind job name with e2e in the test…
882460c 
… workflow (openshift#730)

Update the test.yml test workflow and replace the `e2e-kind` job name with
`e2e`. Before, the e2e test workflow had ran e2e tests against both kind
and minikube clusters before the latter job was removed entirely.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: ff2c921e414926a013f82448b7241bc84fc95372
@exdx @ankitathomas
feat: support removing the default channel head in deprecatetrunace (o…
ba28d2f 
…penshift#734)

Signed-off-by: Daniel Sover <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: b82684903f7af4e483efe5629d18c9a6db036dcb
@ankitathomas
feat(release): X.Y, X, and latest opm image tags (openshift#738)
e187a72 
build X.Y, X, and latest opm images
but only latest if X.Y.Z is latest semver in HEAD
and X.Y/X if the current HEAD commit is tagged.

Signed-off-by: Eric Stroczynski <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 6f1a54f7b7b4f5e4f062fde42cb477ae25d438f6
@dmesser @ankitathomas
add further console customization types (#2319)
c97b9c5 
Signed-off-by: Daniel Messer <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c76e1cd8e24d555f59379f07faff538f6f5a4191
@joelanford @ankitathomas
cli doc: opm serve does not detect DC changes after startup (openshif…
c30ba9c 
…t#750)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 50b78e97a50f952a08c221678f5df7b9bfafc059
@kevinrizza @ankitathomas
Add joelanford as an approver in OWNERS (openshift#751)
9ad4597 
Signed-off-by: kevinrizza <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 996010910c9ed57f7092fd2bc74e8506f6f4ace3
@benluddy @ankitathomas
Prune API of the resolver package. (#2330)
6bcccb7 
* Remove generated FakeAPIIntersectionReconciler.

It's a test stub that has only one consumer. Generating a fake into
pkg/fakes with counterfeiter and using it for tests in
pkg/controller/operators/olm introduces a number of transitive package
dependencies that make it difficult to unwind the resolver package
from other runtime components.

Signed-off-by: Ben Luddy <[email protected]>

* Move OperatorGroup surface logic to the olm package.

It has been living in the resolver package as a holdover from earlier
generations of resolution, but is only consumed by olm-operator as
part of OperatorGroup reconciliation.

Signed-off-by: Ben Luddy <[email protected]>

* Move API labeler from the resolver package to the olm package.

The only user of the provided/required API labeling functionality is
olm-operator, but it was still residing in the resolver package.

Signed-off-by: Ben Luddy <[email protected]>

* Remove OperatorSurface interface from resolver.

This interface is used only by olm-operator and doesn't provide a
useful abstraction on top of directly reading fields from Operator
structs.

Signed-off-by: Ben Luddy <[email protected]>

* Extract SourceQuerier from the resolver package.

SourceQuerier is a holdover from the previous resolution
implementation. Now, it only gets minor usage in
catalog-operator. Unused methods have been removed, and SourceQuerier
has moved to pkg/controller/operators/catalog beside where it is used.

Signed-off-by: Ben Luddy <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 9b537bf1079d55244c0cd733fc55d12d02c31574
@kevinrizza @ankitathomas
Add vu dinh to OLM approvers (#2332)
cb3d9a7 
Signed-off-by: kevinrizza <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: cf3b8a4ff857cd40092c8f21c70604abeb966332
@kevinrizza @ankitathomas
Use of/gini instead of inifrance/gini (#2331)
b0f0c92 
The github.com/irifrance/gini package has been purged from github
An existing version that preserved that history has been forked to the
operator-framework org, and this commit updates that dependency to use
the forked version.

Signed-off-by: kevinrizza <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 51fe6da356c4e4658820031ffe0fe4117a2dcf59
@kevinrizza @ankitathomas
Fix upstream-opm-builder (openshift#758)
ff35766 
Use mirrored base images as a temporary workaround
for the docker.io rate limiting we are currently seeing in our
builds

Signed-off-by: kevinrizza <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: d487288d9a2ee9b8d68009a10a0541133ee1090f
@ankitathomas
feat(opm): configure diff to not include dependency bundles with --sk…
a9f42e1 
…ip-deps (openshift#753)

Signed-off-by: Eric Stroczynski <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 7fba6adb47680d28632f83b8418b75889af5cb3d
@joelanford @ankitathomas
move internal to alpha to make subpackages available for importing fr…
0e7d985 
…om other projects (openshift#759)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: a0bb1e5b6d1ad34154fe205401dbd6ee6c4276bb
@josefkarasek @ankitathomas
fix broken URL in unit.yaml GH action (#2335)
6ef0755 
Signed-off-by: Josef Karasek <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 35deef283a7b0595d6213a66c395731fd0588cdd
@ecordell @ankitathomas
bump gini (#2336)
4441e74 
new version has logic.C performance improvements that should help

see:
- go-air/gini#17
- go-air/gini@3a1a4d9
- go-air/gini@8dd6805
- go-air/gini#18

Signed-off-by: Evan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c20784d3e2a372c2a6a03dbcfedf512ca84b1eca
@camilamacedo86 @ankitathomas
(fix) : Fix check to verify OCP label versions when it is =v4.x (open…
e8ed9cd 
…shift#148)

Upstream-repository: api
Upstream-commit: e4b9266c693b1443c33fff99aabd49c07232e6ba
@morningspace @ankitathomas
Fix 2327: Detecting OLM existence before start to install (#2334)
0e9cefc 
* Fix 2327

Signed-off-by: Ying Mo <[email protected]>

* Remove -o=jsonpath='{.spec}'

Signed-off-by: Ying Mo <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 03493b5e7178f3312f0220b0a2ee75db2b7c6459
@joelanford @ankitathomas
update default scaffolded opm base image (openshift#762)
8236403 
- Change default base image scaffolded during `opm index` and `opm alpha
  generate dockerfile` to `quay.io/operator-framework/opm:latest`
- update opm-example.Dockerfile to reflect this change (and to focus on
  file-based configs rather than sqlite databases)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0a190a8a95abd690062816b4f5b0dc2143cddf1c
@joelanford @ankitathomas
fix: ensure operator images are included in rendered bundles related …
8bb3734 
…images (openshift#771)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: f5dcf40f01b8707194fdde07818c8b440ee010fa
@timflannagan
Copy link
Contributor

/retest
/lgtm

@ankitathomas
Copy link
Contributor Author

/retest

2 similar comments
@ankitathomas
Copy link
Contributor Author

/retest

@ankitathomas
Copy link
Contributor Author

/retest

@timflannagan
Copy link
Contributor

/retest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 16, 2021
@timflannagan
Copy link
Contributor

/retest

1 similar comment
@timflannagan
Copy link
Contributor

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2021

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2021
@timflannagan timflannagan force-pushed the sync-sans-csv branch 2 times, most recently from 374508d to 15bce7b Compare September 23, 2021 15:52
@ankitathomas ankitathomas mentioned this pull request Sep 23, 2021
Closed
@timflannagan
Copy link
Contributor

/retest

@timflannagan
Copy link
Contributor

/retest

timflannagan and others added 5 commits September 30, 2021 21:34
@timflannagan
test/e2e: Remove the unused e2e.sh and tap.jq files (#2366)
7fb1e3e 
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: e48737c5fc30c867d7f3ea3ce471c86050aa9a89
@dinhxuanvu @timflannagan
Add olm-managed label to configmap-based catalogsource for e2e test (…
a61d0e5 
…#2370)

Currently, OLM only caches configmap with olm-managed label to reduce
memory usage footprint. There is an automatic mechanism to inject
this label to all configmaps that belong to catalogsource. However,
for e2e test, this label should be added by default to avoid extra
logic to be executed.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8b0ac13809b5155e4b7f1415e2fb37a060c3fe07
@timflannagan
Makefile: Explicitly specify GINKGO_OPTS for the e2e/olm target
71362be 
Update the root Makefile and extend the e2e/olm target to explicitly
configure the ginkgo options that gets filtered to the
staging/operator-lifecycle-manager e2e target that was introduced in [1].

[1] operator-framework/operator-lifecycle-manager#2367

Signed-off-by: timflannagan <[email protected]>
@timflannagan
Makefile: Update the e2e target to use ginkgo (#2367)
1eed8ac 
Update the root Makefile and update the `e2e` target to use the ginkgo
executable instead of `go test ...` as logs produce when running the e2e
suite aren't captured until after the process has completed. This leads
to situations where failing tests aren't immediately communicated back
and loss of logs entirely in the case where the process was manually
teminated.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 584e12a9819b8aea1205332c4eba72a46d609fad
@timflannagan
pkg/controller: Test commit (#2382)
d399345 
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 396b5461555c2498507b1fff20fccc3e7ae15420
Signed-off-by: timflannagan <[email protected]>
@dinhxuanvu
Copy link
Member

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 1, 2021

@ankitathomas: 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-upgrade d399345 link true /test e2e-upgrade
ci/prow/e2e-aws-olm d399345 link true /test e2e-aws-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.

@njhale njhale mentioned this pull request Oct 13, 2021
Closed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 17, 2021

@ankitathomas: 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 Oct 17, 2021
@njhale
Copy link
Contributor

njhale commented Oct 18, 2021

Splitting into more granular commit ranges. See #203 for more details.

@njhale njhale closed this Oct 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benluddy benluddy Awaiting requested review from benluddy

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

Assignees

@timflannagan timflannagan

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.