Skip to content

Sync with upstream master branches#122

Closed
ankitathomas wants to merge 25 commits into
openshift:masterfrom
ankitathomas:sync
Closed

Sync with upstream master branches#122
ankitathomas wants to merge 25 commits into
openshift:masterfrom
ankitathomas:sync

Conversation

@ankitathomas
Copy link
Copy Markdown
Contributor

@ankitathomas ankitathomas commented Jul 16, 2021

This PR downstreams all new commits in tracked upstream master branches since #116. The commits messages are tagged with upstream metadata and nested vendor/OWNERS files are cleaned up. Merge commits are skipped to avoid cherry-picking empty commits. Cherry-picked with on https://gist.github.com/ankitathomas/8edb94bd3feb963c7304ad39eebdaf62#file-cherrypick_all-sh

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas

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 awgreene and dinhxuanvu July 16, 2021 13:13
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 16, 2021
@ankitathomas
Copy link
Copy Markdown
Contributor Author

ankitathomas commented Jul 16, 2021

/retest

@awgreene
Copy link
Copy Markdown
Contributor

awgreene commented Jul 19, 2021

/retest

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2021
@zcahana zcahana mentioned this pull request Jul 19, 2021
Merged
11 tasks
joelanford and others added 16 commits July 19, 2021 12:09
@joelanford @ankitathomas
declcfg: improve and fix model tests to eliminate possibility of fals…
d727a5a 
…e negatives

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Upstream-repository: operator-registry
Upstream-commit: 95c5e3bca1ac3abb3bf00f6b7345ddbd047e1524
@benluddy @ankitathomas
Remove pin of etcd and grpc (resolved in etcd v3.5.0).
f1d5d4e 
Signed-off-by: Ben Luddy <bluddy@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: e731c70a5cd62ab1cab7658f1d17f810f525cd8e
@ankitathomas
move DC opm commands out of alpha
29c1b39 
Signed-off-by: Ankita Thomas <ankithom@redhat.com>

Upstream-repository: operator-registry
Upstream-commit: 9e88b877c8324d5fd027e512ad845b344cc4168a
@benluddy @ankitathomas
Translate legacy "bundle dependencies" to properties.
aa81e71 
Operator dependencies are expressed as properties, but there was
initially a notion of dependencies as distinct from properties. For
that reason, catalog-operator must support existing catalog images
that serve separate Bundle.dependencies and Bundle.properties fields
by translating the three legacy dependency types (olm.label,
olm.package, and olm.gvk) into their corresponding properties.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: c918a85eb7ef0c1ea58ebf27fabd8d2393afe9b3
@benluddy @ankitathomas
Use one HTTP server for healthz, metrics, and profiling.
0ffd805 
TLS can still be enabled via flags, but it now applies to all three
APIs since there is a single HTTP server per operator process.

The -profiling flag is deprecated and does nothing. The profiling APIs
are now always enabled, but they refuse to serve clients that do not
present a verifiable certificate (see the new flag -client-ca). This
effectively disables the profiling APIs when served over HTTP.

