Skip to content

Sync upstream to downstream 4.10#196

Closed
timflannagan wants to merge 58 commits intoopenshift:masterfrom
timflannagan:tflannag-sync-sans-csv
Closed

Sync upstream to downstream 4.10#196
timflannagan wants to merge 58 commits intoopenshift:masterfrom
timflannagan:tflannag-sync-sans-csv

Conversation

@timflannagan
Copy link
Copy Markdown
Contributor

@timflannagan timflannagan commented Sep 28, 2021

No description provided.

@openshift-ci openshift-ci Bot requested review from anik120 and awgreene September 28, 2021 21:25
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 28, 2021
@timflannagan timflannagan force-pushed the tflannag-sync-sans-csv branch 2 times, most recently from 70d8140 to 1bdc825 Compare September 29, 2021 04:01
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2021
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2021
@timflannagan timflannagan force-pushed the tflannag-sync-sans-csv branch 2 times, most recently from 18ff0b7 to a098f1a Compare October 5, 2021 14:08
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 5, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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

@timflannagan timflannagan force-pushed the tflannag-sync-sans-csv branch from c7b2907 to c8a7ca3 Compare October 5, 2021 14:20
@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 5, 2021

/retest

2 similar comments
@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 6, 2021

/retest

@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 6, 2021

/retest

