Skip to content
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

OCPBUGS-31459: Synchronize From Upstream Repositories #97

Merged
merged 53 commits into from
Apr 30, 2024

Conversation

openshift-bot
Copy link

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-03-28 00:01:22 operator-framework/@8c9b4cd dtfranz UPSTREAM: : Add OpenShift specific files
2024-03-28 00:01:22 operator-framework/@c094da6 Alexander Greene UPSTREAM: : Drop commitchecker
2024-03-28 00:01:22 operator-framework/@274094b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-03-28 00:01:22 operator-framework/@7dd18a7 Mikalai Radchuk UPSTREAM: : update owners
2024-04-01 15:56:44 operator-framework/@f2afbda Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-04-29 14:23:23 operator-framework/@3f079c4 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-04-29 20:39:55 operator-framework/@2c86aca AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml

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

joelanford and others added 30 commits March 28, 2024 13:33
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.15 to 9.5.16.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.15...9.5.16)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lxml](https://github.com/lxml/lxml) from 5.1.0 to 5.2.0.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-5.1.0...lxml-5.2.0)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 0.6.1 to 1.0.0.
- [Release notes](https://github.com/actions/add-to-project/releases)
- [Commits](actions/add-to-project@v0.6.1...v1.0.0)

---
updated-dependencies:
- dependency-name: actions/add-to-project
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix catalog queries code blocks

Improve the formatting of the code blocks in the catalog queries
description list

* Fix typos

Fix typos called out in
operator-framework/operator-controller#696 (comment)
and
operator-framework/operator-controller#696 (comment).
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.16 to 9.5.17.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.16...9.5.17)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/operator-framework/operator-registry](https://github.com/operator-framework/operator-registry) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/operator-framework/operator-registry/releases)
- [Commits](operator-framework/operator-registry@v1.38.0...v1.39.0)

---
updated-dependencies:
- dependency-name: github.com/operator-framework/operator-registry
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Tayler Geiger <tayler@redhat.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Bumps [lxml](https://github.com/lxml/lxml) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-5.2.0...lxml-5.2.1)

---
updated-dependencies:
- dependency-name: lxml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add gci linter for import grouping

golangci-lint will now group imports in the following order:
- standard library
- 3rd party packages outside of our Github org
- packages from our Github org
- local imports from operator-controller

Signed-off-by: Tayler Geiger <tayler@redhat.com>

* Apply new gci group order linting

All imports should now be properly ordered according to the gci group
import rules.

Signed-off-by: Tayler Geiger <tayler@redhat.com>

---------

Signed-off-by: Tayler Geiger <tayler@redhat.com>
Adds an annotation to the App created for each extension indicating the bundle version, which can then be used on future reconciles to filter out older versions. This can be overridden by setting the UpgradeConstraintPolicy to 'Ignore'.

Signed-off-by: dtfranz <dfranz@redhat.com>
Co-authored-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/actions/add-to-project/releases)
- [Commits](actions/add-to-project@v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: actions/add-to-project
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [idna](https://github.com/kjd/idna) from 3.6 to 3.7.
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](kjd/idna@v3.6...v3.7)

---
updated-dependencies:
- dependency-name: idna
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Adam D. Cornett <adc@redhat.com>
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.17 to 9.5.18.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases)
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG)
- [Commits](squidfunk/mkdocs-material@9.5.17...9.5.18)

---
updated-dependencies:
- dependency-name: mkdocs-material
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* `HigherBundleVersion` allows upgrades which are not allowed in `ClusterExtension`.
  For example, it is possible to ugprade `Extension` from one major version to another.
