Skip to content

OCPBUGS-47473: (Manual) Synchronize From Upstream Repositories - #104

Merged
openshift-merge-bot[bot] merged 60 commits into
openshift:mainfrom
tmshort:synchronize
Jan 10, 2025
Merged

OCPBUGS-47473: (Manual) Synchronize From Upstream Repositories#104
openshift-merge-bot[bot] merged 60 commits into
openshift:mainfrom
tmshort:synchronize

Conversation

@tmshort

@tmshort tmshort commented Jan 8, 2025

Copy link
Copy Markdown
Contributor

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

Date Commit Author Message
2025-01-07 20:53:58 operator-framework/catalogd@efcba0d Camila Macedo Upgrade golang.org/x/net (#502)
upstream commit list

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

Date Commit Author Message
2024-11-27 15:32:46 openshift/operator-framework-catalogd@00805a3 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-11-27 15:32:47 openshift/operator-framework-catalogd@03eadde Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-11-27 15:32:47 openshift/operator-framework-catalogd@124a6d5 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-27 15:32:48 openshift/operator-framework-catalogd@3ed8a97 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-27 15:32:49 openshift/operator-framework-catalogd@b25e721 Andy Goldstein UPSTREAM: <carry>: Remove ncdc from OWNERS
2024-11-27 15:32:49 openshift/operator-framework-catalogd@eb87a17 Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-11-27 15:32:50 openshift/operator-framework-catalogd@716ec50 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-27 15:32:50 openshift/operator-framework-catalogd@e5411e9 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-11-27 15:32:51 openshift/operator-framework-catalogd@1e99ee1 Todd Short UPSTREAM: <carry>: Update CI base to 1.22/4.17
2024-11-27 15:32:51 openshift/operator-framework-catalogd@2c7d6cf Todd Short UPSTREAM: <carry>: Update manifest generation for catalogd
2024-11-27 15:32:52 openshift/operator-framework-catalogd@0febac6 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-11-27 15:32:52 openshift/operator-framework-catalogd@a20778b Tayler Geiger UPSTREAM: <carry>: add openshift kustomize overlay
2024-11-27 15:32:52 openshift/operator-framework-catalogd@6aebe11 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-27 15:32:53 openshift/operator-framework-catalogd@a088247 Todd Short UPSTREAM: <carry>: Fix webhook manifest generation
2024-11-27 15:32:53 openshift/operator-framework-catalogd@c462f81 Todd Short UPSTREAM: <carry>: Add tmshort as an approver
2024-11-27 15:32:54 openshift/operator-framework-catalogd@a1da46f Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-11-27 15:32:55 openshift/operator-framework-catalogd@1390194 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-11-27 15:32:55 openshift/operator-framework-catalogd@53a7f56 Anik Bhattacharjee UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
2024-11-27 15:32:56 openshift/operator-framework-catalogd@50984c4 Joe Lanford UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet"
2024-11-27 15:32:56 openshift/operator-framework-catalogd@7efaf29 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-11-27 15:32:57 openshift/operator-framework-catalogd@ebdc912 Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-11-27 15:32:58 openshift/operator-framework-catalogd@9ea5754 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity for control by cluster-olm-operator
2024-11-27 15:32:59 openshift/operator-framework-catalogd@5a7637b Brett Tofel UPSTREAM: <carry>: Changes to add default catalogs
2024-11-27 15:32:59 openshift/operator-framework-catalogd@fa5a88d Brett Tofel UPSTREAM: <carry>: catalogd- namePrefix spec dirs
2024-11-27 15:33:00 openshift/operator-framework-catalogd@0caba93 Todd Short UPSTREAM: <carry>: Add openshift CAs to catalogd
2024-11-27 15:33:01 openshift/operator-framework-catalogd@8616a1f Joe Lanford UPSTREAM: <carry>: set priorities on default catalogs
2024-11-27 15:33:02 openshift/operator-framework-catalogd@129ba6c Todd Short UPSTREAM: <carry>: Update default catalogs
2024-11-27 15:33:03 openshift/operator-framework-catalogd@62a2cce Todd Short UPSTREAM: <carry>: Update default catalogs to v1 APIs
2024-11-27 15:33:04 openshift/operator-framework-catalogd@08f5c67 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to catalogd deployment
2024-11-27 15:33:05 openshift/operator-framework-catalogd@f2a3b44 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2024-11-29 09:36:18 openshift/operator-framework-catalogd@9e3abf2 Lalatendu Mohanty UPSTREAM: <carry>: Adding Lalatendu Mohanty as an approver
2024-12-10 19:38:25 openshift/operator-framework-catalogd@501e68b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-catalogd.yml
2024-12-12 13:22:20 openshift/operator-framework-catalogd@31acec5 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners

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
/label kind/sync

dependabot Bot and others added 30 commits November 27, 2024 12:17
Bumps the k8s-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.2` | `0.31.3` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.2` | `0.31.3` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.31.2` | `0.31.3` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.31.2` | `0.31.3` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.31.2` | `0.31.3` |
| [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.31.2` | `0.31.3` |


Updates `k8s.io/api` from 0.31.2 to 0.31.3
- [Commits](kubernetes/api@v0.31.2...v0.31.3)

Updates `k8s.io/apiextensions-apiserver` from 0.31.2 to 0.31.3
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.2...v0.31.3)

