Skip to content

4.10 downstream/upstream sync - 3/4#205

Merged
openshift-merge-robot merged 15 commits intoopenshift:masterfrom
njhale:sync/quarter-2
Oct 19, 2021
Merged

4.10 downstream/upstream sync - 3/4#205
openshift-merge-robot merged 15 commits intoopenshift:masterfrom
njhale:sync/quarter-2

Conversation

@njhale
Copy link
Copy Markdown
Contributor

@njhale njhale commented Oct 18, 2021

Third quarter of the commits in #196 (i.e. first half of #204)

Subset of:

joelanford and others added 15 commits October 18, 2021 11:11
@joelanford @njhale
fix: ensure operator images are included in rendered bundles related …
af5c4c2 
…images (openshift#771)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: f5dcf40f01b8707194fdde07818c8b440ee010fa
@benluddy @njhale
Reduce resolver dependencies on operator-registry and operator-lifecy…
9f1a51d 
…cle-manager. (#2337)

* Remove resolver dependency on registry.CatalogKey.

Signed-off-by: Ben Luddy <bluddy@redhat.com>

* Remove hard resolver dependency on the gRPC registry client.

The most significant change is the introduction of a new Source
interface, which represents a single source of cache entries. In the
existing implementation, the cache was hardcoded to fetch content from
the operator-registry gRPC API on misses. This was a barrier to
off-cluster tools and other applications that should be able to
perform resolution without running a registry server.

A number of test fixtures were affected (for the better) because it's
now possible to directly configure the real Cache implementation to
retrieve test content without using of test doubles.

Signed-off-by: Ben Luddy <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 9e4a778a44abb8705fb8ef95ad0bdaaebfa0ecfc
@timflannagan @njhale
Remove unneeded replace pin for sigs.k8s.io/structured-merge-diff (#2…
a46d4c8 
…338)

Update the root go.mod and remove the replace pin for
sigs.k8s.io/structured-merge-diff.

It looks like the "// pinned because no tag supports 1.18 yet" message
may have also been an artifact of removing the helm replace pin that was
previously in place.

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3eb0d7be413d7c185441cb3fc81dadb2b67706e7
@joelanford @njhale
Add Timestamp to Scorecard Test Results (openshift#137)
5ee92ca 
* add timestamp field

Signed-off-by: Ish Shah <ishah@redhat.com>

* Add timestamp to scorecard test result

Signed-off-by: Ish Shah <ishah@redhat.com>

* Change type and struct

Signed-off-by: Ish Shah <ishah@redhat.com>

* Update pkg/apis/scorecard/v1alpha3/test_types.go

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>

* make manifests/generate;

Signed-off-by: Ish Shah <ishah@redhat.com>

* Update pkg/apis/scorecard/v1alpha3/test_types.go

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>
Upstream-repository: api
Upstream-commit: 7d591fff8bd551160e51dedef17debbe52145019
@josefkarasek @njhale
Add validation for Kind and APIVersion (openshift#152)
63b8415 
* Add validation for Kind and APIVersion

Signed-off-by: Josef Karasek <jkarasek@redhat.com>

* Update pkg/validation/internal/csv.go

Co-authored-by: Eric Stroczynski <ericstroczynski@gmail.com>

Co-authored-by: Eric Stroczynski <ericstroczynski@gmail.com>
Upstream-repository: api
Upstream-commit: c9b1e7ef82b8081a3eb52c48d0ca9039f2e3a27e
@benluddy @njhale
Remove hardcoded references to the registry gRPC API from the resolve…
4314d89 
…r packages. (#2340)

* Stop using the registry's Bundle proto type for resolution.

The resolver component does not care whether a given cache entry was
populated by use of the registry gRPC API, so it should ultimately be
possible to drop the "Bundle" field from cache entries altogether. For
now, catalog-operator's "step resolver" still depends on a Bundle
proto field in order to unpack inline (as opposed to image-based)
packages.

Signed-off-by: Ben Luddy <bluddy@redhat.com>

* Remove exported resolver cache entry creation funcs.

NewOperatorForBundle and NewOperatorFromV1Alpha1CSV couple the
resolver cache package to the registry gRPC API and the
operators/v1alpha1 CSV API, respectively. They're effectively used
only by the resolver package, so they can be moved there and
unexported. The remaining calls to NewOperatorFromV1Alpha1CSV can be
extracted from core resolver logic into a Source implementation that
is responsible for the conversion from ClusterServiceVersion to
cache.Snapshot entry, and the remaining call to NewOperatorFromBundle
is used only by the Source implementation based on the registry gRPC
API.

Signed-off-by: Ben Luddy <bluddy@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b849eb79c6fbb1c445ed3e9945e1668f6066ea6e
@laxmikantbpandhare @njhale
modified the controller-runtime and controller-tools versions (opensh…
dcbe770 
…ift#154)

* modified the controller-runtime and controller-tools versions

* ran vendor command and added files

* ran make manifests

Upstream-repository: api
Upstream-commit: a80624eab36b2005fa5d84c9b539bb4817e44daa
@ankitathomas @njhale
chore: update manifests
f610b09
@timflannagan @njhale
.github/workflows: Separate out the e2e jobs into workflows (#2158)
f1f6a33 
* .github/workflows: Separate out the e2e jobs into workflows

Update the .github/workflows/test-scripts.yml GH action workflow and
move all the jobs listed there into separate workflows. This allows us
to retest a single workflow at a time as a workaround to GH not allowing
you to retest individual jobs in a workflow.

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

* .github/workflows: Add the 'ci' workflow name to all e2e-related jobs

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 966ce43d5bde93848c45e1aaf4c6a5c110c37740
@njhale
doc(readme): add chat badge (#2345)
d7faee7 
Add a badge that links to the olm-dev channel in the Kubernetes Slack
instance.

Signed-off-by: Nick Hale <njohnhale@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 94af95a7580f45f6a0b45bd12d5aa37649b74a47
@timflannagan @njhale
Bump OLM_VERSION to 0.19.0 (#2348)
b3bc3eb 
Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 864b58ddc63742b53ecdf21f463e13ac2ce9de7e
@ankitathomas @njhale
chore: update manifests
e3dc18c
@njhale
fix(release): upgrade goreleaser so script requests correct checksum …
b1e8695 
…file (openshift#773)

Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 1c8557637731bbe28166d854ea8a16fd86c2995e
@timflannagan @njhale
.github/workflows: Don't run CI checks for markdown-only updates (#2347)
8fa95ac 
* .github/workflows: Don't run CI checks for markdown-only updates

Update the ci-prefixed workflows and ensure that CI isn't running when
only markdown files are updated.

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

* .github/workflows: Use paths-ignore instead of paths for ignoring certain files/paths

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

* .github/workflows: Remove the need to ignore the root doc/ path

The '**/*.md' filter pattern [1] should ignore _all_ markdown extension
files anywhere in the repository.

[1] https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#patterns-to-match-file-paths

Signed-off-by: timflannagan <timflannagan@gmail.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 2fd014019ca8cc86ae859da797e814b72c299257
@njhale
feat(opm): fine-grained dependency selection in diffs (openshift#756)
6a39a9a 
Signed-off-by: Eric Stroczynski <ericstroczynski@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: a3253eb2fa97be52883af0a0c195d4a95500c04a
@njhale njhale mentioned this pull request Oct 18, 2021
Closed
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 18, 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2021
@njhale
Copy link
Copy Markdown
Contributor Author

njhale commented Oct 18, 2021

/retest

@timflannagan
Copy link
Copy Markdown
Contributor

timflannagan commented Oct 19, 2021

/retest
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2021
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Oct 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Copy Markdown
Contributor

openshift-bot commented Oct 19, 2021

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 76afb08 into openshift:master Oct 19, 2021
@njhale njhale mentioned this pull request Oct 19, 2021
Closed
timflannagan pushed a commit to timflannagan/operator-framework-olm that referenced this pull request Dec 14, 2021
@camilamacedo86 @timflannagan
doc: further information and example of usage (openshift#205)
6934ef9 
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
timflannagan pushed a commit to timflannagan/operator-framework-olm that referenced this pull request Dec 15, 2021
@camilamacedo86 @timflannagan
doc: further information and example of usage (openshift#205)
8bb50e4 
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
timflannagan pushed a commit to timflannagan/operator-framework-olm that referenced this pull request Dec 15, 2021
@camilamacedo86 @timflannagan
doc: further information and example of usage (openshift#205)
a494ce1 
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@camilamacedo86 @perdasilva
doc: further information and example of usage (openshift#205)
eba94da 
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
@camilamacedo86 @perdasilva
doc: further information and example of usage (openshift#205)
fc26386 
Upstream-repository: api
Upstream-commit: 7f43803893b09e6160fbaffdb2e32e0c269005ff
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

@ankitathomas ankitathomas Awaiting requested review from ankitathomas

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.

9 participants

@njhale @timflannagan @openshift-bot @openshift-merge-robot @joelanford @benluddy @josefkarasek @laxmikantbpandhare @ankitathomas