* Existing `InMastermindsSemverRange` can be used instead
  reducing the amount of code to maintain a bit.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Bumps [regex](https://github.com/mrabarnett/mrab-regex) from 2023.12.25 to 2024.4.16.
- [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt)
- [Commits](mrabarnett/mrab-regex@2023.12.25...2024.4.16)

---
updated-dependencies:
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0.
- [Commits](golang/net@v0.22.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.7.1 to 10.8.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.7.1...10.8)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/vmware-tanzu/carvel-kapp-controller](https://github.com/vmware-tanzu/carvel-kapp-controller) from 0.50.2 to 0.51.0.
- [Release notes](https://github.com/vmware-tanzu/carvel-kapp-controller/releases)
- [Commits](carvel-dev/kapp-controller@v0.50.2...v0.51.0)

---
updated-dependencies:
- dependency-name: github.com/vmware-tanzu/carvel-kapp-controller
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
* map kapp conditions to Extension

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

* add Progressing condition

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

* remove changes to deprecation statuses

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

---------

Signed-off-by: Ankita Thomas <ankithom@redhat.com>
* We do not seem to use `FOCUS` and `E2E_FLAGS` in `Makefile`
* Remove envtest from e2e targets
We already have kind cluster setup scripted in `Makefile`
which includes correct configuration.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
…s `ClusterExtension` (#774)

* Add `ValidatingAdmissionPolicy`

To enforce package uniqueness across `ClusterExtension`

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

* Kustomize `ValidatingAdmissionPolicyBinding`

This is a workaround for kustomize issue where it does not prefix
`ValidatingAdmissionPolicy`'s name in `ValidatingAdmissionPolicyBinding`'s
field `spec.policyName`. This results in manifests which can still be
applied to a cluster, but the policy will not be working due to
broken policy binding.

These APIs are now stable in 1.30 so one might expect that Kustomize
will eventually support these by default. If this happens - we will
be able to remove this change.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

---------

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
* Replace one last CONTAINER_RUNTIME in make

* Workaround for podman for kind load
Bumps [platformdirs](https://github.com/platformdirs/platformdirs) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/platformdirs/platformdirs/releases)
- [Changelog](https://github.com/platformdirs/platformdirs/blob/main/CHANGES.rst)
- [Commits](platformdirs/platformdirs@4.2.0...4.2.1)

---
updated-dependencies:
- dependency-name: platformdirs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@openshift-bot openshift-bot changed the title OCPBUGS-31459: Synchronize From Upstream Repositories NO-ISSUE: Synchronize From Upstream Repositories Apr 30, 2024
@openshift-ci-robot openshift-ci-robot removed jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 30, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-03-28 00:01:22 operator-framework/@8c9b4cd dtfranz UPSTREAM: : Add OpenShift specific files
2024-03-28 00:01:22 operator-framework/@c094da6 Alexander Greene UPSTREAM: : Drop commitchecker
2024-03-28 00:01:22 operator-framework/@274094b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-03-28 00:01:22 operator-framework/@7dd18a7 Mikalai Radchuk UPSTREAM: : update owners
2024-04-01 15:56:44 operator-framework/@f2afbda Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-04-29 14:23:23 operator-framework/@3f079c4 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-04-29 20:39:55 operator-framework/@2c86aca AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml

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

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.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
@m1kola
Copy link
Member

m1kola commented Apr 30, 2024

/retitle OCPBUGS-31459: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OCPBUGS-31459: Synchronize From Upstream Repositories Apr 30, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 30, 2024
@openshift-ci-robot
Copy link

@openshift-bot: This pull request references Jira Issue OCPBUGS-31459, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.0) matches configured target version for branch (4.16.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-03-28 00:01:22 operator-framework/@8c9b4cd dtfranz UPSTREAM: : Add OpenShift specific files
2024-03-28 00:01:22 operator-framework/@c094da6 Alexander Greene UPSTREAM: : Drop commitchecker
2024-03-28 00:01:22 operator-framework/@274094b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-03-28 00:01:22 operator-framework/@7dd18a7 Mikalai Radchuk UPSTREAM: : update owners
2024-04-01 15:56:44 operator-framework/@f2afbda Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-04-29 14:23:23 operator-framework/@3f079c4 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-04-29 20:39:55 operator-framework/@2c86aca AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml

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

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.

@m1kola
Copy link
Member

m1kola commented Apr 30, 2024

There is still an issue with envtest setup:

unable to make sure store is initialized: unable to make sure base binaries dir exists: mkdir /.local: permission denied

Edit: Scratch that! I was looking at the old job link.

Copy link
Member

@m1kola m1kola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff seems reasonable.

/unhold
/approve
/lgtm

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2024
Copy link
Contributor

openshift-ci bot commented Apr 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: m1kola, openshift-bot

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

Copy link
Contributor

openshift-ci bot commented Apr 30, 2024

@openshift-bot: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit 1f77638 into openshift:main Apr 30, 2024
9 checks passed
@openshift-ci-robot
Copy link

@openshift-bot: Jira Issue OCPBUGS-31459: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31459 has been moved to the MODIFIED state.

In response to this:

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2024-03-28 00:01:22 operator-framework/@8c9b4cd dtfranz UPSTREAM: : Add OpenShift specific files
2024-03-28 00:01:22 operator-framework/@c094da6 Alexander Greene UPSTREAM: : Drop commitchecker
2024-03-28 00:01:22 operator-framework/@274094b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml
2024-03-28 00:01:22 operator-framework/@7dd18a7 Mikalai Radchuk UPSTREAM: : update owners
2024-04-01 15:56:44 operator-framework/@f2afbda Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-04-29 14:23:23 operator-framework/@3f079c4 Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-04-29 20:39:55 operator-framework/@2c86aca AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml

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

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.

@openshift-bot
Copy link
Author

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-olm-operator-controller-container-v4.17.0-202404302014.p0.g1f77638.assembly.stream.el9 for distgit ose-olm-operator-controller.
All builds following this will include this PR.

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. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet