Skip to content

Sync remaining API and operator-registry 4.10 commit(s) downstream #217

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.

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

Closed

Conversation

timflannagan
Copy link
Contributor

Follow-up to #213 that includes the latest API and operator-registry commits.

camilamacedo86 and others added 2 commits November 30, 2021 10:29
…enshift#156)

* feat: add new validator to only check the usage of deprecate apis

* applying review sugesstions

Upstream-repository: api
Upstream-commit: e2541569a535e6421048bfaee00b781bb3dc092f
* add SA field to config

Signed-off-by: Ish Shah <[email protected]>

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

Co-authored-by: Joe Lanford <[email protected]>

Upstream-repository: api
Upstream-commit: 179663555651895b714e51a56dc0461fbc197235
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 30, 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

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 anik120 and exdx November 30, 2021 17:46
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 30, 2021
kevinrizza and others added 24 commits November 30, 2021 12:58
OLM is unable to properly handle the case where a bundle author
explicitly adds a hardcoded reference to a service account with a name
that matches the name of the service account defined by the deployment
spec in the CSV. This commit adds a validation method to ensure that the
name of the service account in a bundle does not match
deployment.Spec.Template.Spec.ServiceAccountName in the csv's spec

Upstream-repository: api
Upstream-commit: 0fe04f80e0102dc6973109a221a7babd6bee005e
…openshift#161)

Signed-off-by: Eric Stroczynski <[email protected]>

Upstream-repository: api
Upstream-commit: cdabf11822cbff3914e444ab6e30b8145a0a9b6a
Signed-off-by: Eric Stroczynski <[email protected]>

Upstream-repository: api
Upstream-commit: 242f6fd9ceef190bf9250e5ac431057a7f3f32b9
Signed-off-by: Camila Macedo <[email protected]>

Upstream-repository: api
Upstream-commit: dd58de2b37096fb5fcd8b5538cf58cfc811b113a
Upstream-repository: api
Upstream-commit: 37561c93045eee6044ae4748d3aea29fae5b09f8
The tag that configures the serialization of the ServiceAccount field
for the Scorecard configuration incorrectly names the field
"string", which results in the `serviceaccount` field being empty after
unmarshalling, therefore being ignored.
Update the tag to name the field `serviceaccount`

Upstream-repository: api
Upstream-commit: 3e95d2c8cdd80dbf68f09a7647601239904d20fd
* fix: clarifies message error regards service account

* apply suggestions

Upstream-repository: api
Upstream-commit: f579141ce61d8bb7c4dc7c06169bc436ac4b9703
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 195bc038d915b8f65f1c4a1ebbcd82865aac4d23
openshift#716)