Co-authored-by: Vu Dinh <vudinh@outlook.com>
Co-authored-by: Alexander Greene <agreene@redhat.com>
Signed-off-by: Ben Luddy <bluddy@redhat.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f9381e0ce8e0addeb1abf55d44146a5e6e57074a
@benluddy @ankitathomas
Remove unused trace log from LegacySyncHandler.
3e56985 
This line creates an info-level logger, writes a trace-level log to
it, and discards the logger reference. This looks like cruft and is
responsible for some heap churn.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8c8b18bacbc8033ef9d2a8847e730b3aa17247e6
@zcahana @ankitathomas
Add a catalog-operator flag to set opmImage
486d3e3 
Signed-off-by: Zvi Cahana <zvic@il.ibm.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 04b665cea41b2ee63bf89b5ca01712f1214f2a52
@zcahana @ankitathomas
Enable gzip compression when unpacking bundles to ConfigMap
efec3f4 
Signed-off-by: Zvi Cahana <zvic@il.ibm.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: fd344476b1d04b9439590c5fd0da81d7efc3b600
@zcahana @ankitathomas
Bump operator-registry to v1.17.5
8a57cb0 
Signed-off-by: Zvi Cahana <zvic@il.ibm.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 93ece2a5618ee578c918bf6e5e0ad57d536ad85c
@zcahana @ankitathomas
Regenerate mocks
35cf0b8 
Signed-off-by: Zvi Cahana <zvic@il.ibm.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: b393fc5a2a6371261c99cabb009266c95047d047
@zcahana @ankitathomas
Update test-scripts check to use go1.16
6dd5ebf 
Signed-off-by: Zvi Cahana <zvic@il.ibm.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7c481a1c43f999656953c380dcb35e4df3d27df3
@benluddy @ankitathomas
Explain unique replaces chain requirement in channel sort errors.
b1b8516 
The "multiple channel head" error that can be returned from channel
sorting has been a source of confusion for users. The error message
now explains that a unique replacement chain is required in order to
define the relative order between channel entries, and it also
provides an abbreviated list of all replacement chains identified, in
the form "head...tail" or "singleton".

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 639102545cb6faabe9a1f30970dffca93bfb058a
@benluddy @ankitathomas
Correctly omit skipped channel entries during resolution.
ca0b5fb 
A behavior was added with the intention of preventing the installation
of channel entries that are skipped by other entries, but in practice
it was omitting entries that were replaced by skipped entries.

This is fixed. There are now unit test cases and one higher-level test
for this behavior.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 0bb8c1ea9741071830711e3517f39e264f561154
@benluddy @ankitathomas
Fix ClusterOperator selector for excluding copied CSVs.
2c71375 
The function that generated the selector had been returning a selector
that matches everything. There was no functional impact because
there's an additional client-side filter that discards objects based
on CSV.IsCopied().

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 0f58a2c7d78cceb22e8ccf6b3b00c1520987a7d4
@benluddy @ankitathomas
Don't cache copied CSVs in the controller-runtime-based controllers.
68faeb6 
Only the main controller (i.e., the controller responsible for
reconciling ClusterServiceVersions) needs to watch copied
ClusterServiceVersions. The OperatorCondition and Operator controllers
-- which coincidentally maintain separate caches -- are not interested
in copied CSVs, so all copied CSVs can be excluded via from their
cache using a label selector.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: e641e7695c944b3a1eef6ce425cd748f2843ddc9
@anik120 @ankitathomas
feat(sub): Include IP failure condition message in sub status condition
f9373b4 
Currently when an InstallPlan fails, due to bundle unpacking error
is pending due to errors like invalid operatorgroup, or pending bundle unpacking job
the reason is propagated to the Subscription that owns it. The message for the failure is
however missing from the Subscription condition.

eg

```
kind: Subscription
status:
conditions:
    - lastTransitionTime: "2021-07-07T17:55:20Z"
      reason: Installing
      status: "True"
      type: InstallPlanPending
```

This PR propagates the message assosiated with the reason in the InstallPlan
condition when an InstallPlan is either pending, or has failed permanantly.

eg

```
kind: Subscription
status:
conditions:
    - lastTransitionTime: "2021-07-07T17:55:20Z"
      message: no operator group found that is managing this namespace
      reason: Installing
      status: "True"
      type: InstallPlanPending
```

Signed-off-by: Anik Bhattacharjee <anikbhattacharya93@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 303608dbe3c9cbfe4679bafc43a6acafea9f7e9e
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2021
@ankitathomas
Copy link
Copy Markdown
Contributor Author

ankitathomas commented Jul 19, 2021

/retest

2 similar comments
@ankitathomas
Copy link
Copy Markdown
Contributor Author

ankitathomas commented Jul 19, 2021

/retest

@davegord
Copy link
Copy Markdown

davegord commented Jul 19, 2021

/retest

@davegord
Copy link
Copy Markdown

davegord commented Jul 20, 2021

/retest

1 similar comment
@davegord
Copy link
Copy Markdown

davegord commented Jul 20, 2021

/retest

@njhale
Copy link
Copy Markdown
Contributor

njhale commented Jul 20, 2021

Can we also include commits introduced by operator-framework/operator-lifecycle-manager#2270?

@kevinrizza
Copy link
Copy Markdown
Member

kevinrizza commented Jul 20, 2021

/retest

ecordell and others added 3 commits July 20, 2021 09:07
@ecordell @ankitathomas
add a resolver test for completely disjoint graphs within a channel
5a1a092 
Signed-off-by: Evan <cordell.evan@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 48115e0f7fce4beb9f50d2d7fd7e2f59380186f8
@awgreene @ankitathomas
Update extractMessage func
d812b5e 
Whe building the subscription condition message,
check if the status of the InstallPlan is available
before iterating through bundle lookup conditions.
Also update string returned to include spaces between
multiple messages.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 804875c45c6337d95313f7e4a68982c77e30f614
@njhale @ankitathomas
fix(openshift): handle unquoted short max versions
1c53232 
Add special handling for version shorthand commonly used in pipelines
for Red Hat operator catalogs. Allows unquoted short versions to be used
when specifying an operator's compatibility with versions of OpenShift;
e.g. "olm.maxOpenShiftVersion": 4.8. Without this, OLM will only
recognize quoted maxOpenShiftVersion properties; e.g. "olm.maxOpenShiftVersion": "4.8".

Signed-off-by: Nick Hale <njohnhale@gmail.com>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1ebebdb37af7c64b800ff7ec3a04ddd0cccc2de7
benluddy and others added 5 commits July 20, 2021 17:06
@benluddy @ankitathomas
Use metadata-only watches when possible for Operator component APIs.
30e7e50 
The Operator adoption controller reads metadata.ownerReferences and
metadata.labels to adopt Operator components, and the Operator
controller itself maintains a list of component references in
status.components.refs. For APIs without a status.conditions field,
these references are equivalent to v1 ObjectReferences, and can be
constructed using only the component's metadata. For APIs that do have
a status.conditions field, the references are augmented with that
information.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 608d6bf1991cdc671a94848e884290a4bc4d9804
@ecordell @ankitathomas
remove unused scripts
956e873 
kube_deps is not used for pinning kube dependencies anymore
the other scripts were used for older ways that olm integrated with
openshift and are no longer needed

Upstream-repository: operator-lifecycle-manager
Upstream-commit: d918d71be9c8b752f3172b08e4c993823df95767
@benluddy @ankitathomas
Temporarily use controller-runtime fork with data race patch.
c127978 
This should unblock our use for metadata-only watches for the
moment.

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

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 9d14698a1330c690d6960f89d6b4db0571001194
@ankitathomas
chore: update manifests
cc3034d
@ankitathomas
update olm and catalog operator ports
659f9b6
@ankitathomas ankitathomas force-pushed the sync branch 2 times, most recently from c2211ae to 31420eb Compare July 20, 2021 21:35
@awgreene awgreene mentioned this pull request Jul 20, 2021
Closed
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 20, 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 Rerun command
ci/prow/e2e-upgrade 2a8db15 link /test e2e-upgrade
ci/prow/e2e-aws-olm 2a8db15 link /test e2e-aws-olm
ci/prow/e2e-gcp 2a8db15 link /test e2e-gcp
ci/prow/e2e-aws-console-olm 2a8db15 link /test e2e-aws-console-olm

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.

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

@dinhxuanvu dinhxuanvu Awaiting requested review from dinhxuanvu

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@ankitathomas @awgreene @davegord @njhale @kevinrizza @joelanford @benluddy @zcahana @anik120 @ecordell