Skip to content

Sync upstream commits to the 4.11 release branch #269

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

Merged
merged 123 commits into from
Mar 25, 2022

Conversation

timflannagan
Copy link
Contributor

Follow up to #267 which is running into some stale checks not disappearing from the github status.

joelanford and others added 30 commits March 10, 2022 11:36
…thub/workflows/release.yaml

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: a629d38a2273aa0cd43b7f06702c8c631401f30c
Upstream-repository: operator-registry
Upstream-commit: 3c2677ea67da9bb96d9f1db9e45dd4e46b81dd8e
This PR bumps operator-framework/api to v0.11.0

Signed-off-by: Anik Bhattacharjee <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: acaac87c522f1826dce8669eb9108ccacc73af75
In PR openshift#888, there's vendoring of the cel-go package, one of which
is named "debug" (github.com/google/cel-go/common/debug). Due to
the .gitignore file ignoring all [Dd]bug folders, the vendored
package isn't being checked in by git, causing the build to fail.
This PR removes the instruction to ignore [Dd]bug/ folders.

Signed-off-by: Anik Bhattacharjee <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 7a09b48dba29e8d063916f276740a1d737b40121
…openshift#888)

* feat(constraint): Add constraint type validation to bundle validation

A new type of dependency named constraint (olm.constraint) which uses
CEL expression is introduced in OLM. This new type is added to
dependencies.json file in the bundle just like gvk and package
dependencies. As a result, a new validation for constraint type
is added to ensure this type will be validated for bundle
dependencies.

Signed-off-by: Vu Dinh <[email protected]>

Vendor the constraints pkg from api repo

Signed-off-by: Vu Dinh <[email protected]>

* Add unit test for cel-go constraint validation

Signed-off-by: Vu Dinh <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 384af6b9235dc718268cb3e148a8c5f2c58e64bc
Updating for reader experience.

Signed-off-by: Shivkumar13 <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 611525be3bd7374d1e55d43c519e5664e0e91c2c
This commit bumps operator-framework/operator-registry requirement
go-sqlite3 from v1.10.0 to v1.14.10

Signed-off-by: Noah Sapse <[email protected]>

Co-authored-by: Noah Sapse <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 4e3865a5cf1a2b1048d3752071ae1e932953f29c
…ift#897)

* feat(registry): add podman auth.json as an alternate location

Adds podman default credential location as an alternate location
when loading the config for containerd registry resolver

Signed-off-by: Jennifer Power <[email protected]>

* fix: remove named return values in resolver and add xdg library for cross-platform option

Signed-off-by: Jennifer Power <[email protected]>

* fix: update go.sum for with new xdg import

Signed-off-by: Jennifer Power <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: c056ac1f075b38031263893758fcfe6c96dcee79
Move the `opm alpha generate` command up to `opm generate`

Signed-off-by: kevinrizza <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: d69d2e41d74c16806fbc7b1ebd516ea6723f04f8
Upstream-repository: operator-registry
Upstream-commit: 3fa02bc295358a6e3259a1da11bfa35c89e58898
…Only mode (openshift#905)

opm diff in headsOnly mode with an include config will prune all empty channels
from a package which can leave the output config with an empty package. This change
will remove any empty packages after the channel pruning.

Fixes openshift#904

Signed-off-by: Jennifer Power <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: f7e27734f3a633ec03e55779317dd1af4d2cfd0a
…fy (openshift#898)

* fix(registry): deprecated skip-tls and add use-http and skip-tls-verify

The skip-tls flag currently uses HTTP instead of the expected behavior of skipping
TLS cert validated with HTTPS registries. The new flags seperate untrusted HTTPS from
HTTP registries and behave as expected

Signed-off-by: Jennifer Power <[email protected]>

* chore: add helper function to validate and get TLS options for opm command

Signed-off-by: Jennifer Power <[email protected]>

* chore: add warning message for plain HTTP in registy add command

Signed-off-by: Jennifer Power <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 354cd385167844295a3288b5a8e7fb5efb9e652b
…onfigs (openshift#914)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 0b008deff332346247624ccc54df64b75cfe9777
…ontents (openshift#915)

Signed-off-by: Joe Lanford <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 7827c48d1a09fe320af46afe5e19491784b7f89e
Signed-off-by: Ankita Thomas <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: d59081db05ae040ebacf74f3ccfefd3bbdd9cdca
Signed-off-by: akihikokuroda <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 5566e4b6832a7fc08c12d3c79fc0a0b8c6a2e7aa
* Upgrade github.com/docker/cli to v20.10.12

Signed-off-by: Jan Boehm <[email protected]>

* Synchronize docker config loading

This prevents data races during testing. The root cause
are unsecured globals in the docker cli lib.

Signed-off-by: Jan Boehm <[email protected]>

* Mention upstream issue that fixes the data race

Signed-off-by: Jan Boehm <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: c496cf028568091b18633a9ee59dadcc6d4b4edb
This commit updates the operator-registry's go version
to v1.17.

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: c970d617ce2d77c096102e2d881a15ef680bacf9
Signed-off-by: akihikokuroda <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 5c3f4a3a3365c6684f78a3617e4cfc650bec73e3
…#908 (openshift#909)

Signed-off-by: Ryan Emerson <[email protected]>
Upstream-repository: operator-registry
Upstream-commit: 9999f79682d0073bf9ed5edf2cca1476abf2fc9a
This commit introduces a series of unit tests
that ensure that GRPC connections are configurable
through the use of the GRPC_PROXY environment
variable.

Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a68dc4262ccb41cc6031ab4ef3823f6ce1713036
…r init hooks (#2523)

Signed-off-by: Per G. da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b414e6e881066115b4c5dc63840e8d47c624a405
Prepend the https://github.com to ensure that markdown rendered links
are not resolved as local links.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: bfe8f0f5339c03c4f1ac08ca343b0a5ab28a787a
…(#2463)

Update any relevant workflows and downgrade the checkouts action from
the v2 to v1 version. This change is predicated on the problematic
checkouts@v2 behavior that can lead to an increased change of regressing
when landing changes to the default branch (e.g. master/main). This is
because there's an existing bug in the v2 world where PRs can checkout
the wrong HEAD commit, leading to scenarios where you're testing against
an out-of-date commit compared to what's in the master branch.

A concrete use case is when a PR is opened, and that PR checks out the
current HEAD commit from master, and then a change lands in the master
branch, and any subsequent workflow retries for that PR will result in
that previous HEAD commit being checked out. There are workarounds that
exist, like rebasing the existing PR, or like explicitly pointing the
ref to the default branch, but this interaction isn't ideal with workflows
are triggered on pushes to branches on top of reacting to pull request
triggers. The simplest solution is to revert back to the v1 version and
find a better longer term solution.

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: a2142c1c3b38bd7f0d2a6fb57d6ffdf5e5434604
Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 3f3f00644ca4a50d845db2b97c12afcea56fd5d8
Signed-off-by: Vu Dinh <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4daeb114ccd56cee7132883325da68c80ba70bed
Run the e2e GitHub workflow against master periodically, twice per day,
at 00:30 and 12:30 ET.

Signed-off-by: Nick Hale <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 86a7f54652ecb2fdcc40404cb6afa1660f677ef6
Signed-off-by: Alexander Greene <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: c6cc1d7f706d355e34b1fc6523693bc13ceb4650
* Introduce golangci-lint support

Introduce a root .golangci-lint.yaml file to the repository. This file
is responsible for housing the golangci-lint configuration, and the
various aggregate linters that are enabled/disabled.

Signed-off-by: timflannagan <[email protected]>

* .github/workflows: Run the golangci-lint action during the sanity checks

Update the sanity workflow and add the golangci-lint action.

Signed-off-by: timflannagan <[email protected]>

* Fix linting violations outlined by golangci-lint

Signed-off-by: timflannagan <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: b3cded1d82f74feb0879ccc68abc1388c6ca4e70
Signed-off-by: Per G. da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: bee0b688521e79a1bba8c2b3463a13a33ae7cd59
perdasilva and others added 8 commits March 25, 2022 12:12
Signed-off-by: perdasilva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 39cbdcdc8ab34486abdf41a06929b796d5af61fe
* Refactor catalog source e2e tests to unique namespaces

Signed-off-by: perdasilva <[email protected]>

* e2e: Ensure the CatalogSource resource created in the global catalog test is deleted

Signed-off-by: timflannagan <[email protected]>

Co-authored-by: perdasilva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 14c0b96f15368cf8f4e80a93f6b05810f9c18200
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: befd9657cc7ae761ce2e249364baa6d69b7c1d40
…copied CSVs

Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: d02ab0e4270a7011ad4db740995bc4dde62b3323
…ogSource

Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 360415903b0efa1cdbaa0b1f995e5d24690646b4
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: c970cc65fdc51680bf5a301c32490a4de622c655
Signed-off-by: perdasilva <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: fbbda251504e38bca9512f26b01d1b272bd66376
Signed-off-by: timflannagan <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: f2a3f260d068f5309fe1ec9bdb97c31f31c0d5ed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

[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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 25, 2022
@timflannagan
Copy link
Contributor Author

The (upcoming) e2e suite failure appears to be a flake centered around poor testing assumptions:

Unexpected error:
<*errors.StatusError | 0xc00123aaa0>: {
ErrStatus: {
TypeMeta: {Kind: "", APIVersion: ""},
ListMeta: {
SelfLink: "",
ResourceVersion: "",
Continue: "",
RemainingItemCount: nil,
},
Status: "Failure",
Message: "Operation cannot be fulfilled on subscriptions.operators.coreos.com \"mysubscription\": the object has been modified; please apply your changes to the latest version and try again",
Reason: "Conflict",
Details: {
Name: "mysubscription",
Group: "operators.coreos.com",
Kind: "subscriptions",
UID: "",
Causes: nil,
RetryAfterSeconds: 0,
},
Code: 409,
},
}
Operation cannot be fulfilled on subscriptions.operators.coreos.com "mysubscription": the object has been modified; please apply your changes to the latest version and try again
occurred

@timflannagan
Copy link
Contributor Author

/retest-required

2 similar comments
@timflannagan
Copy link
Contributor Author

/retest-required

@timflannagan
Copy link
Contributor Author

/retest-required

@timflannagan
Copy link
Contributor Author

Note: the verify check is expected to fail as we ran into issues with drift after backporting BZs to the release-4.10 branch.

@kevinrizza
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2022
@timflannagan
Copy link
Contributor Author

/override ci/prow/verify

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@timflannagan: Overrode contexts on behalf of timflannagan: ci/prow/verify

In response to this:

/override ci/prow/verify

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.

@timflannagan
Copy link
Contributor Author

It looks like the e2e-upgrade test largely passed outside of a single flake, and I haven't seen any evidence in this PR (or the previous two sync PRs) that indicate there's a legitimate upgrade failure. Manually overriding that check once the cluster deprovisions.

@timflannagan
Copy link
Contributor Author

/override ci/prow/e2e-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@timflannagan: Overrode contexts on behalf of timflannagan: ci/prow/e2e-upgrade

In response to this:

/override ci/prow/e2e-upgrade

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-merge-robot openshift-merge-robot merged commit d5f87aa into openshift:master Mar 25, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

@timflannagan: all tests passed!

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.

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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.