@timflannagan timflannagan force-pushed the tflannag-sync-sans-csv branch from 3a347f6 to ddbcc0b Compare October 6, 2021 16:43
@orenc1 orenc1 mentioned this pull request Oct 7, 2021
Merged
11 tasks
timflannagan and others added 13 commits October 7, 2021 13:04
@timflannagan
.github/workflows: Fix the release quickstart.yaml GH action
8ad00c7 
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 <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b98ff9d1601b41847fb47445a8366a1145c7cbe6
@benluddy @timflannagan
Expose errors generated while retrieving catalog content.
d11f2bf 
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 <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6ab5f1634093c91d7027b9245a88ede7b807088b
@timflannagan
v0.18.3 OLM release
c780467 
Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1e7e1cc81d5c3e0f2de2a06cb4315ea622371cbe
@timflannagan
Update containerd dependency to fix vulnerabilities (openshift#719)
500e1df 
Update to containerd 1.4.8

Signed-off-by: Vu Dinh <vudinh@outlook.com>
Upstream-repository: operator-registry
Upstream-commit: aa44cbec0df254fb503a34384a85e197a7e68e6f
@timflannagan
doc/design: Update the changelog release documentation (#2298)
9356894 
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 <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 5c40752a9605669d34234bf18a93dba948b59439
@timflannagan
.github/workflows: Avoid running the e2e-tests workflow on doc-only p…
14bfa70 
…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 <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 939bf94f834181d60a713191f78b13b80c7bec0f
@ecordell @timflannagan
don't return an error if the singleton rbac doesn't exist (#2309)
5c5b84d 
Signed-off-by: Evan <cordell.evan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 538b1315eace85e33df7b2893a85a000f8757349
@ecordell @timflannagan
let net.Listen pick a port for grpc servers generated in tests (#2310)
b9049eb 
Signed-off-by: Evan <cordell.evan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 44fc44daf778cd9d36d6b6eb8edf63ff5a202304
@timflannagan
internal/declcfg: Avoid processing the .indexignore file when walking…
19d759a 
… 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 <timflannagan@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 78f27b39dc098c2e56681d9a3d8e786aae95d4fe
@joelanford @timflannagan
setup multi-arch builds with goreleaser
08e2642 
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: a390f86b3ca429c9618a7c20a31406bc2bd6ed16
@benluddy @timflannagan
Move operator caching from resolver into a new package. (#2316)
7e14e9e 
Signed-off-by: Ben Luddy <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3a565917233c72d098f3a60d9239f0e3c5b55f76
@dmesser @timflannagan
add further console customization types
eed891e 
Signed-off-by: Daniel Messer <dmesser@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 70cec5728f5634fc696e13a0608dd7d01a170e12
@timflannagan
.github/workflows: Replace the e2e-kind job name with e2e in the test…
6d7a7e5 
… 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 <timflannagan@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: ff2c921e414926a013f82448b7241bc84fc95372
@timflannagan
Makefile: Explicitly override the default OLM install and test
467750e 
namespaces

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 when running on OpenShift
clusters.

Signed-off-by: timflannagan <timflannagan@gmail.com>
@timflannagan
test/e2e: Wrap flake-prone garbage collection tests in eventually ass…
b5c366b 
…ertions (#2403)

* test/e2e: Wrap flake-prone garbage collection tests in eventually assertions

Update the test/e2e/gc_e2e_test.go and wrap any error-prone test blocks
in eventually assertions to reduce the number of flakes that occur when
attempting to create/update/delete/etc. Kubernetes resources during
individual CI runs on these garbage collection specs.

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

* test/e2e: Replace context.TODO() with context.Background()

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 23d84fa7dedff7546f1622253aabeaeee7ec693a
cynepco3hahue pushed a commit to cynepco3hahue/performance-addon-operators that referenced this pull request Oct 11, 2021
e2e: restart OLM pods after subscription update to trigger the upgrade
d9bfd6c 
Temporary workaround until openshift/operator-framework-olm#196 merged.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
cynepco3hahue pushed a commit to cynepco3hahue/performance-addon-operators that referenced this pull request Oct 11, 2021
e2e: restart OLM pods after subscription update to trigger the upgrade
d9bb422 
Temporary workaround until openshift/operator-framework-olm#196 merged.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
@cynepco3hahue cynepco3hahue mentioned this pull request Oct 11, 2021
Merged
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/performance-addon-operators that referenced this pull request Oct 11, 2021
e2e: restart OLM pods after subscription update to trigger the upgrade
9516700 
Temporary workaround until openshift/operator-framework-olm#196 merged.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/performance-addon-operators that referenced this pull request Oct 13, 2021
e2e: restart OLM pods after subscription update to trigger the upgrade
a5f1c6a 
Temporary workaround until openshift/operator-framework-olm#196 merged.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
exdx and others added 3 commits October 13, 2021 10:47
@exdx @timflannagan
fix: wrap csv e2e test create in Eventually statements in the BeforeE…
da6b843 
…ach block (#2387)

Signed-off-by: Daniel Sover <dsover@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: a94b10b8cf7f0b2632eebdbd4fe85dd16520b89e
@exdx @timflannagan
fix: use v1 pdb object under e2e bundle test (#2398)
6aee4fc 
Signed-off-by: Daniel Sover <dsover@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4c3c8f1b1bf6c64271f81a4e64043a081c9d73b7
@awgreene @timflannagan
Improve reliability of e2e tests that include GRPC CatalogSources (#2…
a03f87c 
…419)

This commit introduces a change to the e2e tests that rely on
a grpc catalogSource that is stored in an off cluster registry.
These tests originally required that the following happen within a
minute:

1. The catalogSource is installed and ready to serve.
2. The contents of the bundle are unpacked and placed in an
installPlan.
3. The CSV is installed and in the ready state.

The tests will now wait for the catalogSource to be ready to serve
before moving onto steps 2 and 3.

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 700d282adbe09cc0b5d84d70411addb7400f9f79
@timflannagan timflannagan force-pushed the tflannag-sync-sans-csv branch from c4d17e0 to a03f87c Compare October 13, 2021 14:48
@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 13, 2021

/retest

This was referenced Oct 13, 2021
Merged
Closed
Closed
Closed
@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 14, 2021

/retest

4 similar comments
@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 14, 2021

/retest

@timflannagan
Copy link
Copy Markdown
Contributor Author

timflannagan commented Oct 14, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor

njhale commented Oct 14, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor

njhale commented Oct 16, 2021

/retest

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 16, 2021

@timflannagan: 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.

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 16, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 16, 2021

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

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.

@njhale njhale mentioned this pull request Oct 18, 2021
Closed
@njhale
Copy link
Copy Markdown
Contributor

njhale commented Oct 18, 2021

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

@njhale njhale closed this Oct 18, 2021
@timflannagan timflannagan deleted the tflannag-sync-sans-csv branch October 18, 2021 15:04
@njhale njhale mentioned this pull request Oct 18, 2021
Merged
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/performance-addon-operators that referenced this pull request Nov 8, 2021
e2e: restart OLM pods after subscription update to trigger the upgrade
6fd11ef 
Temporary workaround until openshift/operator-framework-olm#196 merged.

Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@anik120 anik120 Awaiting requested review from anik120

@awgreene awgreene Awaiting requested review from awgreene

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.