Signed-off-by: Eric Stroczynski <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 3880486cea2b836248e7a91c3db6dcf513c6db12
…rom disk (openshift#783)

* opm serve: pre-compute and store api.Bundles to disk; read from disk when serving

Signed-off-by: Joe Lanford <[email protected]>

* fix tests

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 9c330a2148230bf1f6952a544a18648becff393a
https://github.com/openshift/api/blob/a99ffa1cac6709edf8f502b16890b16f9a557e00/console/v1/types_console_yaml_sample.go

Signed-off-by: James Hewitt <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0ea069ec52fcc125378e2976be8a562bcb632e72
…el with opm deprecatetruncate (openshift#780)

* fix: Unable to deprecate bundles that are head of a NOT default channel with opm deprecatetruncate

Signed-off-by: Camila Macedo <[email protected]>

* add test to ensure that the bundles are deprecated when the head is not the pkg default

Signed-off-by: Camila Macedo <[email protected]>

(test): check that allows deprecate when the channel is not the default head

Signed-off-by: Camila Macedo <[email protected]>

* removing uncessary manifests from the mock testdata

Signed-off-by: Camila Macedo <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: ed832fdc625e8d816023ae4a88e6ca7e90e86858
Signed-off-by: Eric Stroczynski <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 8d805a29f6f25322ab6d0548f51e9c0337e9ba57
Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: d21bd8fe171b92b35b851835f358d869233ccd66
…t#786)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: d538a7910e1ba67b745e9d681c1a092b094708c3
* do not add skips/replaces entries for deprecated bundles

Signed-off-by: Ankita Thomas <[email protected]>

* remove overwritten channel head before add in overwrite-latest mode - preserve upgrade graph after add

Signed-off-by: Ankita Thomas <[email protected]>

* handle branchpoint deprecation

Remove deprecated bundles from channels of the deprecated bundles,
truncating only when a bundle is not on any channel. Branchpoints (i.e,
branches that have two or more different replacements on different
channels) are removed from any channel that the deprecated bundle was
on, while everything till the first branch point is truncated

Signed-off-by: Ankita Thomas <[email protected]>

* fix unit tests, add function documentation

Signed-off-by: Ankita Thomas <[email protected]>

* remove deprecated channel heads on package delete, simplify populator signature

Signed-off-by: Ankita Thomas <[email protected]>

* optional interface for RemoveOverwrittenChannelHead

Signed-off-by: Ankita Thomas <[email protected]>

* comment changes

Signed-off-by: Ankita Thomas <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 38994ece779c79a6b238cff667810892c6df0d4e
…logs (openshift#770)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: c7f37721942eb2cce7530cde6cd19debff548fab
Cgo is required to use SQLite databases, otherwise it fails with the following error:

Binary was compiled with 'CGO_ENABLED=0', go-sqlite3 requires cgo to work. This is a stub

Closes openshift#792

Signed-off-by: Jonathan Gonzalez V <[email protected]>
Signed-off-by: Marco Nenciarini <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 37551d4db948ba5140a8e5da7786cb2e10f4bd31
…ined (openshift#797)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 829551e57c47fda759f1d53988438d84d66835e1
…t#796)

Downloads the proper grpc_health_probe binary for the build
architectures during the release process.

Closes openshift#795

Signed-off-by: Jonathan Gonzalez V <[email protected]>
Signed-off-by: Marco Nenciarini <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 943a9a110ef938e26ec9d15a4a9724fb0601c51e
* clarify pruned bundle message

Signed-off-by: Ankita Thomas <[email protected]>

* check only newly added bundles for pruning

Signed-off-by: Ankita Thomas <[email protected]>

* update tests, remove deprecation check on added bundles

Signed-off-by: Ankita Thomas <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 2ef669fa19baaeb7dce3252d5d3e29ecaf59f753
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 5ac5c52145f04f1c0f881780878b226ce7b487da
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 09043b49a6d19de18d6dfef6060b7c24ac313a27
Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0b5ff79a4c423de4b55d699bb5b8e7e81c994a5a
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2021
@timflannagan
Copy link
Contributor Author

timflannagan commented Nov 30, 2021

Warning alerts being fired in the gcp e2e test:

alert CertifiedOperatorsCatalogError fired for 1800 seconds with labels: {container="catalog-operator", endpoint="https-metrics", exported_namespace="openshift-marketplace", instance="10.129.0.30:8443", job="catalog-operator-metrics", name="certified-operators", namespace="openshift-operator-lifecycle-manager", pod="catalog-operator-79ffcfb545-vpshv", service="catalog-operator-metrics", severity="warning"}
alert CommunityOperatorsCatalogError fired for 1800 seconds with labels: {container="catalog-operator", endpoint="https-metrics", exported_namespace="openshift-marketplace", instance="10.129.0.30:8443", job="catalog-operator-metrics", name="community-operators", namespace="openshift-operator-lifecycle-manager", pod="catalog-operator-79ffcfb545-vpshv", service="catalog-operator-metrics", severity="warning"}
alert RedhatMarketplaceCatalogError fired for 1800 seconds with labels: {container="catalog-operator", endpoint="https-metrics", exported_namespace="openshift-marketplace", instance="10.129.0.30:8443", job="catalog-operator-metrics", name="redhat-marketplace", namespace="openshift-operator-lifecycle-manager", pod="catalog-operator-79ffcfb545-vpshv", service="catalog-operator-metrics", severity="warning"}
alert RedhatOperatorsCatalogError fired for 1800 seconds with labels: {container="catalog-operator", endpoint="https-metrics", exported_namespace="openshift-marketplace", instance="10.129.0.30:8443", job="catalog-operator-metrics", name="redhat-operators", namespace="openshift-operator-lifecycle-manager", pod="catalog-operator-79ffcfb545-vpshv", service="catalog-operator-metrics", severity="warning"}

@timflannagan
Copy link
Contributor Author

Warning alerts firing in the upgrade test:

alert RedhatOperatorsCatalogError pending for 513.8819999694824 seconds with labels: {container="catalog-operator", endpoint="https-metrics", exported_namespace="openshift-marketplace", instance="10.130.0.36:8443", job="catalog-operator-metrics", name="redhat-operators", namespace="openshift-operator-lifecycle-manager", pod="catalog-operator-79ffcfb545-z9cnd", service="catalog-operator-metrics", severity="warning"}
...
alert KubePodNotReady pending for 172.88199996948242 seconds with labels: {namespace="openshift-marketplace", pod="community-operators-ckvqn", severity="warning"}

@openshift-bot
Copy link
Contributor

/retest-required

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

@timflannagan
Copy link
Contributor Author

Holding so the bot doesn't blindly retest.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2021
@timflannagan
Copy link
Contributor Author

Running into an issue where catalogsources are stuck in IDLE last observed states leaving to e2e timeouts being reached. The immediate guess is the bump in the Go grpc client in ed34489 so I opened #218 as a result.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 30, 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 c6a17ab link true /test e2e-aws-olm
ci/prow/e2e-gcp c6a17ab link true /test e2e-gcp
ci/prow/e2e-aws-console-olm c6a17ab link true /test e2e-aws-console-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.

@timflannagan
Copy link
Contributor Author

closing as #218 merged which includes all the commits in this PR except for the registry grpc bump.

@timflannagan timflannagan deleted the sync/11-30-and-registry branch December 2, 2021 03:08
awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 2, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>

Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
awgreene pushed a commit to awgreene/operator-framework-olm that referenced this pull request Feb 22, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>

Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 1, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 2, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 4, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 7, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 8, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 9, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 10, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
perdasilva pushed a commit to perdasilva/operator-framework-olm that referenced this pull request Mar 12, 2022
openshift#217)

Signed-off-by: Tyler Slaton <[email protected]>
Upstream-repository: api
Upstream-commit: 82aa2d40a842d73d317298585c2fcca1e45b3553
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.