Updates `k8s.io/apimachinery` from 0.31.2 to 0.31.3
- [Commits](kubernetes/apimachinery@v0.31.2...v0.31.3)

Updates `k8s.io/apiserver` from 0.31.2 to 0.31.3
- [Commits](kubernetes/apiserver@v0.31.2...v0.31.3)

Updates `k8s.io/client-go` from 0.31.2 to 0.31.3
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.2...v0.31.3)

Updates `k8s.io/component-base` from 0.31.2 to 0.31.3
- [Commits](kubernetes/component-base@v0.31.2...v0.31.3)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.21.0...v2.22.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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/containerd/containerd](https://github.com/containerd/containerd) from 1.7.23 to 1.7.24.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.23...v1.7.24)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  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/onsi/gomega](https://github.com/onsi/gomega) from 1.35.1 to 1.36.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.35.1...v1.36.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  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/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.9.0...v1.10.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  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>
* (ci): add verify-crd-compatibility make target and GHA

using the crd-diff tool with the same configuration as recently
merged into operator-controller

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

* improve local developer experience

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

---------

Signed-off-by: everettraven <everettraven@gmail.com>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.36.0 to 1.36.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.36.0...v1.36.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  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 the k8s-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.31.3` | `0.31.4` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.31.3` | `0.31.4` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.31.3` | `0.31.4` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.31.3` | `0.31.4` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.31.3` | `0.31.4` |
| [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.31.3` | `0.31.4` |


Updates `k8s.io/api` from 0.31.3 to 0.31.4
- [Commits](kubernetes/api@v0.31.3...v0.31.4)

Updates `k8s.io/apiextensions-apiserver` from 0.31.3 to 0.31.4
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.31.3...v0.31.4)

Updates `k8s.io/apimachinery` from 0.31.3 to 0.31.4
- [Commits](kubernetes/apimachinery@v0.31.3...v0.31.4)

Updates `k8s.io/apiserver` from 0.31.3 to 0.31.4
- [Commits](kubernetes/apiserver@v0.31.3...v0.31.4)

Updates `k8s.io/client-go` from 0.31.3 to 0.31.4
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.31.3...v0.31.4)

Updates `k8s.io/component-base` from 0.31.3 to 0.31.4
- [Commits](kubernetes/component-base@v0.31.3...v0.31.4)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.28.0 to 0.31.0.
- [Commits](golang/crypto@v0.28.0...v0.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Depending on how the e2e is run, we may not have a k8s client available.

Signed-off-by: Todd Short <todd.short@me.com>
dependabot updated go.mod, but didn't know about bingo

Signed-off-by: Todd Short <todd.short@me.com>
Ensure HTTP/2 is disabled by default for webhooks. Disabling HTTP/2 mitigates vulnerabilities associated with:
  - HTTP/2 Stream Cancellation (GHSA-qppj-fm5r-hxr3)
  - HTTP/2 Rapid Reset (GHSA-4374-p667-p6c8)

While CVE fixes exist, they remain insufficient; disabling HTTP/2 helps reduce risks. For details, see: kubernetes/kubernetes#121197
Signed-off-by: Todd Short <todd.short@me.com>
…n/authorization (#460)

This commit removes the use of the kube-rbac-proxy image and replaces it with metrics authentication/authorization provided by controller-runtime. The kube-rbac-proxy image is deprecated and will no longer be maintained, which introduces risks to production environments. For more details, see: kubernetes-sigs/kubebuilder#3907
Adding Availability mode to the example output and removing the
PollInterval because it is an optional field and now it is called PollIntervalMinutes

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
…prove logging (#503)

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.22.0 to 2.22.2.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.22.0...v2.22.2)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  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>
go: upgraded golang.org/x/crypto v0.31.0 => v0.32.0
go: upgraded golang.org/x/net v0.30.0 => v0.34.0
go: upgraded golang.org/x/sys v0.28.0 => v0.29.0
go: upgraded golang.org/x/term v0.27.0 => v0.28.0
Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: Update generate-manifests.sh

Recent upstream changes to catalogd moved the location of the default
kustomization directory.
It used to be `config/default`, and is now `config/base/default`.
The `openshift/generate-manifests.sh` script assumes the original
location, this update will check for the location of the default
directory.

Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Alexander Greene <greene.al1991@gmail.com>
Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>
* Remove alumni from owners
* Add m1kola to approvers

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

dtfranz commented Jan 9, 2025

Copy link
Copy Markdown
Contributor

/retest

1 similar comment
@tmshort

tmshort commented Jan 9, 2025

Copy link
Copy Markdown
Contributor Author

/retest

@tmshort

tmshort commented Jan 9, 2025

Copy link
Copy Markdown
Contributor Author

openshift/release#60454 should fix the issue with no client for the metrics test.

@camilamacedo86 camilamacedo86 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jan 9, 2025

@camilamacedo86 camilamacedo86 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2025
@openshift-ci

openshift-ci Bot commented Jan 9, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

This needs to be fixed upstream as well.
This aligns with what operator-controller does.

Signed-off-by: Todd Short <todd.short@me.com>
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2025
@tmshort

tmshort commented Jan 9, 2025

Copy link
Copy Markdown
Contributor Author

/test images

@camilamacedo86

Copy link
Copy Markdown
Contributor

/lgtm

1 similar comment
@joelanford

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2025
@openshift-ci

openshift-ci Bot commented Jan 9, 2025

Copy link
Copy Markdown
Contributor

@tmshort: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@joelanford

Copy link
Copy Markdown
Member

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci Bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 10, 2025
@openshift-merge-bot
openshift-merge-bot Bot merged commit 6b38917 into openshift:main Jan 10, 2025
@openshift-bot

Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

Distgit: ose-olm-catalogd
This PR has been included in build ose-olm-catalogd-container-v4.19.0-202501100441.p0.g6b38917.assembly.stream.el9.
All builds following this will include this PR.

@tmshort
tmshort deleted the synchronize branch January 10, 2025 14:58
@tmshort tmshort changed the title NO-ISSUE: (Manual) Synchronize From Upstream Repositories OCPBUGS-47473: (Manual) Synchronize From Upstream Repositories Jan 10, 2025
@openshift-ci-robot

Copy link
Copy Markdown

@tmshort: Jira Issue OCPBUGS-47473: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

Details

In response to this:

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

Date Commit Author Message
2025-01-07 20:53:58 operator-framework/catalogd@efcba0d Camila Macedo Upgrade golang.org/x/net (#502)
upstream commit list

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

Date Commit Author Message
2024-11-27 15:32:46 openshift/operator-framework-catalogd@00805a3 dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2024-11-27 15:32:47 openshift/operator-framework-catalogd@03eadde Alexander Greene UPSTREAM: <carry>: Drop commitchecker
2024-11-27 15:32:47 openshift/operator-framework-catalogd@124a6d5 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-27 15:32:48 openshift/operator-framework-catalogd@3ed8a97 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-27 15:32:49 openshift/operator-framework-catalogd@b25e721 Andy Goldstein UPSTREAM: <carry>: Remove ncdc from OWNERS
2024-11-27 15:32:49 openshift/operator-framework-catalogd@eb87a17 Mikalai Radchuk UPSTREAM: <carry>: update owners
2024-11-27 15:32:50 openshift/operator-framework-catalogd@716ec50 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-27 15:32:50 openshift/operator-framework-catalogd@e5411e9 Ilias Rinis UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
2024-11-27 15:32:51 openshift/operator-framework-catalogd@1e99ee1 Todd Short UPSTREAM: <carry>: Update CI base to 1.22/4.17
2024-11-27 15:32:51 openshift/operator-framework-catalogd@2c7d6cf Todd Short UPSTREAM: <carry>: Update manifest generation for catalogd
2024-11-27 15:32:52 openshift/operator-framework-catalogd@0febac6 everettraven UPSTREAM: <carry>: add everettraven to approvers+reviewers
2024-11-27 15:32:52 openshift/operator-framework-catalogd@a20778b Tayler Geiger UPSTREAM: <carry>: add openshift kustomize overlay
2024-11-27 15:32:52 openshift/operator-framework-catalogd@6aebe11 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-27 15:32:53 openshift/operator-framework-catalogd@a088247 Todd Short UPSTREAM: <carry>: Fix webhook manifest generation
2024-11-27 15:32:53 openshift/operator-framework-catalogd@c462f81 Todd Short UPSTREAM: <carry>: Add tmshort as an approver
2024-11-27 15:32:54 openshift/operator-framework-catalogd@a1da46f Joe Lanford UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
2024-11-27 15:32:55 openshift/operator-framework-catalogd@1390194 dtfranz UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.
2024-11-27 15:32:55 openshift/operator-framework-catalogd@53a7f56 Anik Bhattacharjee UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet
2024-11-27 15:32:56 openshift/operator-framework-catalogd@50984c4 Joe Lanford UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: Add hostPath mount for /var/lib/kubelet"
2024-11-27 15:32:56 openshift/operator-framework-catalogd@7efaf29 dtfranz UPSTREAM: <carry>: Add downstream verify makefile target
2024-11-27 15:32:57 openshift/operator-framework-catalogd@ebdc912 Mikalai Radchuk UPSTREAM: <carry>: Add global-pull-secret flag
2024-11-27 15:32:58 openshift/operator-framework-catalogd@9ea5754 Joe Lanford UPSTREAM: <carry>: openshift: template log verbosity for control by cluster-olm-operator
2024-11-27 15:32:59 openshift/operator-framework-catalogd@5a7637b Brett Tofel UPSTREAM: <carry>: Changes to add default catalogs
2024-11-27 15:32:59 openshift/operator-framework-catalogd@fa5a88d Brett Tofel UPSTREAM: <carry>: catalogd- namePrefix spec dirs
2024-11-27 15:33:00 openshift/operator-framework-catalogd@0caba93 Todd Short UPSTREAM: <carry>: Add openshift CAs to catalogd
2024-11-27 15:33:01 openshift/operator-framework-catalogd@8616a1f Joe Lanford UPSTREAM: <carry>: set priorities on default catalogs
2024-11-27 15:33:02 openshift/operator-framework-catalogd@129ba6c Todd Short UPSTREAM: <carry>: Update default catalogs
2024-11-27 15:33:03 openshift/operator-framework-catalogd@62a2cce Todd Short UPSTREAM: <carry>: Update default catalogs to v1 APIs
2024-11-27 15:33:04 openshift/operator-framework-catalogd@08f5c67 everettraven UPSTREAM: <carry>: add nodeSelector and tolerations to catalogd deployment
2024-11-27 15:33:05 openshift/operator-framework-catalogd@f2a3b44 Joe Lanford UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels
2024-11-29 09:36:18 openshift/operator-framework-catalogd@9e3abf2 Lalatendu Mohanty UPSTREAM: <carry>: Adding Lalatendu Mohanty as an approver
2024-12-10 19:38:25 openshift/operator-framework-catalogd@501e68b AOS Automation Release Team UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-catalogd.yml
2024-12-12 13:22:20 openshift/operator-framework-catalogd@31acec5 Mikalai Radchuk UPSTREAM: <carry>: Remove m1kola from owners

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
/label kind/sync

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.

@tmshort

tmshort commented Jan 10, 2025

Copy link
Copy Markdown
Contributor Author

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

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

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

Details

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.

@camilamacedo86

Copy link
Copy Markdown
Contributor

@tmshort

We need to add here in the title the bug OCPBUGS-48346 as well which was solved here:
Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#501)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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. kind/sync 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.