Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #190

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 48 commits into from
Nov 15, 2024

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Nov 13, 2024

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

Date Commit Author Message
2024-11-08 22:33:25 operator-framework/catalogd@2f96c57 Per Goncalves da Silva ⚠️ Bump ClusterCatalog API to v1 (#380)
upstream commit list

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

Date Commit Author Message
2024-11-08 00:04:51 openshift/operator-framework-catalogd@9d65f48 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-11-08 00:04:52 openshift/operator-framework-catalogd@5472f55 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-11-08 00:04:52 openshift/operator-framework-catalogd@26adfce AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e5df10e41b14c724468c8f78e2690f219279bfc4/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@ccfc5ac AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@8f98969 Andy Goldstein UPSTREAM: <carry>: Remove ncdc from OWNERS
2024-11-08 00:04:54 openshift/operator-framework-catalogd@6f84c1d Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-11-08 00:04:54 openshift/operator-framework-catalogd@20b0069 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/cd35345d4d061d63bddd2911a9c77149106dee55/images/ose-olm-catalogd.yml
2024-11-08 00:04:55 openshift/operator-framework-catalogd@71c4ce2 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-11-08 00:04:55 openshift/operator-framework-catalogd@fe8db7f Todd Short UPSTREAM: <carry>: Update CI base to 1.22/4.17
2024-11-08 00:04:56 openshift/operator-framework-catalogd@b49d0ee Todd Short UPSTREAM: <carry>: Update manifest generation for catalogd
2024-11-08 00:04:56 openshift/operator-framework-catalogd@c199b54 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-11-08 00:04:57 openshift/operator-framework-catalogd@df65f24 Tayler Geiger UPSTREAM: <carry>: add openshift kustomize overlay
2024-11-08 00:04:57 openshift/operator-framework-catalogd@1609603 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-olm-catalogd.yml
2024-11-08 00:04:58 openshift/operator-framework-catalogd@bce89da Todd Short UPSTREAM: <carry>: Fix webhook manifest generation
2024-11-08 00:04:59 openshift/operator-framework-catalogd@94c9074 Todd Short UPSTREAM: <carry>: Add tmshort as an approver
2024-11-08 00:04:59 openshift/operator-framework-catalogd@0595e68 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-11-08 00:05:00 openshift/operator-framework-catalogd@ebd218b dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-11-08 00:05:01 openshift/operator-framework-catalogd@fb176fc Anik Bhattacharjee UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
2024-11-08 00:05:01 openshift/operator-framework-catalogd@53085de Joe Lanford UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet"
2024-11-08 00:05:02 openshift/operator-framework-catalogd@cc7ab12 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-11-08 00:05:03 openshift/operator-framework-catalogd@06fb1c8 Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-11-08 00:05:03 openshift/operator-framework-catalogd@8eede90 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity for control by cluster-olm-operator
2024-11-08 00:05:04 openshift/operator-framework-catalogd@3299411 Brett Tofel UPSTREAM: <carry>: Changes to add default catalogs
2024-11-08 00:05:05 openshift/operator-framework-catalogd@f0ed398 Brett Tofel UPSTREAM: <carry>: catalogd- namePrefix spec dirs
2024-11-08 00:05:06 openshift/operator-framework-catalogd@f223d9f Todd Short UPSTREAM: <carry>: Add openshift CAs to catalogd
2024-11-08 00:05:06 openshift/operator-framework-catalogd@8ea6e34 Joe Lanford UPSTREAM: <carry>: set priorities on default catalogs
2024-11-08 09:32:53 openshift/operator-framework-catalogd@3f08439 Todd Short UPSTREAM: <carry>: Update default catalogs

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-framework
/label tide/merge-method-merge

dtfranz and others added 30 commits November 6, 2024 19:11
Adds a bare-bones test registry and a folder tree for our test images.

Signed-off-by: dtfranz <[email protected]>
…erage (#1431)

- Updated .codecov.yml to include only specific directories (api/, cmd/, internal/) in coverage reports
- Excluded documentation, YAML configurations, and test files to improve coverage accuracy and prevent irrelevant CI coverage failures
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 9.5.43 to 9.5.44.
- [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.43...9.5.44)

---
updated-dependencies:
- dependency-name: mkdocs-material
  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>
- Added steps for building, loading Docker images, and deploying changes locally with Kind
Replace `apiVersion: catalogd.operatorframework.io/v1alpha1` with `apiVersion: olm.operatorframework.io/v1alpha1` for `clustercatalogs.olm.operatorframework.io`.

Reason:
The API version referenced in the docs appears incorrect. After installing, the correct API name is confirmed with:

```
$ kubectl get crds | grep clustercatalog
clustercatalogs.olm.operatorframework.io   2024-11-06T21:34:38Z
```

The API is listed under `clustercatalogs.olm.operatorframework.io`, not `catalogd`.

Example error faced when trying to apply with the incorrect API name:

```
$ kubectl apply -f - <<EOF
> apiVersion: catalogd.operatorframework.io/v1alpha1
> kind: ClusterCatalog
> metadata:
>   name: operatorhubio
> spec:
>   source:
>     type: Image
>     image:
>       ref: quay.io/operatorhubio/catalog:latest
>       pollInterval: 10m
> EOF
error: resource mapping not found for name: "operatorhubio" namespace: "" from "STDIN": no matches for kind "ClusterCatalog" in version "catalogd.operatorframework.io/v1alpha1"
ensure CRDs are installed first
```

For reference, see the correct API name here:
[olm.operatorframework.io_clustercatalogs.yaml](https://github.com/operator-framework/catalogd/blob/main/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml).
Signed-off-by: Mikalai Radchuk <[email protected]>
…ectl_wait_for_query function (#1429)

By running `make kind-deploy` against a kind cluster  or installing the released script from https://operator-framework.github.io/operator-controller/getting-started/olmv1_getting_started/ the following error is faced:

```sh
...
deployment.apps/cert-manager-webhook condition met
deployment.apps/cert-manager-cainjector condition met
deployment.apps/cert-manager condition met
error: jsonpath wait format must be --for=jsonpath='{.status.readyReplicas}'=3
```

This PR fixes an issue with kubectl wait when used to check the caBundle field in `mutatingwebhookconfigurations` and `validatingwebhookconfigurations`.

This PR introduces the `kubectl_wait_for_query` function, which replaces `kubectl wait` for this specific use case. The function repeatedly checks the `caBundle` field by using `kubectl get` in a loop, ensuring that the `caBundle` is populated without relying on status-based conditions. This approach provides a more flexible solution compatible with webhook configurations, bypassing the limitations of `kubectl wait`.
Fixes #1307

Create and use a new namespace for every e2e test. This means that
extension resources are placed in their own namespace. The tests
deletes the namespace, and then waits until completion. This ensures
that _most_ of an extension's resources are deleted.

It does guarantee that global resources (e.g. CRDs, CRs, CRBs) are
deleted.

And would eventually allow the tests to be run in parallel (assuming
the installed extensions allow for that).

Signed-off-by: Todd Short <[email protected]>
Bumps [regex](https://github.com/mrabarnett/mrab-regex) from 2024.9.11 to 2024.11.6.
- [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt)
- [Commits](mrabarnett/mrab-regex@2024.9.11...2024.11.6)

---
updated-dependencies:
- dependency-name: regex
  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>
* Document granting API access

Signed-off-by: Brett Tofel <[email protected]>

* Addressing PR comments

Signed-off-by: Brett Tofel <[email protected]>

* Addressing PR comments 2

Signed-off-by: Brett Tofel <[email protected]>

* Reorders document

Signed-off-by: Brett Tofel <[email protected]>

* Improve wording on explanation around access needs

Co-authored-by: Camila Macedo <[email protected]>

* Improved wording on OLM not managing RBAC

Co-authored-by: Camila Macedo <[email protected]>

* Clarify admin and edit roles

Co-authored-by: Camila Macedo <[email protected]>

* Draw attention to RBAC all verbs grant

Co-authored-by: Camila Macedo <[email protected]>

* Clarify role vs. binding recommendations in notes

Signed-off-by: Brett Tofel <[email protected]>

* Cluster extension everywhere we had operator ref

Signed-off-by: Brett Tofel <[email protected]>

* Improved wordigin on rbac mention

Co-authored-by: Michael Peter <[email protected]>

* Improve wording around who the users are

Co-authored-by: Michael Peter <[email protected]>

* Add mkdocs ref and move to howto

Signed-off-by: Brett Tofel <[email protected]>

* Clarify what admin clusterrole does

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

* Clean up what * verb allows

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

* Removes Notes section - covered in intro

Signed-off-by: Brett Tofel <[email protected]>

* Reword mkdocs link text

Signed-off-by: Brett Tofel <[email protected]>

* ReReword mkdocs link text

Signed-off-by: Brett Tofel <[email protected]>

---------

Signed-off-by: Brett Tofel <[email protected]>
Co-authored-by: Camila Macedo <[email protected]>
Co-authored-by: Michael Peter <[email protected]>
Co-authored-by: Joe Lanford <[email protected]>
* reduce use of carvel validators

by implementing our own. This gives us more
freedom in maing changes and fixing bugs in the
actual validations instead of having to push
all fixes up to the carvel/kapp project.

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

* generic min/max verification functions

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

---------

Signed-off-by: everettraven <[email protected]>
Bumps [packaging](https://github.com/pypa/packaging) from 24.1 to 24.2.
- [Release notes](https://github.com/pypa/packaging/releases)
- [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst)
- [Commits](pypa/packaging@24.1...24.2)

---
updated-dependencies:
- dependency-name: packaging
  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>
* updates from api audit

Signed-off-by: Jordan Keister <[email protected]>

* review updates

Signed-off-by: Jordan Keister <[email protected]>

* e2e fixes

Signed-off-by: Jordan Keister <[email protected]>

---------

Signed-off-by: Jordan Keister <[email protected]>
…to `.spec.namespace` and `.spec.serviceAccount` (#1439)

* move namespace and serviceAccount fields to spec root

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

* address comments, make verify

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

* fix e2e failures

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

---------

Signed-off-by: everettraven <[email protected]>
There were several intentional breaking changes in the API
which are now included in v0.18.0 release.

Our upgrade-e2e job need to be updated to make take the
changes into account.

Relevant PRs:
* operator-framework/operator-controller#1439
* operator-framework/operator-controller#1434

Signed-off-by: Mikalai Radchuk <[email protected]>
* ⚠️ bump ClusterExtension API to v1

Signed-off-by: Per Goncalves da Silva <[email protected]>

* CE API updates

  - Regenerate CRD
  - Fixup import in conditionsets package

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

* update imports to drop alpha1 suffix

and other minor version changes that were missed when bumping
API versions to v1.

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

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Signed-off-by: Joe Lanford <[email protected]>
Signed-off-by: everettraven <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Joe Lanford <[email protected]>
Co-authored-by: everettraven <[email protected]>
* Bump catalogd to v1

Signed-off-by: Per Goncalves da Silva <[email protected]>

* update catalogd dep to v1.0.0-rc1

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

* run make verify to regenerate generated content

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

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Signed-off-by: everettraven <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: everettraven <[email protected]>
The latest release v1.0.0-rc1 includes the change to the API:
OLM v1alpha1 APIs became v1 and this needs to be reflected
in the upgrade-e2e CI job.

Refs:
* operator-framework/operator-controller#1228
* operator-framework/operator-controller#1441

Signed-off-by: Mikalai Radchuk <[email protected]>
There are a few remaining references to v1alpha1 that need to be
updated to use v1.

Ref:
* operator-framework/operator-controller#1228

Signed-off-by: Mikalai Radchuk <[email protected]>
Fixes a number of formatting/rendering issues. Mostly around
lists, admonitions (notes, warnings, etc) and collapsible text.

Signed-off-by: Mikalai Radchuk <[email protected]>
Signed-off-by: Jordan Keister <[email protected]>
Signed-off-by: dtfranz <[email protected]>

UPSTREAM: <carry>: Update generate-manifests to handle new directory

The `default` directory was renamed `base`.

Signed-off-by: Todd Short <[email protected]>
* Remove alumni from owners
* Add m1kola to approvers

Signed-off-by: Mikalai Radchuk <[email protected]>
everettraven and others added 14 commits November 13, 2024 13:08
to enable TLS communication with catalogd. Configure the CA certs
using the configmap injection method via service-ca-operator

Signed-off-by: everettraven <[email protected]>
Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS

Signed-off-by: Todd Short <[email protected]>
Pass global-pull-secret to the manager container.

Signed-off-by: Mikalai Radchuk <[email protected]>
The /run/secrets/kubernetes.io/serviceaccount/ directory is projected
into the pod and contains the following CA certificates:

* configmap/kube-root-ca.crt as ca.crt
* configmap/openshift-service-ca.crt as service-ca.crt

Update the --ca-certs-dir argument to reference the directory.

Signed-off-by: Todd Short <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 13, 2024
@openshift-ci-robot
Copy link

@tmshort: This pull request explicitly references no jira issue.

In response to this:

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

Date Commit Author Message
2024-11-08 22:33:25 operator-framework/catalogd@2f96c57 Per Goncalves da Silva ⚠️ Bump ClusterCatalog API to v1 (#380)
upstream commit list

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

Date Commit Author Message
2024-11-08 00:04:51 openshift/operator-framework-catalogd@9d65f48 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-11-08 00:04:52 openshift/operator-framework-catalogd@5472f55 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-11-08 00:04:52 openshift/operator-framework-catalogd@26adfce AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e5df10e41b14c724468c8f78e2690f219279bfc4/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@ccfc5ac AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@8f98969 Andy Goldstein UPSTREAM: <carry>: Remove ncdc from OWNERS
2024-11-08 00:04:54 openshift/operator-framework-catalogd@6f84c1d Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-11-08 00:04:54 openshift/operator-framework-catalogd@20b0069 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/cd35345d4d061d63bddd2911a9c77149106dee55/images/ose-olm-catalogd.yml
2024-11-08 00:04:55 openshift/operator-framework-catalogd@71c4ce2 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-11-08 00:04:55 openshift/operator-framework-catalogd@fe8db7f Todd Short UPSTREAM: <carry>: Update CI base to 1.22/4.17
2024-11-08 00:04:56 openshift/operator-framework-catalogd@b49d0ee Todd Short UPSTREAM: <carry>: Update manifest generation for catalogd
2024-11-08 00:04:56 openshift/operator-framework-catalogd@c199b54 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-11-08 00:04:57 openshift/operator-framework-catalogd@df65f24 Tayler Geiger UPSTREAM: <carry>: add openshift kustomize overlay
2024-11-08 00:04:57 openshift/operator-framework-catalogd@1609603 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-olm-catalogd.yml
2024-11-08 00:04:58 openshift/operator-framework-catalogd@bce89da Todd Short UPSTREAM: <carry>: Fix webhook manifest generation
2024-11-08 00:04:59 openshift/operator-framework-catalogd@94c9074 Todd Short UPSTREAM: <carry>: Add tmshort as an approver
2024-11-08 00:04:59 openshift/operator-framework-catalogd@0595e68 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-11-08 00:05:00 openshift/operator-framework-catalogd@ebd218b dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-11-08 00:05:01 openshift/operator-framework-catalogd@fb176fc Anik Bhattacharjee UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
2024-11-08 00:05:01 openshift/operator-framework-catalogd@53085de Joe Lanford UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet"
2024-11-08 00:05:02 openshift/operator-framework-catalogd@cc7ab12 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-11-08 00:05:03 openshift/operator-framework-catalogd@06fb1c8 Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-11-08 00:05:03 openshift/operator-framework-catalogd@8eede90 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity for control by cluster-olm-operator
2024-11-08 00:05:04 openshift/operator-framework-catalogd@3299411 Brett Tofel UPSTREAM: <carry>: Changes to add default catalogs
2024-11-08 00:05:05 openshift/operator-framework-catalogd@f0ed398 Brett Tofel UPSTREAM: <carry>: catalogd- namePrefix spec dirs
2024-11-08 00:05:06 openshift/operator-framework-catalogd@f223d9f Todd Short UPSTREAM: <carry>: Add openshift CAs to catalogd
2024-11-08 00:05:06 openshift/operator-framework-catalogd@8ea6e34 Joe Lanford UPSTREAM: <carry>: set priorities on default catalogs
2024-11-08 09:32:53 openshift/operator-framework-catalogd@3f08439 Todd Short UPSTREAM: <carry>: Update default catalogs

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-framework
/label tide/merge-method-merge

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.

Copy link
Contributor

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

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

Date Commit Author Message
2024-11-08 22:33:25 operator-framework/catalogd@2f96c57 Per Goncalves da Silva ⚠️ Bump ClusterCatalog API to v1 (#380)
upstream commit list

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

Date Commit Author Message
2024-11-08 00:04:51 openshift/operator-framework-catalogd@9d65f48 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-11-08 00:04:52 openshift/operator-framework-catalogd@5472f55 Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-11-08 00:04:52 openshift/operator-framework-catalogd@26adfce AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e5df10e41b14c724468c8f78e2690f219279bfc4/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@ccfc5ac AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-catalogd.yml
2024-11-08 00:04:53 openshift/operator-framework-catalogd@8f98969 Andy Goldstein UPSTREAM: <carry>: Remove ncdc from OWNERS
2024-11-08 00:04:54 openshift/operator-framework-catalogd@6f84c1d Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-11-08 00:04:54 openshift/operator-framework-catalogd@20b0069 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/cd35345d4d061d63bddd2911a9c77149106dee55/images/ose-olm-catalogd.yml
2024-11-08 00:04:55 openshift/operator-framework-catalogd@71c4ce2 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-11-08 00:04:55 openshift/operator-framework-catalogd@fe8db7f Todd Short UPSTREAM: <carry>: Update CI base to 1.22/4.17
2024-11-08 00:04:56 openshift/operator-framework-catalogd@b49d0ee Todd Short UPSTREAM: <carry>: Update manifest generation for catalogd
2024-11-08 00:04:56 openshift/operator-framework-catalogd@c199b54 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-11-08 00:04:57 openshift/operator-framework-catalogd@df65f24 Tayler Geiger UPSTREAM: <carry>: add openshift kustomize overlay
2024-11-08 00:04:57 openshift/operator-framework-catalogd@1609603 AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-olm-catalogd.yml
2024-11-08 00:04:58 openshift/operator-framework-catalogd@bce89da Todd Short UPSTREAM: <carry>: Fix webhook manifest generation
2024-11-08 00:04:59 openshift/operator-framework-catalogd@94c9074 Todd Short UPSTREAM: <carry>: Add tmshort as an approver
2024-11-08 00:04:59 openshift/operator-framework-catalogd@0595e68 Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-11-08 00:05:00 openshift/operator-framework-catalogd@ebd218b dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-11-08 00:05:01 openshift/operator-framework-catalogd@fb176fc Anik Bhattacharjee UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
2024-11-08 00:05:01 openshift/operator-framework-catalogd@53085de Joe Lanford UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet"
2024-11-08 00:05:02 openshift/operator-framework-catalogd@cc7ab12 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-11-08 00:05:03 openshift/operator-framework-catalogd@06fb1c8 Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-11-08 00:05:03 openshift/operator-framework-catalogd@8eede90 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity for control by cluster-olm-operator
2024-11-08 00:05:04 openshift/operator-framework-catalogd@3299411 Brett Tofel UPSTREAM: <carry>: Changes to add default catalogs
2024-11-08 00:05:05 openshift/operator-framework-catalogd@f0ed398 Brett Tofel UPSTREAM: <carry>: catalogd- namePrefix spec dirs
2024-11-08 00:05:06 openshift/operator-framework-catalogd@f223d9f Todd Short UPSTREAM: <carry>: Add openshift CAs to catalogd
2024-11-08 00:05:06 openshift/operator-framework-catalogd@8ea6e34 Joe Lanford UPSTREAM: <carry>: set priorities on default catalogs
2024-11-08 09:32:53 openshift/operator-framework-catalogd@3f08439 Todd Short UPSTREAM: <carry>: Update default catalogs

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-framework
/label tide/merge-method-merge

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 tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Nov 13, 2024
Copy link
Contributor

openshift-ci bot commented Nov 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 Nov 13, 2024
@dtfranz
Copy link
Contributor

dtfranz commented Nov 14, 2024

Any chance we could update this PR up to this change as well?
operator-framework/operator-controller#1457

@joelanford
Copy link
Member

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

Copy link
Contributor

openshift-ci bot commented Nov 15, 2024

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

In response to this:

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

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 Nov 15, 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.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 372f062 into openshift:main Nov 15, 2024
8 checks passed
@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.19.0-202411150809.p0.g372f062.assembly.stream.el9.
All builds following this will include this PR.

@tmshort tmshort deleted the synchronize branch November 15, 2024 14:53
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.