Skip to content

OCPBUGS-38153,OCPBUGS-38155,OPRUN-3510: Synchronize From Upstream Repositories #135

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 58 commits into from
Sep 11, 2024

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Sep 11, 2024

The downstream repository has been updated through the following upstream commit:

Date Commit Author Message
2024-09-11 14:49:13 operator-framework/operator-controller@9491b59 Todd Short Downgrade from 1.22.7 to 1.22.5 (#1252)
upstream commit list

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2024-08-30 00:02:12 openshift/operator-framework-operator-controller@de07dac dtfranz UPSTREAM: : Add OpenShift specific files
2024-08-30 00:02:12 openshift/operator-framework-operator-controller@1ea0bd3 Alexander Greene UPSTREAM: : Drop commitchecker
2024-08-30 00:02:13 openshift/operator-framework-operator-controller@b707d7c 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-08-30 00:02:13 openshift/operator-framework-operator-controller@1b659a8 Mikalai Radchuk UPSTREAM: : update owners
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@3d5a478 Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@868725a Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@37f3bfb 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
2024-08-30 00:02:15 openshift/operator-framework-operator-controller@0f1acae Mikalai Radchuk UPSTREAM: : Enable Validating Admission Policy APIs downstream
2024-08-30 00:02:15 openshift/operator-framework-operator-controller@23e9ae2 Ilias Rinis UPSTREAM: : manifests: set required-scc for openshift workloads
2024-08-30 00:02:16 openshift/operator-framework-operator-controller@40e7e0b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
2024-08-30 00:02:16 openshift/operator-framework-operator-controller@1ba4dc4 everettraven UPSTREAM: : add everettraven to approvers+reviewers
2024-08-30 00:02:17 openshift/operator-framework-operator-controller@0033ca7 everettraven UPSTREAM: : add openshift kustomize overlay

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

trgeiger and others added 30 commits August 30, 2024 15:48
New preflight check that checks for either the presence of the "Webhook"
conversion strategy to pass, or checks for any incompatible changes
between served versions in the new CRD which, if found, causes failure..

Closes #1091

Signed-off-by: Tayler Geiger <tayler@redhat.com>
Both catalogs should have a package available for the label
selector to really demonstrate that it picks one of two
catalogs

Signed-off-by: Todd Short <tshort@redhat.com>
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](mkdocs/mkdocs@1.6.0...1.6.1)

