Skip to content

4.10 downstream/upstream sync - first half#200

Merged
openshift-merge-robot merged 29 commits intoopenshift:masterfrom
njhale:sync/half
Oct 16, 2021
Merged

4.10 downstream/upstream sync - first half#200
openshift-merge-robot merged 29 commits intoopenshift:masterfrom
njhale:sync/half

Conversation

@njhale
Copy link
Copy Markdown
Contributor

@njhale njhale commented Oct 13, 2021 •
edited
Loading

timflannagan and others added 29 commits October 13, 2021 14:46
@timflannagan @njhale
.github/workflows: Fix the release quickstart.yaml GH action
282bb6e 
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 @njhale
Expose errors generated while retrieving catalog content.
2b68727 
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 @njhale
v0.18.3 OLM release
a2c7df0 
Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1e7e1cc81d5c3e0f2de2a06cb4315ea622371cbe
@njhale
Update containerd dependency to fix vulnerabilities (openshift#719)
e9be950 
Update to containerd 1.4.8

Signed-off-by: Vu Dinh <vudinh@outlook.com>
Upstream-repository: operator-registry
Upstream-commit: aa44cbec0df254fb503a34384a85e197a7e68e6f
@timflannagan @njhale
doc/design: Update the changelog release documentation (#2298)
327f6b7 
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 @njhale
.github/workflows: Avoid running the e2e-tests workflow on doc-only p…
999506f 
…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 @njhale
don't return an error if the singleton rbac doesn't exist (#2309)
9e31252 
Signed-off-by: Evan <cordell.evan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 538b1315eace85e33df7b2893a85a000f8757349
@ecordell @njhale
let net.Listen pick a port for grpc servers generated in tests (#2310)
f405a8e 
Signed-off-by: Evan <cordell.evan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 44fc44daf778cd9d36d6b6eb8edf63ff5a202304
@timflannagan @njhale
internal/declcfg: Avoid processing the .indexignore file when walking…
c553dde 
… 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 @njhale
setup multi-arch builds with goreleaser
84c6607 
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: a390f86b3ca429c9618a7c20a31406bc2bd6ed16
@benluddy @njhale
Move operator caching from resolver into a new package. (#2316)
efbfe04 
Signed-off-by: Ben Luddy <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3a565917233c72d098f3a60d9239f0e3c5b55f76
@dmesser @njhale
add further console customization types
ef66141 
Signed-off-by: Daniel Messer <dmesser@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 70cec5728f5634fc696e13a0608dd7d01a170e12
@timflannagan @njhale
.github/workflows: Replace the e2e-kind job name with e2e in the test…
761b51f 
… 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
@exdx @njhale
feat: support removing the default channel head in deprecatetrunace (o…
7cff329 
…penshift#734)

Signed-off-by: Daniel Sover <dsover@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: b82684903f7af4e483efe5629d18c9a6db036dcb
@njhale
feat(release): X.Y, X, and latest opm image tags (openshift#738)
4e8f0d5 
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 <ericstroczynski@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 6f1a54f7b7b4f5e4f062fde42cb477ae25d438f6
@dmesser @njhale
add further console customization types (#2319)
13f3cc8 
Signed-off-by: Daniel Messer <dmesser@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c76e1cd8e24d555f59379f07faff538f6f5a4191
@joelanford @njhale
cli doc: opm serve does not detect DC changes after startup (openshif…
f8cb8db 
…t#750)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 50b78e97a50f952a08c221678f5df7b9bfafc059
@kevinrizza @njhale
Add joelanford as an approver in OWNERS (openshift#751)
a8ad0d2 
Signed-off-by: kevinrizza <krizza@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: 996010910c9ed57f7092fd2bc74e8506f6f4ace3
@benluddy @njhale
Prune API of the resolver package. (#2330)
da994b7 
* 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 <bluddy@redhat.com>

* 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 <bluddy@redhat.com>

* 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 <bluddy@redhat.com>

* 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 <bluddy@redhat.com>

* 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 <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 9b537bf1079d55244c0cd733fc55d12d02c31574
@kevinrizza @njhale
Add vu dinh to OLM approvers (#2332)
42dc86b 
Signed-off-by: kevinrizza <krizza@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: cf3b8a4ff857cd40092c8f21c70604abeb966332
@kevinrizza @njhale
Use of/gini instead of inifrance/gini (#2331)
1fca926 
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 <krizza@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 51fe6da356c4e4658820031ffe0fe4117a2dcf59
@kevinrizza @njhale
Fix upstream-opm-builder (openshift#758)
0b77115 
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 <krizza@redhat.com>
Upstream-repository: operator-registry
Upstream-commit: d487288d9a2ee9b8d68009a10a0541133ee1090f
@njhale
feat(opm): configure diff to not include dependency bundles with --sk…
b5953c9 
…ip-deps (openshift#753)

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 7fba6adb47680d28632f83b8418b75889af5cb3d
@joelanford @njhale
move internal to alpha to make subpackages available for importing fr…
baf84fa 
…om other projects (openshift#759)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: a0bb1e5b6d1ad34154fe205401dbd6ee6c4276bb
@josefkarasek @njhale
fix broken URL in unit.yaml GH action (#2335)
2eda531 
Signed-off-by: Josef Karasek <jkarasek@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 35deef283a7b0595d6213a66c395731fd0588cdd
@ecordell @njhale
bump gini (#2336)
54a82e9 
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 <cordell.evan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c20784d3e2a372c2a6a03dbcfedf512ca84b1eca
@camilamacedo86 @njhale
(fix) : Fix check to verify OCP label versions when it is =v4.x (open…
1b1751a 
…shift#148)

Upstream-repository: api
Upstream-commit: e4b9266c693b1443c33fff99aabd49c07232e6ba
@morningspace @njhale
Fix 2327: Detecting OLM existence before start to install (#2334)
44b39b1 
* Fix 2327

Signed-off-by: Ying Mo <morningspace@yahoo.com>

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

Signed-off-by: Ying Mo <morningspace@yahoo.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 03493b5e7178f3312f0220b0a2ee75db2b7c6459
@joelanford @njhale
update default scaffolded opm base image (openshift#762)
c98b23d 
- 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 <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 0a190a8a95abd690062816b4f5b0dc2143cddf1c
@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 Oct 13, 2021
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

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 requested review from dinhxuanvu and estroz October 13, 2021 18:50
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 13, 2021
This was referenced Oct 13, 2021
Closed
Closed
Closed
@njhale
Copy link
Copy Markdown
Contributor Author

njhale commented Oct 14, 2021

/retest

4 similar comments
@timflannagan
Copy link
Copy Markdown
Contributor

timflannagan commented Oct 14, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor Author

njhale commented Oct 14, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor Author

njhale commented Oct 14, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor Author

njhale commented Oct 14, 2021

/retest

@timflannagan
Copy link
Copy Markdown
Contributor

timflannagan commented Oct 14, 2021

Upgrade failing appeared to be due to some etcd instability. The single failure in the e2e suite is a known flake upstream.

/retest

@timflannagan
Copy link
Copy Markdown
Contributor

timflannagan commented Oct 15, 2021

/retest

@njhale njhale changed the title WIP: 4.10 downstream/upstream sync - first half 4.10 downstream/upstream sync - first half Oct 16, 2021
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 16, 2021
@timflannagan
Copy link
Copy Markdown
Contributor

timflannagan commented Oct 16, 2021

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 16, 2021
@openshift-merge-robot openshift-merge-robot merged commit 301587b into openshift:master Oct 16, 2021
anik120 pushed a commit to anik120/operator-framework-olm that referenced this pull request Dec 10, 2021
@awgreene @anik120
Add format as a prerequisite to verify target (openshift#200)
cbd1ec8 
This commit updates the verify target to include the
format target as a prerequisite. This commit also
includes changes introduced after running the format
target.

upstream-repository: api
upstream-commit: 5678e585045db882c38cd186ace77d99c9fa0902
anik120 pushed a commit to anik120/operator-framework-olm that referenced this pull request Dec 10, 2021
@awgreene @anik120
Add format as a prerequisite to verify target (openshift#200)
d065c97 
This commit updates the verify target to include the
format target as a prerequisite. This commit also
includes changes introduced after running the format
target.

Upstream-repository: api
Upstream-commit: 5678e585045db882c38cd186ace77d99c9fa0902
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@awgreene @perdasilva
Add format as a prerequisite to verify target (openshift#200)
bfbbbb7 
This commit updates the verify target to include the
format target as a prerequisite. This commit also
includes changes introduced after running the format
target.

Upstream-repository: api
Upstream-commit: 5678e585045db882c38cd186ace77d99c9fa0902
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@awgreene @perdasilva
Add format as a prerequisite to verify target (openshift#200)
ebdfa82 
This commit updates the verify target to include the
format target as a prerequisite. This commit also
includes changes introduced after running the format
target.

Upstream-repository: api
Upstream-commit: 5678e585045db882c38cd186ace77d99c9fa0902
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

@estroz estroz Awaiting requested review from estroz

Assignees

@timflannagan timflannagan

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.