NO-ISSUE: Synchronize From Upstream Repositories #753
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using a symlink to point inside the staging directories seems to confuse
newer versions of sigs.k8s.io/controller-tools.
Specifically, the set up of a temporary directory for controller-gen
uses a symlink into staging/api, which confuses _something_ in golang
to use ${ROOT}/staging/api/go.mod rather than ${ROOT}/go.mod, causing
it to return errors that indicate go.mod inconsistencies with
vendor/modules.txt. This would normally be fixable via the `go mod`
commands, but looking at the wrong go.mod is not a normal situation.
Signed-off-by: Todd Short <[email protected]>
Signed-off-by: Todd Short <[email protected]>
* update go.mod to go 1.22 * update Dockerfile to use go v1.22.2 Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 01d4a00cadfeb59d9023d0a05105b84c43e2bbde
…source pods (#3206) * Refactor security context configuration in pod reconciler This change updates the logic for setting security contexts within the OLM pod reconciler. Now, it differentiates between 'Restricted' and 'Legacy' security contexts more explicitly. The 'Restricted' security context applies default security settings unless overridden, while the 'Legacy' context clears all security settings. When no security context is configured, it defaults to restricted. Additionally, the related tests have been updated to reflect these changes and ensure correct behavior. Signed-off-by: btofel <[email protected]> * Add checking of the namespace PSA restrictions Signed-off-by: btofel <[email protected]> * Fix linter issues Signed-off-by: btofel <[email protected]> Signed-off-by: Brett Tofel <[email protected]> * fixes Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: btofel <[email protected]> Signed-off-by: Brett Tofel <[email protected]> Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Brett Tofel <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 9b2802151528e556d78b5fe55bcb8c89070efe58
… CRD specifies a conversion strategy (#3209) * warn but allow CRD upgrade when validations fail but new CRD has conversion strategy Signed-off-by: everettraven <[email protected]> * unexport validationError Signed-off-by: everettraven <[email protected]> * updating warning message to be more descriptive, add warning event on installplan Signed-off-by: everettraven <[email protected]> * update warning templ per review comments Signed-off-by: everettraven <[email protected]> --------- Signed-off-by: everettraven <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: c3e17741c5dde8d67203a9e34bba81c4ad2bddcd
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 157af3287d4c3138c54d503838e13581d9ab4ea8
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: b785bc73c9d4ac788277cdbe89d5d76dd2472f2f
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 66f857108f63864b9a4389f47d4e439ff4606ba7
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 3669b330e73aa722cc264239982ae7930644fcd4
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: b70e3008e234cf7adc3ae919cc04eeec0fa506b9
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 232cf32808e40049b61e0885059c5413ef56548f
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 39ff42ce60be647a9a2864523ca43ef5c7d6a5b4
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3 to 6. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v3...v6) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: ba748d882b4bfa6a7b4d5e0aa21d255bbe7b72b0
Bumps [sigs.k8s.io/kind](https://github.com/kubernetes-sigs/kind) from 0.20.0 to 0.22.0. - [Release notes](https://github.com/kubernetes-sigs/kind/releases) - [Commits](kubernetes-sigs/kind@v0.20.0...v0.22.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/kind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 4ad08817f0ca9d7138dcf9acc1d81e04862fc778
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.3 to 3.14.4. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.14.3...v3.14.4) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 51036b1d569ec46afbca4b6cc32c50b733fc10ff
Bumps [github.com/itchyny/gojq](https://github.com/itchyny/gojq) from 0.11.0 to 0.12.15. - [Release notes](https://github.com/itchyny/gojq/releases) - [Changelog](https://github.com/itchyny/gojq/blob/main/CHANGELOG.md) - [Commits](itchyny/gojq@v0.11.0...v0.12.15) --- updated-dependencies: - dependency-name: github.com/itchyny/gojq dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 2799d548afecab2850709340cd6bd365439c76b1
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 1a1d7fe9bc1a56d0c0f9da4cf73195ec9b1e784e
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: f0a6e56b31579f8cb7733cc8e126b51554c6d260
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v4...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 72b0467f7a4f136a90089d013ef8d36715193fe2
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: ef919fe5b18767d46e54b17ad0e2882499950271
* make go vet pass Signed-off-by: Per Goncalves da Silva <[email protected]> * add vet to makefile Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 1c406c2412eb4c73d3a48623751c9f942988d027
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: dd94b926bdebc86df45a53ceb4d6554db667cef2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](softprops/action-gh-release@v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: bbc1272a1344b899a69657e3c6880cb2de1406f8
Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 4 to 5. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](goreleaser/goreleaser-action@v4...v5) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 1ca61367663af06c8a3049512f507390a522b60e
…249) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 76022e98bfe3dfc98c66049226231f74e4741d2a
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.6.0 to 0.7.0. - [Commits](golang/sync@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-lifecycle-manager Upstream-commit: 69004bb7b591eea7f548d08c16e38d5ef09e409c
…ompatible to 2.8.3+incompatible (#3239) Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 1991a8f3756f884f1a715c871f9ed838e193a63e
Signed-off-by: Jordan Keister <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: a3069dbac54e1a2f90f1fc1b039169c912c8f6f7
… they break naming conventions (#3260) Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 3e0230e983397a49306f9f69c6a4561c28fbe67e
…39 to v1.41 (#3256) Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: d3afe92560091f35adbb4d1d2d07e7a7dee7f12e
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.19.0 to 0.20.0. - [Commits](golang/sys@v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: 08e226fe413cd8f4e300b9568eab5887748ead07
…1304) Bumps google.golang.org/protobuf from 1.34.0 to 1.34.1. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: 2c49e9cd4a8285b0ffd29a90484c4fcb6a54ff88
Signed-off-by: Jordan Keister <[email protected]> Upstream-repository: operator-registry Upstream-commit: 6bb0a3e9d60393e61992c0654bc663341c652ba0
* declcfg: concurrently load and process files in WalkMetasFS Signed-off-by: Joe Lanford <[email protected]> * pkg/cache: add preferred pogreb database cache impl * refactoring to avoid code duplication Signed-off-by: Joe Lanford <[email protected]> * pkg/cache: memory efficient cache building Signed-off-by: Joe Lanford <[email protected]> * cmd/opm/serve: improve logging related to caches Signed-off-by: Joe Lanford <[email protected]> --------- Signed-off-by: Joe Lanford <[email protected]> Upstream-repository: operator-registry Upstream-commit: 5b5181b46f0ef7e7d8c4ed4c64db3fdd4f5db373
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 26.1.1+incompatible to 26.1.2+incompatible. - [Commits](docker/cli@v26.1.1...v26.1.2) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: 8469f134d8103b29d3d85b47a042b842f9b7f15a
…1 (#1308) Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.30.0 to 5.30.1. - [Release notes](https://github.com/containers/image/releases) - [Commits](containers/image@v5.30.0...v5.30.1) --- updated-dependencies: - dependency-name: github.com/containers/image/v5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: cfe364cc4213a016e216542102662f60f92aa7ad
…309) Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.17.2 to 2.17.3. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.17.2...v2.17.3) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: 8e24c8820510a6d3890a561b1873c98deb7ebf3c
openshift-ci-robot
added
the
jira/valid-reference
|
@perdasilva: This pull request explicitly references no jira issue. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
@perdasilva: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-ecosystem. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: perdasilva 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 |
openshift-ci
bot
added
the
approved
|
/retest |
perdasilva
force-pushed
the
perdasilva/manual-sync-0524
branch
from
48a9725 to
ebf754b
Compare
Signed-off-by: Per Goncalves da Silva <[email protected]>
perdasilva
force-pushed
the
perdasilva/manual-sync-0524
branch
from
af05a5a to
dedec5d
Compare
Signed-off-by: Per Goncalves da Silva <[email protected]>
* patch flakes Signed-off-by: Per Goncalves da Silva <[email protected]> * Update test/e2e/subscription_e2e_test.go Co-authored-by: Mikalai Radchuk <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Mikalai Radchuk <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 161b89ca70027d720347ee9ce7729df4018584ba
Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 2334c05e256a8e6b3ac3790896745bd02e297e6d
* remove *_bare.sh scripts Signed-off-by: Per Goncalves da Silva <[email protected]> * remove *_local.sh scripts and related targets Signed-off-by: Per Goncalves da Silva <[email protected]> * remove wait and related targets and hang Dockerfile Signed-off-by: Per Goncalves da Silva <[email protected]> * remove unnecessary makefile targets Signed-off-by: Per Goncalves da Silva <[email protected]> * add golangci-lint to tools Signed-off-by: Per Goncalves da Silva <[email protected]> * refactor Makefile Refactor Makefile clean up build targets Signed-off-by: Per Goncalves da Silva <[email protected]> * bump gha golangci-lint version Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: c1b059af89d302d570e3a4c91ab41086d9712afe
* move orthogonal tools to bingo Signed-off-by: Per Goncalves da Silva <[email protected]> * update vendor Signed-off-by: Per Goncalves da Silva <[email protected]> * remove no longer needed Dockerfile.goreleaser Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 556637d4144fb782e93c207f55975b743ec2d419
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.19.0 to 0.20.0. - [Commits](golang/sys@v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Upstream-repository: operator-registry Upstream-commit: 08e226fe413cd8f4e300b9568eab5887748ead07
|
Looking at the last few commits: Also, avoid pulling in commits from |
|
Yup - all good ^^ With the sync process. Running it manually is the same as running it in the job right? Meaning, as long as I use the tool to pull in the commits, then everything should be ok, right? |
Signed-off-by: Per Goncalves da Silva <[email protected]>
|
/hold contains experimental commits |
openshift-ci
bot
added
the
do-not-merge/hold
|
@perdasilva: The following tests failed, say
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-sigs/prow 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:
This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.
/cc @openshift/openshift-team-operator-runtime
/cc @openshift/openshift-team-operator-ecosystem