---
updated-dependencies:
- dependency-name: mkdocs
  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 [certifi](https://github.com/certifi/python-certifi) from 2024.7.4 to 2024.8.30.
- [Commits](certifi/python-certifi@2024.07.04...2024.08.30)

---
updated-dependencies:
- dependency-name: certifi
  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 [pyquery](https://github.com/gawel/pyquery) from 2.0.0 to 2.0.1.
- [Changelog](https://github.com/gawel/pyquery/blob/master/CHANGES.rst)
- [Commits](gawel/pyquery@2.0.0...2.0.1)

---
updated-dependencies:
- dependency-name: pyquery
  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 [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.33 to 9.5.34.
- [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.33...9.5.34)

---
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>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Bingo will overwrite this, which can cause issues.

This reverts commit 1d64a4d.
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
This resource no longer exists in OLMv1

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
Signed-off-by: Todd Short <tshort@redhat.com>
Bumps [carvel.dev/kapp](https://github.com/carvel-dev/kapp) from 0.63.2 to 0.63.3.
- [Release notes](https://github.com/carvel-dev/kapp/releases)
- [Changelog](https://github.com/carvel-dev/kapp/blob/develop/.goreleaser.yml)
- [Commits](carvel-dev/kapp@v0.63.2...v0.63.3)

---
updated-dependencies:
- dependency-name: carvel.dev/kapp
  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>
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
* Remove reference to catalogd phase field

It's only in the docs.

Signed-off-by: Todd Short <tshort@redhat.com>

* Update docs/Tasks/adding-a-catalog.md

Co-authored-by: Jordan Keister <jordan@nimblewidget.com>

---------

Signed-off-by: Todd Short <tshort@redhat.com>
Co-authored-by: Jordan Keister <jordan@nimblewidget.com>
…ssible (#1175)

* update name validation patterns to match Kubernetes as closely as possible

Signed-off-by: everettraven <everettraven@gmail.com>

* remove duplicate channel name admission test

Signed-off-by: everettraven <everettraven@gmail.com>

---------

Signed-off-by: everettraven <everettraven@gmail.com>
Signed-off-by: yashoza19 <yoza@redhat.com>
* docs quickstart

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

* docs update

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

* update readme

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

---------

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
to fix bugs associated with insufficient permissions resulting
in halting reconciliation of all ClusterExtension and informer
sync errors not being reported via the ClusterExtension
status conditions.

Signed-off-by: everettraven <everettraven@gmail.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: everettraven <everettraven@gmail.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Adds API reference doc generation via github.com/elastic/crd-ref-docs, and adds make target + dependency to the Makefile so we can ensure the document is always up-to-date.

Signed-off-by: dtfranz <dfranz@redhat.com>
* Document minimal catalog selection

Signed-off-by: Brett Tofel <btofel@redhat.com>

* Update docs/drafts/controlling-catalog-selection.md

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>

* Update docs/drafts/controlling-catalog-selection.md

Co-authored-by: Joe Lanford <joe.lanford@gmail.com>

* Update docs/drafts/controlling-catalog-selection.md

* Update docs/drafts/controlling-catalog-selection.md

* Rest of redhat -> example

Signed-off-by: Brett Tofel <btofel@redhat.com>

* Add upstream ref about labels & selectors

This commit adds a reference to the Kubernetes documentation on working with labels and selectors. It provides more context and resources for understanding catalog selection mechanisms.

Signed-off-by: Brett Tofel <btofel@redhat.com>

---------

Signed-off-by: Brett Tofel <btofel@redhat.com>
Co-authored-by: Joe Lanford <joe.lanford@gmail.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com>
@grokspawn
Copy link
Contributor

#135 (comment)
I didn't find any refs to these groups in openshift/release... not sure where they are coming from...

@@ -299,6 +299,15 @@ quickstart: $(KUSTOMIZE) manifests #EXHELP Generate the installation release man

##@ Docs

.PHONY: crd-ref-docs
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to add a downstream carry to drop this commit/goal and docs/drafts?

Copy link
Member

Choose a reason for hiding this comment

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

yes, I do not any-other way to drop this change from downstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe, after this merges.

@tmshort
Copy link
Contributor Author

tmshort commented Sep 11, 2024

I didn't find any refs to these groups in openshift/release... not sure where they are coming from...

They are coming from the bumper itself.

@tmshort
Copy link
Contributor Author

tmshort commented Sep 11, 2024

/override ci/prow/openshift-e2e-aws-techpreview

Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

@tmshort: tmshort unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file, and the following github teams:openshift: openshift-release-oversight openshift-staff-engineers.

In response to this:

/override ci/prow/openshift-e2e-aws-techpreview

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.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 11, 2024
@everettraven
Copy link
Contributor

/approved

/override ci/prow/openshift-e2e-aws-techpreview

@grokspawn
Copy link
Contributor

/approve
/lgtm

@everettraven
Copy link
Contributor

/approve

Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

@everettraven: Overrode contexts on behalf of everettraven: ci/prow/openshift-e2e-aws-techpreview

In response to this:

/approved

/override ci/prow/openshift-e2e-aws-techpreview

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.

Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

@tmshort: 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-sigs/prow repository. I understand the commands that are listed here.

Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, grokspawn, LalatenduMohanty, tmshort

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 Sep 11, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit d0d7706 into openshift:main Sep 11, 2024
9 checks passed
@tmshort tmshort deleted the synchronize branch September 11, 2024 17:32
@tmshort
Copy link
Contributor Author

tmshort commented Sep 11, 2024

/cc @openshift/openshift-team-operator-framework

Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

@tmshort: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @openshift/openshift-team-operator-framework

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.

@grokspawn
Copy link
Contributor

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-operator-controller
This PR has been included in build ose-olm-operator-controller-container-v4.18.0-202409112312.p0.gd0d7706.assembly.stream.el9.
All builds following this will include this PR.

@grokspawn
Copy link
Contributor

grokspawn commented Sep 12, 2024

/retitle OPRUN-3510: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Synchronize From Upstream Repositories OPRUN-3510: Synchronize From Upstream Repositories Sep 12, 2024
@everettraven
Copy link
Contributor

everettraven commented Sep 16, 2024

/retitle OCPBUGS-38153,OCPBUGS-38155,OPRUN-3510: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title OPRUN-3510: Synchronize From Upstream Repositories OCPBUGS-38153,OCPBUGS-38155,OPRUN-3510: Synchronize From Upstream Repositories Sep 16, 2024
@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-38153: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-38155: All pull requests linked via external trackers have merged:

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

In response to this:

The downstream repository has been updated through the following upstream commit:

Date Commit Author Message
2024-09-11 14:49:13 operator-framework/operator-controller@9491b59 Todd Short Downgrade from 1.22.7 to 1.22.5 (#1252)
upstream commit list

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2024-08-30 00:02:12 openshift/operator-framework-operator-controller@de07dac dtfranz UPSTREAM: : Add OpenShift specific files
2024-08-30 00:02:12 openshift/operator-framework-operator-controller@1ea0bd3 Alexander Greene UPSTREAM: : Drop commitchecker
2024-08-30 00:02:13 openshift/operator-framework-operator-controller@b707d7c 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-08-30 00:02:13 openshift/operator-framework-operator-controller@1b659a8 Mikalai Radchuk UPSTREAM: : update owners
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@3d5a478 Brett Tofel UPSTREAM: : Add pointer to tooling README
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@868725a Mikalai Radchuk UPSTREAM: : Disable Validating Admission Policy APIs downstream
2024-08-30 00:02:14 openshift/operator-framework-operator-controller@37f3bfb 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
2024-08-30 00:02:15 openshift/operator-framework-operator-controller@0f1acae Mikalai Radchuk UPSTREAM: : Enable Validating Admission Policy APIs downstream
2024-08-30 00:02:15 openshift/operator-framework-operator-controller@23e9ae2 Ilias Rinis UPSTREAM: : manifests: set required-scc for openshift workloads
2024-08-30 00:02:16 openshift/operator-framework-operator-controller@40e7e0b AOS Automation Release Team UPSTREAM: : Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml
2024-08-30 00:02:16 openshift/operator-framework-operator-controller@1ba4dc4 everettraven UPSTREAM: : add everettraven to approvers+reviewers
2024-08-30 00:02:17 openshift/operator-framework-operator-controller@0033ca7 everettraven UPSTREAM: : add openshift kustomize overlay

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.

@everettraven
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link

@everettraven: Jira Issue OCPBUGS-38153: All pull requests linked via external trackers have merged:

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

Jira Issue OCPBUGS-38155: All pull requests linked via external trackers have merged:

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

In response to this:

/jira refresh

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.

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/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.